[arch-commits] Commit in hal/repos (5 files)
Jan de Groot
jgc at archlinux.org
Sun Jun 1 13:46:22 UTC 2008
Date: Sunday, June 1, 2008 @ 09:46:21
Author: jgc
Revision: 2346
Merged revisions 1156-2345 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/hal/trunk
........
r2154 | jgc | 2008-05-27 14:47:30 +0000 (Tue, 27 May 2008) | 1 line
upgpkg: hal 0.5.11-1
........
Modified:
hal/repos/extra-x86_64/ (properties)
hal/repos/extra-x86_64/PKGBUILD
hal/repos/extra-x86_64/hal
hal/repos/extra-x86_64/hal-policy.patch
Deleted:
hal/repos/extra-x86_64/addon-input-nval.patch
------------------------+
PKGBUILD | 17 +++++++----------
addon-input-nval.patch | 20 --------------------
hal | 12 ++++++++++++
hal-policy.patch | 37 ++++++++++++++++++++++++++-----------
4 files changed, 45 insertions(+), 41 deletions(-)
Property changes on: hal/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /hal/trunk:1-1155
+ /hal/trunk:1-2345
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-06-01 13:39:15 UTC (rev 2345)
+++ extra-x86_64/PKGBUILD 2008-06-01 13:46:21 UTC (rev 2346)
@@ -3,27 +3,25 @@
# Contributor: Link Dupont <link at subpop.net>
pkgname=hal
-pkgver=0.5.11rc2
-pkgrel=2
+pkgver=0.5.11
+pkgrel=1
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.20080317' 'eject' 'libsmbios>=2.0.2' 'dmidecode' 'pciutils>=2.2.8-3' 'usbutils>=0.73-5' 'pm-utils>=1.1.0')
+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')
makedepends=('pkgconfig' 'gperf')
options=('!libtool')
install=hal.install
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
- addon-input-nval.patch
+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)
-md5sums=('ade962044a62e8f2dc4625a17f4a5c7e'
- '272755ed2004cfc362ffcf98167a4ef9'
- '882f67668cb14a0a9e4a27ef22278027'
- '5ba8b610aa9763a5f42b9f7cbd7a86ad'
+md5sums=('5e8935ab61bcb14afd2d4548084aace0'
+ '277e96ac130d7bfce0b30f0b80db8782'
+ '18dcdaa79952e2057c2e4745fbc8ad52'
'c688a3c6574699365926f4fef7441545'
'4d4b6801a1cedca22b8bdd9db73b16fb')
@@ -33,7 +31,6 @@
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
- patch -Np0 -i ${startdir}/src/addon-input-nval.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/hal --enable-static=no \
Deleted: extra-x86_64/addon-input-nval.patch
===================================================================
--- extra-x86_64/addon-input-nval.patch 2008-06-01 13:39:15 UTC (rev 2345)
+++ extra-x86_64/addon-input-nval.patch 2008-06-01 13:46:21 UTC (rev 2346)
@@ -1,20 +0,0 @@
---- hald/linux/addons/addon-input.c.old 2008-04-18 17:11:59.000000000 -0400
-+++ hald/linux/addons/addon-input.c 2008-04-18 17:12:12.000000000 -0400
-@@ -210,7 +210,7 @@
- GError *gerror = NULL;
- gsize read_bytes;
-
-- if (condition & (G_IO_HUP | G_IO_ERR))
-+ if (condition & (G_IO_HUP | G_IO_ERR | G_IO_NVAL))
- return FALSE;
-
- /** tbh, we can probably assume every time we read we have a whole
-@@ -383,7 +383,7 @@
-
- g_hash_table_insert (inputs, g_strdup(udi), channel);
- g_io_add_watch_full (channel,
-- G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP,
-+ G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
- event_io, data, (GDestroyNotify) destroy_data);
- }
-
Modified: extra-x86_64/hal
===================================================================
--- extra-x86_64/hal 2008-06-01 13:39:15 UTC (rev 2345)
+++ extra-x86_64/hal 2008-06-01 13:46:21 UTC (rev 2346)
@@ -12,6 +12,18 @@
ck_daemon acpid && /etc/rc.d/acpid start
fi
stat_busy "Starting Hardware Abstraction Layer"
+ if [ ! -x /var/cache/hald ] ; then
+ install -m755 -g 82 -o 82 -d /var/cache/hald
+ fi
+ if [ ! -x /var/run/hald ]; then
+ install -m755 -g 82 -o 82 -d /var/run/hald
+ fi
+ if [ ! -x /var/run/hald/hald-local ]; then
+ install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
+ fi
+ if [ ! -x /var/run/hald/hald-runner ]; then
+ install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
+ fi
/usr/sbin/hald
if [ $? -gt 0 ]; then
stat_fail
Modified: extra-x86_64/hal-policy.patch
===================================================================
--- extra-x86_64/hal-policy.patch 2008-06-01 13:39:15 UTC (rev 2345)
+++ extra-x86_64/hal-policy.patch 2008-06-01 13:46:21 UTC (rev 2346)
@@ -1,17 +1,32 @@
---- hal-0.5.7/hal.conf.in.orig 2006-03-03 20:29:50.000000000 +0000
-+++ hal-0.5.7/hal.conf.in 2006-03-03 20:31:26.000000000 +0000
-@@ -33,10 +33,12 @@
- <deny send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+--- 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>
-- <!-- This will not work if pam_console support is not enabled -->
-- <policy at_console="true">
+- <!-- 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"/>
++ <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>
++ <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"/>
More information about the arch-commits
mailing list