[arch-commits] Commit in udev/trunk (3 files)

[Tom Gundersen]

    Date: Monday, April 9, 2012 @ 09:22:48
  Author: tomegun
Revision: 155919

upgpkg: udev 182-1

upstream release udev-acl has been dropped so consolekit must be updated

Modified:
  udev/trunk/0001-split-usr-always-read-config-files-from-lib-udev.patch
  udev/trunk/0002-reinstate-TIMEOUT-handling.patch
  udev/trunk/PKGBUILD

-------------------------------------------------------------+
 0001-split-usr-always-read-config-files-from-lib-udev.patch |   25 ++++------
 0002-reinstate-TIMEOUT-handling.patch                       |   16 +++---
 PKGBUILD                                                    |   13 ++---
 3 files changed, 26 insertions(+), 28 deletions(-)

Modified: 0001-split-usr-always-read-config-files-from-lib-udev.patch
===================================================================
--- 0001-split-usr-always-read-config-files-from-lib-udev.patch	2012-04-09 13:20:09 UTC (rev 155918)
+++ 0001-split-usr-always-read-config-files-from-lib-udev.patch	2012-04-09 13:22:48 UTC (rev 155919)
@@ -1,4 +1,4 @@
-From f2bdace5bb68d4f3162f886b27210762d8b115b8 Mon Sep 17 00:00:00 2001
+From 12250c0acf747d4ed538927ad7604356b93fb444 Mon Sep 17 00:00:00 2001
 From: Tom Gundersen <teg at jklm.no>
 Date: Sat, 3 Mar 2012 12:28:15 +0100
 Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev
@@ -6,11 +6,11 @@
 This means we don't need a flagday in order to move udev to use
 /usr/lib/udev/rules.d
 ---
- src/libudev.c |   25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
+ src/libudev.c |   23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
 
 diff --git a/src/libudev.c b/src/libudev.c
-index be24329..754d713 100644
+index d954dae..4da6309 100644
 --- a/src/libudev.c
 +++ b/src/libudev.c
 @@ -43,8 +43,8 @@ struct udev {
@@ -24,7 +24,7 @@
          int rules_path_count;
          char *run_path;
          struct udev_list properties_list;
-@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void)
+@@ -255,9 +255,14 @@ UDEV_EXPORT struct udev *udev_new(void)
                          goto err;
  
          if (udev->rules_path[0] == NULL) {
@@ -40,18 +40,17 @@
 +                if (!udev->rules_path[1])
                          goto err;
  
+                 /* /run/udev -- runtime rules */
+@@ -265,11 +270,11 @@ UDEV_EXPORT struct udev *udev_new(void)
+                         goto err;
+ 
                  /* /etc/udev -- local administration rules */
 -                udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d");
 -                if (!udev->rules_path[1])
-+                udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d");
-+                if (!udev->rules_path[2])
++                udev->rules_path[3] = strdup(SYSCONFDIR "/udev/rules.d");
++                if (!udev->rules_path[3])
                          goto err;
  
-                 /* /run/udev -- runtime rules */
--                if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0)
-+                if (asprintf(&udev->rules_path[3], "%s/rules.d", udev->run_path) < 0)
-                         goto err;
- 
 -                udev->rules_path_count = 3;
 +                udev->rules_path_count = 4;
          }
@@ -76,5 +75,5 @@
          dbg(udev, "context %p released\n", udev);
          free(udev);
 -- 
-1.7.9.5
+1.7.10
 

Modified: 0002-reinstate-TIMEOUT-handling.patch
===================================================================
--- 0002-reinstate-TIMEOUT-handling.patch	2012-04-09 13:20:09 UTC (rev 155918)
+++ 0002-reinstate-TIMEOUT-handling.patch	2012-04-09 13:22:48 UTC (rev 155919)
@@ -1,4 +1,4 @@
-From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001
+From 629d840316280cffcc724fac41047374a7685490 Mon Sep 17 00:00:00 2001
 From: Tom Gundersen <teg at jklm.no>
 Date: Thu, 15 Mar 2012 02:12:43 +0100
 Subject: [PATCH 2/2] reinstate TIMEOUT= handling
@@ -21,18 +21,18 @@
  4 files changed, 32 insertions(+), 3 deletions(-)
 
 diff --git a/TODO b/TODO
-index 36e8440..c2e59b6 100644
+index 8b8b9c8..3d26e89 100644
 --- a/TODO
 +++ b/TODO
-@@ -1,6 +1,8 @@
-  - find a way to tell udev to not cancel firmware
-    requests in initramfs
+@@ -7,6 +7,8 @@
  
+  - move /usr/lib/udev/devices/ to tmpfiles
+ 
 + - remove TIMEOUT= handling
 +
-  - move /lib/udev/devices/ to tmpfiles
+  - trigger --subsystem-match=usb/usb_device
  
-  - trigger --subsystem-match=usb/usb_device
+  - kill rules_generator
 diff --git a/src/libudev-device.c b/src/libudev-device.c
 index 10f28b8..639c367 100644
 --- a/src/libudev-device.c
@@ -142,5 +142,5 @@
  }
  
 -- 
-1.7.9.5
+1.7.10
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-09 13:20:09 UTC (rev 155918)
+++ PKGBUILD	2012-04-09 13:22:48 UTC (rev 155919)
@@ -5,8 +5,8 @@
 # Contributor: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=udev
-pkgver=181
-pkgrel=10
+pkgver=182
+pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
 install=udev.install
@@ -33,8 +33,7 @@
               --sysconfdir=/etc \
               --libexecdir=/usr/lib \
               --with-systemdsystemunitdir=/usr/lib/systemd/system \
-              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
-              --enable-udev_acl
+              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
 
   make
 }
@@ -71,8 +70,8 @@
                s#GROUP="cdrom"#GROUP="optical"#g' $i
   done
 }
-md5sums=('0d7af750702620a871b9f9b98d8ad859'
-         '02a0dbbdcba6c1eae3ef65b6b06bde1f'
-         'a9fae85491a08d7759388c605389a8c5'
+md5sums=('023877e6cc0d907994b8c648beab542b'
+         '0fa3eac115ad0140af1582d941b15f2c'
+         '94b816896bf23275c0598fc8e07270c3'
          'a4dd853050bf2e0ae6b2e3d2c75499c2'
          'd2b16edc6d806b5dafdbbad43ae5a3de')