support all udev rules dirs

(Portage version: 2.1.11.36/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

4 files changed, 71 insertions, 3 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 2e3ca4a50d4b..004bfcbf249f 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.5 2012/12/12 14:06:33 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.6 2012/12/12 16:39:09 axs Exp $
+
+*eudev-1_beta1-r1 (12 Dec 2012)
+
+  12 Dec 2012; Ian Stakenvicius <axs@gentoo.org> -eudev-1_beta1.ebuild,
+  +eudev-1_beta1-r1.ebuild,
+  +files/eudev-1_beta1-include-all-search-paths.patch, eudev-9999.ebuild:
+  support all udev rules dirs
 
   12 Dec 2012; Ian Stakenvicius <axs@gentoo.org> eudev-9999.ebuild:
   fixed typos in deps on the live ebuild
diff --git a/sys-fs/eudev/eudev-1_beta1.ebuild b/sys-fs/eudev/eudev-1_beta1-r1.ebuild
index d22a630c21ce..4d5226b991ec 100644
--- a/sys-fs/eudev/eudev-1_beta1.ebuild
+++ b/sys-fs/eudev/eudev-1_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta1.ebuild,v 1.4 2012/12/11 19:14:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta1-r1.ebuild,v 1.1 2012/12/12 16:39:09 axs Exp $
 
 EAPI=4
 
@@ -115,6 +115,8 @@ pkg_setup()
 
 src_prepare()
 {
+	epatch "${FILESDIR}"/${P}-include-all-search-paths.patch
+
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
 		-i rules/*.rules \
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 879e221d63dc..41a0a4d0c7a5 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.5 2012/12/12 14:06:33 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.6 2012/12/12 16:39:09 axs Exp $
 
 EAPI=4
 
@@ -11,6 +11,7 @@ inherit autotools eutils linux-info
 if [[ ${PV} = 9999* ]]
 then
 	EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
+	EGIT_MASTER="fixpaths"
 	inherit git-2
 else
 	SRC_URI="https://github.com/downloads/gentoo/${PN}/${P}.tar.gz"
diff --git a/sys-fs/eudev/files/eudev-1_beta1-include-all-search-paths.patch b/sys-fs/eudev/files/eudev-1_beta1-include-all-search-paths.patch
new file mode 100644
index 000000000000..9068bd7a57b7
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-1_beta1-include-all-search-paths.patch
@@ -0,0 +1,58 @@
+--- a/src/udev/Makefile.in	2012-12-08 10:20:52.000000000 -0500
++++ b/src/udev/Makefile.in	2012-12-12 11:19:34.000000000 -0500
+@@ -371,6 +371,7 @@
+ 	-DROOTPREFIX=\"$(rootprefix)\" \
+ 	-DUDEV_HWDB_DIR=\"$(udevhwdbdir)\" \
+ 	-DUDEV_HWDB_BIN=\"$(udevhwdbbin)\" \
++	-DUDEV_CONF_DIR=\"$(udevconfdir)\" \
+ 	-DUDEV_RULES_DIR=\"$(udevrulesdir)\" \
+ 	-DUDEV_LIBEXEC_DIR=\"$(udevlibexecdir)\" \
+ 	-I $(top_srcdir)/src/libudev
+--- a/src/udev/udev-event.c
++++ b/src/udev/udev-event.c
+@@ -687,10 +687,13 @@ int udev_event_spawn(struct udev_event *event,
+         }
+ 
+         /* allow programs in /usr/lib/udev/ to be called without the path */
++	/* NOTE - paths need reworking, see note in udev-rules.c */
+         if (argv[0][0] != '/') {
+                 util_strscpyl(program, sizeof(program), UDEV_LIBEXEC_DIR "/", argv[0], NULL);
+ #ifdef HAVE_SPLIT_USR
+                 if(access(program, X_OK))
++                        util_strscpyl(program, sizeof(program), "/usr/lib/udev/", argv[0], NULL);
++                if(access(program, X_OK))
+                         util_strscpyl(program, sizeof(program), "/lib/udev/", argv[0], NULL);
+ #endif
+                 argv[0] = program;
+--- a/src/udev/udev-rules.c
++++ b/src/udev/udev-rules.c
+@@ -1600,11 +1600,28 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
+         if (!rules->strbuf)
+                 return udev_rules_unref(rules);
+ 
+-        rules->dirs = strv_new(UDEV_RULES_DIR,
++	/* Note - need a better way to manage these paths:
++	 * ie, should have a list of paths we always support, and
++	 * do not include the #define vars if they are duplicates
++	 *
++	 * original - UDEV_RULES_DIR should be /etc/udev/rules.d
++	 * ..but we have it set to UDEV_LIBEXEC_DIR "/rules.d" so that
++	 * ..the default rules are installed there instead of in /etc
++	 * 
++	 * original2 - UDEV_LIBEXEC_DIR used to be forced to /usr/lib/udev
++	 * ..by default, we have it as /lib/udev (or whatever rootlibdir is)
++	 * ..therefore we did not include /usr/lib/udev/rules.d.
++	 * 
++	 * Reworked code; there are duplicate paths here but at least
++	 * everyting is listed.
++	 */
++        rules->dirs = strv_new(UDEV_CONF_DIR "/rules.d",
++                               UDEV_RULES_DIR,
+                                "/run/udev/rules.d",
+                                UDEV_LIBEXEC_DIR "/rules.d",
+ #ifdef HAVE_SPLIT_USR
+                                "/lib/udev/rules.d",
++                               "/usr/lib/udev/rules.d",
+ #endif
+                                NULL);
+         if (!rules->dirs) {