diff options
| author | Matt Housh <jaeger@morpheus.net> | 2006-09-13 04:17:51 +0000 |
|---|---|---|
| committer | Matt Housh <jaeger@morpheus.net> | 2006-09-13 04:17:51 +0000 |
| commit | 14d06a37db9922f7680d81f57e78db989570dfd3 (patch) | |
| tree | 1c525ea0034f339d94fa7a2bc79f7afe891d40ed /hal | |
| parent | aece9b3f42bf6f6579d4a269685a797d7ac3e3e6 (diff) | |
| download | opt-14d06a37db9922f7680d81f57e78db989570dfd3.tar.gz opt-14d06a37db9922f7680d81f57e78db989570dfd3.tar.xz | |
hal: removed the extra hal.conf for a sed
Diffstat (limited to 'hal')
| -rw-r--r-- | hal/.md5sum | 1 | ||||
| -rw-r--r-- | hal/Pkgfile | 6 | ||||
| -rw-r--r-- | hal/hal.conf | 44 |
3 files changed, 3 insertions, 48 deletions
diff --git a/hal/.md5sum b/hal/.md5sum index 833ea0b74..9c6c86fbb 100644 --- a/hal/.md5sum +++ b/hal/.md5sum @@ -1,4 +1,3 @@ 1fa646b45e845031f09515731dba40c7 hal-0.5.7.1-dbus-close.patch d7a7741808ba130f8aff3f5d3b5689e4 hal-0.5.7.1.tar.gz -83d11240bd696260a2da058bd3b71bb2 hal.conf cc3d04e7ac09e15f33c530725f43e641 rc.hald diff --git a/hal/Pkgfile b/hal/Pkgfile index e1195c386..4e1e2658b 100644 --- a/hal/Pkgfile +++ b/hal/Pkgfile @@ -7,7 +7,7 @@ name=hal version=0.5.7.1 release=3 source=(http://freedesktop.org/~david/dist/$name-$version.tar.gz \ - rc.hald $name-$version-dbus-close.patch hal.conf) + rc.hald $name-$version-dbus-close.patch) build() { cd $name-$version @@ -29,6 +29,6 @@ build() { rm -rf $PKG/usr/share/{doc,locale} install -D -m 0644 -o root -g root tools/linux/90-hal.rules \ $PKG/etc/udev/rules.d/90-hal.rules - install -m 0644 -o root -g root $SRC/hal.conf \ - $PKG/usr/etc/dbus-1/system.d/ + sed -i -e '36,43d' -e 's/user="0"/group="plugdev"/' \ + $PKG/usr/etc/dbus-1/system.d/hal.conf } diff --git a/hal/hal.conf b/hal/hal.conf deleted file mode 100644 index 1a45cc263..000000000 --- a/hal/hal.conf +++ /dev/null @@ -1,44 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- This configuration file specifies the required security policies - for the HAL to work. --> - - <!-- Only root or user haldaemon can own the HAL service --> - <policy user="haldaemon"> - <allow own="org.freedesktop.Hal"/> - </policy> - <policy user="root"> - <allow own="org.freedesktop.Hal"/> - </policy> - - <!-- Allow anyone to invoke methods on the Manager and Device interfaces --> - <policy context="default"> - <allow send_interface="org.freedesktop.Hal.Manager"/> - <allow send_interface="org.freedesktop.Hal.Device"/> - - <allow receive_interface="org.freedesktop.Hal.Manager" - receive_sender="org.freedesktop.Hal"/> - <allow receive_interface="org.freedesktop.Hal.Device" - receive_sender="org.freedesktop.Hal"/> - </policy> - - <!-- Default policy for the exported interfaces --> - <policy context="default"> - <deny send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> - <deny send_interface="org.freedesktop.Hal.Device.LaptopPanel"/> - <deny send_interface="org.freedesktop.Hal.Device.Volume"/> - <deny send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/> - </policy> - - <!-- You can change this to a more suitable user, or make per-group --> - <policy group="plugdev"> - <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> - <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/> - <allow send_interface="org.freedesktop.Hal.Device.Volume"/> - <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/> - </policy> - -</busconfig> |