diff options
Diffstat (limited to 'abs/core-testing/hal')
| -rw-r--r-- | abs/core-testing/hal/PKGBUILD | 22 | ||||
| -rw-r--r-- | abs/core-testing/hal/fix-udev-compatibility.patch | 31 | ||||
| -rw-r--r-- | abs/core-testing/hal/ntfs-mount-fix.patch | 18 |
3 files changed, 65 insertions, 6 deletions
diff --git a/abs/core-testing/hal/PKGBUILD b/abs/core-testing/hal/PKGBUILD index f1a3b3f..4bad72d 100644 --- a/abs/core-testing/hal/PKGBUILD +++ b/abs/core-testing/hal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 8861 2008-08-16 22:34:13Z eric $ +# $Id: PKGBUILD 12450 2008-09-14 10:49:05Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=hal pkgver=0.5.11 -pkgrel=1 +pkgrel=4 pkgdesc="Hardware Abstraction Layer" arch=(i686 x86_64) license=('GPL' 'custom') @@ -18,10 +18,17 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2 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 + ntfs-mount-fix.patch) +md5sums=('5e8935ab61bcb14afd2d4548084aace0' + '277e96ac130d7bfce0b30f0b80db8782' + '18dcdaa79952e2057c2e4745fbc8ad52' + 'c688a3c6574699365926f4fef7441545' + '4d4b6801a1cedca22b8bdd9db73b16fb' + '4242a2c78885e396f639d0cd5e33218c' + '1a33d73fa422df2f05b7e3483836f778' + '96cf8835c30dc581c4fcf72b6ad7675e') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -29,6 +36,9 @@ build() { 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 + patch -p0 -i ${srcdir}/ntfs-mount-fix.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/hal --enable-static=no \ diff --git a/abs/core-testing/hal/fix-udev-compatibility.patch b/abs/core-testing/hal/fix-udev-compatibility.patch new file mode 100644 index 0000000..2cfa3ad --- /dev/null +++ b/abs/core-testing/hal/fix-udev-compatibility.patch @@ -0,0 +1,31 @@ +diff -Nur hal-0.5.11.orig/hald/linux/blockdev.c hal-0.5.11/hald/linux/blockdev.c +--- hal-0.5.11.orig/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200 ++++ hal-0.5.11/hald/linux/blockdev.c 2008-09-12 19:38:36.000000000 +0200 +@@ -1750,11 +1750,11 @@ + 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; +- argv[5] = sysfs_path; ++ argv[6] = sysfs_path; + + g_error = NULL; + +diff -Nur hal-0.5.11.orig/hald/linux/coldplug.c hal-0.5.11/hald/linux/coldplug.c +--- hal-0.5.11.orig/hald/linux/coldplug.c 2008-05-08 01:23:32.000000000 +0200 ++++ hal-0.5.11/hald/linux/coldplug.c 2008-09-12 19:37:47.000000000 +0200 +@@ -149,8 +149,8 @@ + 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; diff --git a/abs/core-testing/hal/ntfs-mount-fix.patch b/abs/core-testing/hal/ntfs-mount-fix.patch new file mode 100644 index 0000000..13597f2 --- /dev/null +++ b/abs/core-testing/hal/ntfs-mount-fix.patch @@ -0,0 +1,18 @@ +--- tools/hal-storage-mount.c.orig 2008-04-21 01:48:27.000000000 +0200 ++++ tools/hal-storage-mount.c 2008-04-21 01:47:44.000000000 +0200 +@@ -769,13 +769,13 @@ + + if (pol_is_fixed) { + if (pol_change_uid) { +- action = NULL; /* "hal-storage-mount-fixed-extra-options"; TODO: rethink */ ++ action = "hal-storage-mount-fixed-extra-options"; /*TODO: rethink */ + } else { + action = "org.freedesktop.hal.storage.mount-fixed"; + } + } else { + if (pol_change_uid) { +- action = NULL; /* "hal-storage-mount-removable-extra-options"; TODO: rethink "extra-options" */ ++ action = "hal-storage-mount-removable-extra-options"; /*TODO: rethink "extra-options" */ + } else { + action = "org.freedesktop.hal.storage.mount-removable"; + } |