[arch-commits] Commit in hal/trunk (PKGBUILD hal-policy.patch)

[Jan de Groot]

    Date: Friday, November 14, 2008 @ 16:56:50
  Author: jgc
Revision: 19100

upgpkg: hal 0.5.11-5
    Use policykit instead of dbus policies

Modified:
  hal/trunk/PKGBUILD
Deleted:
  hal/trunk/hal-policy.patch

------------------+
 PKGBUILD         |   10 +++-------
 hal-policy.patch |   32 --------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-11-14 21:50:10 UTC (rev 19099)
+++ PKGBUILD	2008-11-14 21:56:50 UTC (rev 19100)
@@ -4,18 +4,17 @@
 
 pkgname=hal
 pkgver=0.5.11
-pkgrel=4
+pkgrel=5
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.74' 'dbus>=1.2.1' 'libusb>=0.1.12' 'udev>=118' 'filesystem>=0.7.1-5' 'hal-info>=0.20080508' 'eject' 'libsmbios>=2.0.2' 'dmidecode' 'pciutils>=2.2.8-3' 'usbutils>=0.73-5' 'pm-utils>=1.1.2')
+depends=('dbus-glib>=0.76' 'dbus>=1.2.4' 'libusb>=0.1.12' 'udev>=118' 'filesystem>=0.7.1-5' 'hal-info>=0.20081022' 'eject' 'libsmbios>=2.0.2' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.2.1' 'policykit>=0.9-6')
 makedepends=('pkgconfig' 'gperf')
 options=('!libtool')
 install=hal.install
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2
 	hal
-	hal-policy.patch
 	cryptsetup_location.patch
 	hal-0.5.9-hide-diagnostic.patch
 	ntfs3g-valid-options.patch
@@ -23,7 +22,6 @@
 	ntfs-mount-fix.patch)
 md5sums=('5e8935ab61bcb14afd2d4548084aace0'
          '277e96ac130d7bfce0b30f0b80db8782'
-         '18dcdaa79952e2057c2e4745fbc8ad52'
          'c688a3c6574699365926f4fef7441545'
          '4d4b6801a1cedca22b8bdd9db73b16fb'
          '4242a2c78885e396f639d0cd5e33218c'
@@ -32,7 +30,6 @@
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/hal-policy.patch || return 1
   patch -Np1 -i ${startdir}/src/cryptsetup_location.patch || return 1
   patch -Np1 -i ${startdir}/src/hal-0.5.9-hide-diagnostic.patch || return 1
   patch -Np0 -i ${startdir}/src/ntfs3g-valid-options.patch || return 1
@@ -45,8 +42,7 @@
 	      --enable-acpi-ibm --enable-acpi-toshiba \
               --disable-docbook-docs --disable-doxygen-docs \
 	      --with-hal-user=hal --with-hal-group=hal \
-	      --with-pid-file=/var/run/hald.pid \
-	      --enable-policy-kit=no || return 1
+	      --with-pid-file=/var/run/hald.pid || return 1
   sed -e 's/device-manager//' -i tools/Makefile || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1

Deleted: hal-policy.patch
===================================================================
--- hal-policy.patch	2008-11-14 21:50:10 UTC (rev 19099)
+++ hal-policy.patch	2008-11-14 21:56:50 UTC (rev 19100)
@@ -1,32 +0,0 @@
---- hal-0.5.11/hal.conf.in	2008-05-27 16:09:25.000000000 +0200
-+++ hal-0.5.11/hal.conf.in	2008-05-27 16:21:28.000000000 +0200
-@@ -37,9 +37,27 @@
- 	   receive_sender="org.freedesktop.Hal"/>
-   </policy>
- 
--  <!-- Default policy for the exported interfaces; if PolicyKit is not used
--       for access control you will need to modify this -->
-+  <!-- Default policy for the exported interfaces -->
-   <policy context="default">
-+    <deny send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+    <deny send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/>
-+    <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>
-+
-+  <policy group="power">
-+    <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+    <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+  </policy>
-+
-+  <policy group="storage">
-+    <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
-+    <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+  </policy>
-+
-+  <!-- You can change this to a more suitable user, or make per-group -->
-+  <policy user="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"/>