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

[Tom Gundersen]

    Date: Saturday, March 31, 2012 @ 18:08:05
  Author: tomegun
Revision: 154956

upgpkg: udev 181-6

fix a bug found by falconindy in my patch to read from /lib

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

-------------------------------------------------------------+
 0001-split-usr-always-read-config-files-from-lib-udev.patch |   27 ++++++++--
 PKGBUILD                                                    |    2 
 2 files changed, 24 insertions(+), 5 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-03-31 21:06:52 UTC (rev 154955)
+++ 0001-split-usr-always-read-config-files-from-lib-udev.patch	2012-03-31 22:08:05 UTC (rev 154956)
@@ -1,4 +1,4 @@
-From 4c55c8d844e6f1a5b1f14cce23b247134bfd3a8d Mon Sep 17 00:00:00 2001
+From f2bdace5bb68d4f3162f886b27210762d8b115b8 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,13 +6,24 @@
 This means we don't need a flagday in order to move udev to use
 /usr/lib/udev/rules.d
 ---
- src/libudev.c |   20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
+ src/libudev.c |   25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
 
 diff --git a/src/libudev.c b/src/libudev.c
-index be24329..0359bb4 100644
+index be24329..754d713 100644
 --- a/src/libudev.c
 +++ b/src/libudev.c
+@@ -43,8 +43,8 @@ struct udev {
+         void *userdata;
+         char *sys_path;
+         char *dev_path;
+-        char *rules_path[4];
+-        unsigned long long rules_path_ts[4];
++        char *rules_path[5];
++        unsigned long long rules_path_ts[5];
+         int rules_path_count;
+         char *run_path;
+         struct udev_list properties_list;
 @@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void)
                          goto err;
  
@@ -56,6 +67,14 @@
          free(config_file);
          return udev;
  err:
+@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev)
+         free(udev->rules_path[0]);
+         free(udev->rules_path[1]);
+         free(udev->rules_path[2]);
++        free(udev->rules_path[3]);
+         free(udev->run_path);
+         dbg(udev, "context %p released\n", udev);
+         free(udev);
 -- 
 1.7.9.5
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-31 21:06:52 UTC (rev 154955)
+++ PKGBUILD	2012-03-31 22:08:05 UTC (rev 154956)
@@ -66,7 +66,7 @@
   done
 }
 md5sums=('0d7af750702620a871b9f9b98d8ad859'
-         'f27fa19645016cae732659b0f1c20f0f'
+         '02a0dbbdcba6c1eae3ef65b6b06bde1f'
          'a9fae85491a08d7759388c605389a8c5'
          'a4dd853050bf2e0ae6b2e3d2c75499c2'
          'ee0bfe91a20fff12cc25ab1d1e024853')