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

[Jan de Groot]

    Date: Saturday, August 1, 2009 @ 10:17:26
  Author: jgc
Revision: 48324

upgpkg: hal 0.5.13-1
    Update to 0.5.13, add to testing because of util-linux-ng

Added:
  hal/trunk/mdraid-segfault.patch
Modified:
  hal/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   44 ++++++++++++++++++++------------------------
 mdraid-segfault.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-01 14:02:44 UTC (rev 48323)
+++ PKGBUILD	2009-08-01 14:17:26 UTC (rev 48324)
@@ -3,45 +3,41 @@
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=hal
-pkgver=0.5.12git20090421.4fc367
-pkgrel=2
+pkgver=0.5.13
+pkgrel=1
 pkgdesc="Hardware Abstraction Layer"
-_gitver=4fc367117b20eea5e7f8f05c0d59de4976d37c49
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.80' 'libusb>=0.1.12' 'udev>=141' 'filesystem>=0.7.1-5' 'hal-info>=0.20090414' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'policykit>=0.9-6' 'consolekit>=0.3.0')
+depends=('dbus-glib>=0.80' 'libusb>=0.1.12' 'udev>=141' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'policykit>=0.9-6' 'consolekit>=0.3.0' 'util-linux-ng>=2.16')
 makedepends=('pkgconfig' 'gperf')
 options=('!libtool' '!makeflags')
 install=hal.install
-source=(ftp://ftp.archlinux.org/other/hal/hal-${_gitver}.tar.bz2
-	hal
-	cryptsetup_location.patch
-	hal-0.5.9-hide-diagnostic.patch)
-md5sums=('3f9eab71ccf483cf880528901ef227e5'
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+        hal
+        cryptsetup_location.patch
+        hal-0.5.9-hide-diagnostic.patch
+        mdraid-segfault.patch)
+md5sums=('46ecc5d2e5bd964fb78099688f01bb6a'
          '277e96ac130d7bfce0b30f0b80db8782'
          'c688a3c6574699365926f4fef7441545'
-         '4d4b6801a1cedca22b8bdd9db73b16fb')
+         '4d4b6801a1cedca22b8bdd9db73b16fb'
+         '3732682a5fe3b2b5279ced988909f554')
 
 build() {
-  cd "${srcdir}/${pkgname}-${_gitver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/cryptsetup_location.patch" || return 1
   patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" || return 1
+  patch -Np1 -i "${srcdir}/mdraid-segfault.patch" || return 1
 
-  libtoolize --force || return 1
-  aclocal || return 1
-  autoconf || return 1
-  autoheader || return 1
-  automake --add-missing || return 1
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
-	      --enable-static=no --enable-acpi-ibm --enable-acpi-toshiba \
-              --disable-docbook-docs --enable-console-kit \
-	      --enable-policy-kit --enable-acl-management \
-	      --enable-umount-helper --disable-smbios \
-	      --with-hal-user=hal --with-hal-group=hal \
-	      --with-pid-file=/var/run/hald.pid || return 1
+      --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
+      --enable-static=no --enable-acpi-ibm --enable-acpi-toshiba \
+      --disable-docbook-docs --enable-console-kit \
+      --enable-policy-kit --enable-acl-management \
+      --enable-umount-helper --disable-smbios \
+      --with-hal-user=hal --with-hal-group=hal \
+      --with-pid-file=/var/run/hald.pid || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   install -m755 -d "${pkgdir}/etc/rc.d"

Added: mdraid-segfault.patch
===================================================================
--- mdraid-segfault.patch	                        (rev 0)
+++ mdraid-segfault.patch	2009-08-01 14:17:26 UTC (rev 48324)
@@ -0,0 +1,39 @@
+From 141ca8cd7b768ddefa1bfaa563cbef4337e32b7c Mon Sep 17 00:00:00 2001
+From: Martin Poole <mpoole at redhat.com>
+Date: Wed, 29 Jul 2009 13:20:45 +0000
+Subject: Fix a segfault in the mdraid code -- see rh#507782 for more info
+
+Signed-off-by: Richard Hughes <richard at hughsie.com>
+---
+diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
+index 69ba026..7b47431 100644
+--- a/hald/linux/blockdev.c
++++ b/hald/linux/blockdev.c
+@@ -878,7 +878,7 @@ error:
+ }
+ 
+ 
+-void
++
+ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_file, gboolean is_partition,
+ 				  HalDevice *parent, void *end_token)
+ {
+@@ -893,6 +893,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
+         gboolean is_md_device;
+ 	gboolean is_cciss_device;
+         int md_number;
++	char tc;
+ 
+ 	is_device_mapper = FALSE;
+         is_fakevolume = FALSE;
+@@ -911,7 +912,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
+ 		HAL_INFO (("Handling %s as fakevolume - sysfs_path_real=%s", device_file, sysfs_path_real));
+ 		is_fakevolume = TRUE;
+ 		sysfs_path_real = hal_util_get_parent_path (sysfs_path);
+-        } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d", &md_number) == 1) {
++        } else if (sscanf (hal_util_get_last_element (sysfs_path), "md%d%c", &md_number, &tc) == 1) {
+ 		HAL_INFO (("Handling %s as MD device", device_file));
+                 is_md_device = TRUE;
+ 		sysfs_path_real = g_strdup (sysfs_path);
+--
+cgit v0.8.2