Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=699dd625fc1df2b4556f285a813e8c1bea39e3a3
commit 699dd625fc1df2b4556f285a813e8c1bea39e3a3 Author: crazy <cr...@frugalware.org> Date: Mon Jan 26 13:39:48 2009 +0100 hal-0.5.11-5-x86_64 * fix hal.conf to work with * latest dbus diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index f6aeab7..d811e5e 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -4,10 +4,10 @@ pkgname=hal pkgver=0.5.11 -pkgrel=4 +pkgrel=5 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal"; -depends=('dbus-glib>=0.74' 'udev>=132' 'glib2' 'libcap' 'dbus>=1.1.2' \ +depends=('dbus-glib>=0.74' 'udev>=132' 'glib2' 'libcap' 'dbus>=1.2.12-4' \ 'libusb' 'popt' 'pciutils' 'parted>=1.8.8' 'shadow>=4.0.18.1-2' \ 'dmidecode' 'usbutils' 'zlib') makedepends=('pkgconfig' 'perl-xml-parser' 'intltool' 'gperf') @@ -28,7 +28,7 @@ sha1sums=('f51366229e5dd6d5d72d60114fdef76bf5feba26' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ '2fab4fd75f1359b0838748dfae4d749eb26b64b9' \ '654235977c83f76433f9737f37b8a18f04136b35' \ - '772b01acb8ffdc810c23231eb144f92255c5e205' \ + '9d7ea8f348b2de6aa1bf42cf0cb7ab2b19a03bd2' \ 'f99e64227cf66f2eee6ed852542db7b5cb038299') build() diff --git a/source/apps/hal/hal.conf.patch b/source/apps/hal/hal.conf.patch index 1e035ee..4d8c12c 100644 --- a/source/apps/hal/hal.conf.patch +++ b/source/apps/hal/hal.conf.patch @@ -1,18 +1,62 @@ -diff -Naur hal-0.5.11/hal.conf.in hal-0.5.11-p/hal.conf.in +diff -Naur hal-0.5.11/hal.conf.in hal-0.5.11-p-conf/hal.conf.in --- hal-0.5.11/hal.conf.in 2008-05-08 01:24:13.000000000 +0200 -+++ hal-0.5.11-p/hal.conf.in 2008-05-13 20:50:36.000000000 +0200 -@@ -39,10 +39,13 @@ ++++ hal-0.5.11-p-conf/hal.conf.in 2009-01-26 13:32:20.000000000 +0100 +@@ -16,17 +16,25 @@ + + <!-- 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 send_interface="org.freedesktop.DBus.Introspectable" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Manager" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Device" ++ send_destination="org.freedesktop.Hal"/> + <allow receive_interface="org.freedesktop.Hal.Manager" + receive_sender="org.freedesktop.Hal"/> + <allow receive_interface="org.freedesktop.Hal.Device" + receive_sender="org.freedesktop.Hal"/> + +- <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"/> ++ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Device.Volume" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto" ++ send_destination="org.freedesktop.Hal"/> + <allow receive_interface="org.freedesktop.Hal.Device.SystemPowerManagement" + receive_sender="org.freedesktop.Hal"/> + <allow receive_interface="org.freedesktop.Hal.Device.LaptopPanel" +@@ -39,12 +47,20 @@ <!-- Default policy for the exported interfaces; if PolicyKit is not used for access control you will need to modify this --> - <policy context="default"> +- <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> +- <allow send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/> +- <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 group="0"> - <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> - <allow send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/> - <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/> -+ </policy> ++ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Device.VideoAdapterPM" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel" ++ send_destination="org.freedesktop.Hal"/> ++ </policy> + -+ <policy group="storage"> - <allow send_interface="org.freedesktop.Hal.Device.Volume"/> - <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/> ++ <policy group="storage"> ++ <allow send_interface="org.freedesktop.Hal.Device.Volume" ++ send_destination="org.freedesktop.Hal"/> ++ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto" ++ send_destination="org.freedesktop.Hal"/> </policy> + + </busconfig> _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
