Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3943ae7a9daec8df47234f5b99ec39ddf72a98c6
commit 3943ae7a9daec8df47234f5b99ec39ddf72a98c6 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun May 17 23:25:01 2009 +0200 Revert "hal-0.5.12-1-i686" This reverts commit dec408eb50dbc96fb32bf71d3c553d8ac12f5cfa. diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index b440c14..d811e5e 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -3,11 +3,11 @@ # Contributor: Christian Hamar alias krix <kr...@linuxforum.hu> pkgname=hal -pkgver=0.5.12 -pkgrel=1 +pkgver=0.5.11 +pkgrel=5 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal"; -depends=('dbus-glib>=0.74' 'udev>=132' 'util-linux-ng>=2.15' 'glib2' 'libcap' 'dbus>=1.2.12-4' \ +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') @@ -21,12 +21,15 @@ source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ rc.hald \ ntfs-3g.patch \ suspend_hibernate.patch \ - hal-performance_pci.ids_v5.diff) -sha1sums=('ff6b36ca05433ed06d24b890fb72feec7eb4b7a0' \ + hal-performance_pci.ids_v5.diff \ + hal.conf.patch newer-udev.patch) +sha1sums=('f51366229e5dd6d5d72d60114fdef76bf5feba26' \ 'bd113f345e7b2671764c8dfb2ed41301fcf42e41' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ '2fab4fd75f1359b0838748dfae4d749eb26b64b9' \ - '654235977c83f76433f9737f37b8a18f04136b35') + '654235977c83f76433f9737f37b8a18f04136b35' \ + '9d7ea8f348b2de6aa1bf42cf0cb7ab2b19a03bd2' \ + 'f99e64227cf66f2eee6ed852542db7b5cb038299') build() { diff --git a/source/apps/hal/hal.conf.patch b/source/apps/hal/hal.conf.patch new file mode 100644 index 0000000..4d8c12c --- /dev/null +++ b/source/apps/hal/hal.conf.patch @@ -0,0 +1,62 @@ +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-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" ++ 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" ++ 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
