fix selinux for beta2, fix location of udev-init-scripts dep

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 73 insertions, 13 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 3759726b6dab..8f6437f460f7 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.23 2013/01/28 14:34:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.24 2013/01/28 21:25:21 axs Exp $
+
+  28 Jan 2013; Ian Stakenvicius <axs@gentoo.org> eudev-1_beta2-r1.ebuild,
+  eudev-9999.ebuild, +files/eudev-fix-selinux.patch:
+  fix selinux for beta2, fix location of udev-init-scripts dep
 
   28 Jan 2013; Ian Stakenvicius <axs@gentoo.org> eudev-1_beta2-r1.ebuild,
   eudev-9999.ebuild:
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index d2862315a36a..d067d5fd874b 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120
+AUX eudev-fix-selinux.patch 1321 SHA256 28fa9572387c07e69b45f58f14962b850c1d64263c58ce0259d2c1c718dcb119 SHA512 50f50fedf3ced6bac31041d6ffd3a7bafd36721f0005efbb8f41ea70b47f7a642588010ddd0a55bcdfe03a00ac95164e76e1457bb0a0b707d204abe3f66548c4 WHIRLPOOL 777e4ffa9cf4f1f2d13b8328e4787298bf9be624422e8cc2e862da817752b04e35363ed302390c76fdd3ae41e6f44e153d318f0095f67cf7bf85ba03463c1916
 AUX eudev-fix-typo-util.c.patch 889 SHA256 9c9811d8a71939a69ce94e9cff2989326458c7715da4fe0baebfb8f90dab915c SHA512 67ac0fe35dc0c8064c62ab2bcc5db3fe06fb5cff58d4716b5e36a595958fe4c599bb7fe66cf54696eb096ace5f24c97d11f4a179674e0b55d60c32d06f6905d2 WHIRLPOOL c923be2ab69119a5496938efab16f8960d82699aa1ecd6963d56aaa80c755aad3eff668cbf7d7912d87989ef596a52a17ee58a2b84a62c3d890549ca0ed05610
 DIST eudev-1_beta2.tar.gz 1671231 SHA256 359ed1a6d8e48599c1337f54a5c796fe3195f210f89ff22b352f622afe112fd6 SHA512 7a63d411221f4e267de95f500d1f4c69017abd26af212dbaf0af770346ad3942bd1af125a525fe1a57185f085710495369dd1495ee2df714f7dbbdca12fa4717 WHIRLPOOL a43777891fe303d68ba59f221c1698e450ab346392a157e82f750e0a7698c35a31801d4f0876b546b4c486b548eb10394e0c5a517af28762edaf2df09745aa32
-EBUILD eudev-1_beta2-r1.ebuild 6009 SHA256 0108b2c34d872ceadf85791e218846590f9065490b0f2b153f55b371274845cd SHA512 7c2092d50bf041f6e4f0b925496f75f7a2712a2887ba936d93c966b71930fd9b3a1040a67e7a802995e37935b3e63aa4f18cc3d13f9b0539fa44f72853aa7280 WHIRLPOOL 5a8448872375bdfdb4e11658ae9db34ae5dbf2ffb33ed26bd63b371cbbac234f7744e1b9df235942226d074aa7fe5292da8f2fed7e22b5d9229de12c4d4e62b6
-EBUILD eudev-9999.ebuild 5904 SHA256 b2ef19b4190d807283d0b745e3d05a4f932a1aafaa92a10180658583aff1f739 SHA512 a7cd9a09bf908f76bd9b5a6dda07820f7f79db60fc403bc4bd22f1c02c0d7205309676a81e4beb3c83255c544c2ec9a63dced352ad36fe83aabdd1eb100304e5 WHIRLPOOL 9b79e4d0b1d2c699a44bc1650d060bd11a87f67a25a3c3fd955671f2bd3c4951f00fe19b29149cb1e82ffcf98ab32e84609cc1cf078974280f32f6751d8dfc5e
-MISC ChangeLog 4226 SHA256 7701eac3c7e5ebec040f1bb1ce254e5298e14e9fd04c5bb64176600a81482396 SHA512 69732c34c5f15b27d92000ec5298a91e4623d7187840e44db207ffe8322f45b1040fca29211af685c9577429da51f8bb9183416dd72dd3a78cdab264784fbb31 WHIRLPOOL b92a3988ffa60b5c138db69e87c0a5d87770100d500a08dd2b3618e3f5a73361226cf265d393cad76be5c75156aee3c5af0bc215de25fb816fb9207178dde79b
+EBUILD eudev-1_beta2-r1.ebuild 6160 SHA256 02c4a5e0ff9ab1b9ff74f2da4a46775c4638d5037a3ad7544cf8fee93833d806 SHA512 37ea7ce0ec82a5198df4db0b019e5357a7a6833a408c03680afa85412e7692628fdce62576bce78edf1aabc4cecb601018dfc7c0c151b968acb643609a3cc3e8 WHIRLPOOL fa8edf65b80dffef9a0f0ada1e2bccf60c4b8a16238a97a51e20f7b8d2bb695299c2bbe7fbd844ff7094f63008ffac419f197e2b03bf68b06ecce90fd2f71684
+EBUILD eudev-9999.ebuild 5904 SHA256 310f2577df0edf295e5d528acc413e6da978f63d9f2615da80702f733f543e26 SHA512 e246233f9b7b5083e02b45954028dfe28f22dd4e6416919f0ecbb7799e9af5c7db232bd26da0bb7ad8048696610af5afcd73010d6d3c60a22e75a95e93f084d5 WHIRLPOOL 702f5bec13fb404cc8ae8f03d2bd193cb5b4ddc576e8edea06874271f0ac6545414187bb0a3102b9244c7bb47c71ba74f2a327a7adbc434e76463966285198d4
+MISC ChangeLog 4417 SHA256 749003470e67ddc275d5f35f5420f1f0c2eaa6d84dc9403449505bb55e1e2c22 SHA512 1be4594bf237dc93fe121d719a0665d3467b21647926d66443fd22af290b3c18fe823030c6b82cf658d81b477beec160b8a5e531585117a036a82ad58e6cf340 WHIRLPOOL c7e2cd4fe050076a51309364ca045500298adbc13ad10c17583366ace8f962a70c34958694818b9eda0eb2de7ba917d01b1493676bb0e15ca6295317e02f399c
 MISC metadata.xml 844 SHA256 78ecbe92dba7b1e2af874b67be804a1285c82fe077a1f8b2587afa72704090ea SHA512 b22fca64c49bb33fb79d317c387a1385fab62327e836ad84b69cd970036e8fabc8e4dd2aad6557992725f2159e713932a48e506ebdbdbad61f3cc6ecd64f6c92 WHIRLPOOL b6635b25c6fd5c7784214cc3f71b77b447d6942901315210441e15f41cb5b8a134ab002fbd200b652e764a74326727813f953066caf54e545a8d45c04436d258
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEGjIgACgkQ2ugaI38ACPCcYwD+LZG/E/EHNJe/HvgIwGanlkUH
-F7jCWTcVjOp2rJvS4iAA/1MZzOSE6UrptjKyQdc4f4WeBDuYOrATnqN84abFoj2u
-=rg0v
+iF4EAREIAAYFAlEG7M0ACgkQ2ugaI38ACPC1dQD/Vr+1ZACfn7atRPDzopibXJBt
+U3dBrqcXklrERLPZjYoA/At+Oltv1DoyLhsCgg5vt+kJzNoGhIJnqnh4ih39sk3f
+=Rtdf
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1_beta2-r1.ebuild b/sys-fs/eudev/eudev-1_beta2-r1.ebuild
index f4fa5f12801b..d875d9370dd6 100644
--- a/sys-fs/eudev/eudev-1_beta2-r1.ebuild
+++ b/sys-fs/eudev/eudev-1_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta2-r1.ebuild,v 1.5 2013/01/28 14:34:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta2-r1.ebuild,v 1.6 2013/01/28 21:25:21 axs Exp $
 
 EAPI=5
 
@@ -45,7 +45,6 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-18 )
 	!sys-fs/udev
 	!sys-apps/coldplug
 	!sys-apps/systemd
@@ -53,7 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/device-mapper
 	!<sys-fs/udev-init-scripts-18"
 
-PDEPEND=">=virtual/udev-180"
+PDEPEND=">=virtual/udev-180
+	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 udev_check_KV()
 {
@@ -117,6 +117,12 @@ src_prepare()
 	# Fix a typo found after 1_beta2 was rolled out
 	epatch "${FILESDIR}/${PN}-fix-typo-util.c.patch"
 
+	# Fix selinux - make it optional as eautoreconf is required
+	if use selinux ; then
+		epatch "${FILESDIR}/${PN}-fix-selinux.patch"
+		rm configure
+	fi
+
 	epatch_user
 
 	if [[ ! -e configure ]]
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 2a1924ccf88c..d3e27d06eadb 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.17 2013/01/28 14:34:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.18 2013/01/28 21:25:21 axs Exp $
 
 EAPI=5
 
@@ -45,7 +45,6 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	hwdb? ( >=sys-apps/hwids-20121202.2[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-18 )
 	!sys-fs/udev
 	!sys-apps/coldplug
 	!sys-apps/systemd
@@ -53,7 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/device-mapper
 	!<sys-fs/udev-init-scripts-18"
 
-PDEPEND=">=virtual/udev-180"
+PDEPEND=">=virtual/udev-180
+	openrc? ( >=sys-fs/udev-init-scripts-18 )"
 
 udev_check_KV()
 {
diff --git a/sys-fs/eudev/files/eudev-fix-selinux.patch b/sys-fs/eudev/files/eudev-fix-selinux.patch
new file mode 100644
index 000000000000..ad13a59d5400
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-fix-selinux.patch
@@ -0,0 +1,49 @@
+commit 26e92619267df364bac4aed29376a36669fb53d3
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date:   Mon Jan 28 11:16:31 2013 -0500
+
+    Add missing selinux code to udev core (convenience lib)
+    
+    Original Author: Alexey D. (TZ86)
+    Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
+    Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
+
+diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am
+index 972c275..866d2c2 100644
+--- a/src/udev/Makefile.am
++++ b/src/udev/Makefile.am
+@@ -72,7 +72,8 @@ libudev_core_la_CFLAGS = \
+ 
+ libudev_core_la_LIBADD = \
+ 	$(top_builddir)/src/libudev/libudev-private.la \
+-	$(BLKID_LIBS)
++	$(BLKID_LIBS) \
++	$(SELINUX_LIBS)
+ 
+ if HAVE_MODULES
+ libudev_core_la_SOURCES += \
+diff --git a/src/udev/label.c b/src/udev/label.c
+index d353da5..7e8d8f9 100644
+--- a/src/udev/label.c
++++ b/src/udev/label.c
+@@ -31,12 +31,19 @@
+ #include "path-util.h"
+ 
+ #ifdef HAVE_SELINUX
+-#include "selinux-util.h"
++#include <stdbool.h>
+ #include <selinux/selinux.h>
+ #include <selinux/label.h>
+ 
+ static struct selabel_handle *label_hnd = NULL;
++static int use_selinux_cached = -1;
+ 
++bool use_selinux(void) {
++        if (use_selinux_cached < 0)
++                use_selinux_cached = is_selinux_enabled() > 0;
++
++        return use_selinux_cached;
++}
+ #endif
+ 
+ int label_init(const char *prefix) {