[arch-commits] Commit in hal/trunk (PKGBUILD fix-udev-compatibility.patch)

[Thomas Baechler]

    Date: Friday, September 12, 2008 @ 12:17:29
  Author: thomas
Revision: 12295

upgpkg: hal 0.5.11-1

Added:
  hal/trunk/fix-udev-compatibility.patch
Modified:
  hal/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   15 +++++++++++----
 fix-udev-compatibility.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-12 15:04:45 UTC (rev 12294)
+++ PKGBUILD	2008-09-12 16:17:29 UTC (rev 12295)
@@ -18,10 +18,15 @@
 	hal-policy.patch
 	cryptsetup_location.patch
 	hal-0.5.9-hide-diagnostic.patch
-	ntfs3g-valid-options.patch)
-md5sums=('5e8935ab61bcb14afd2d4548084aace0' '277e96ac130d7bfce0b30f0b80db8782'\
-         '18dcdaa79952e2057c2e4745fbc8ad52' 'c688a3c6574699365926f4fef7441545'\
-         '4d4b6801a1cedca22b8bdd9db73b16fb' '4242a2c78885e396f639d0cd5e33218c')
+	ntfs3g-valid-options.patch
+	fix-udev-compatibility.patch)
+md5sums=('5e8935ab61bcb14afd2d4548084aace0'
+         '277e96ac130d7bfce0b30f0b80db8782'
+         '18dcdaa79952e2057c2e4745fbc8ad52'
+         'c688a3c6574699365926f4fef7441545'
+         '4d4b6801a1cedca22b8bdd9db73b16fb'
+         '4242a2c78885e396f639d0cd5e33218c'
+         '000573c32080fdc5846f44dafcf515b8')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -29,6 +34,8 @@
   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
+  # Fix compatibility with udev 126 and later
+  patch -Np1 -i ${startdir}/src/fix-udev-compatibility.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --libexecdir=/usr/lib/hal --enable-static=no \

Added: fix-udev-compatibility.patch
===================================================================
--- fix-udev-compatibility.patch	                        (rev 0)
+++ fix-udev-compatibility.patch	2008-09-12 16:17:29 UTC (rev 12295)
@@ -0,0 +1,35 @@
+From: Danny Kukawka <danny.kukawka at web.de>
+Date: Wed, 27 Aug 2008 19:24:33 +0000 (+0200)
+Subject: use udevadm instead of (deprecated) udevinfo
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=f6af40c1e7ea54e69eb2d259d91dd212065d5f6e
+
+use udevadm instead of (deprecated) udevinfo
+
+Use udevadm instead of (deprecated) udevinfo. Adapted/fixed version
+of a patch contributed by Lucas Hazel <lucas at die.net.au> via HAL ML.
+---
+
+--- a/hald/linux/blockdev.c
++++ b/hald/linux/blockdev.c
+@@ -1770,7 +1770,7 @@ udev_get_device_file_for_sysfs_path (con
+         char *ret;
+         char *u_stdout;
+         int u_exit_status;
+-        const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL};
++        const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
+         GError *g_error;
+ 
+         ret = NULL;
+--- a/hald/linux/coldplug.c
++++ b/hald/linux/coldplug.c
+@@ -149,8 +149,8 @@ udev_info_to_hotplug_event (const UdevIn
+ static gboolean
+ hal_util_init_sysfs_to_udev_map (void)
+ {
+-	char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL };
+-	char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL };
++	char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
++	char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
+ 	int udevinfo_exitcode;
+ 	UdevInfo *info = NULL;
+ 	char *p;