Fixed compile issue on selinux (missing #define), clean an old patch

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

7 files changed, 50 insertions, 61 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index fa107984031e..e6ceb614c97b 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.59 2013/08/08 14:10:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.60 2013/08/08 15:19:47 axs Exp $
+
+  08 Aug 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/eudev-selinux-timespan.patch, -files/eudev-fix-selinux.patch,
+  eudev-1.1.ebuild, eudev-1.2-r1.ebuild, eudev-1.2.ebuild:
+  Fixed compile issue on selinux (missing #define), clean an old patch
 
   08 Aug 2013; Jeroen Roovers <jer@gentoo.org> eudev-1.1.ebuild:
   Stable for HPPA (bug #463910).
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 671380331370..1628399ad0ea 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA256
 
 AUX 40-gentoo.rules 365 SHA256 e11d66732dc0d629fdb8c06357db8be5339f2ecf28c2572c5af8637449f549ec SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b WHIRLPOOL 54d962fa515255df5f37bc5c71a3774a909a809809138dba12ed22c6fda78ef336f4e98014f37dbc44289de1ba08f5f2ea31311e14b29a0bbe2cc3d6587d7425
-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
 AUX eudev-hwdb-offset-root.patch 8128 SHA256 c8ae85b2bc69e360b96d9b47fb55b3cec5c44d3ed9cb0ed20f70d05ac2e2d230 SHA512 596cf5f936a1a9ae25ea77ebe2a414271998e2d6931bada6d0548efbdbfde73dba21717157508e5bd89925b868f3bee41492ea149c8ea8a339b3319010798f99 WHIRLPOOL 420c422ce99818f2c321d920fcacf8a37980dc7f540bacc57d87bf426c18dc5d650ef5e70cac3ae3a33cfc4b6632307d97ceb219c9f4518b2ab7a473273881cc
+AUX eudev-selinux-timespan.patch 844 SHA256 4693649ebe9d0d76edbdb5828c4d5768004c3156128705425828ea318cfc682b SHA512 1acc0124eccb754338ee0969a438c5a184bba1df315fff790960309e7e8f9e104ac6960fdc37930f5da561a92b78b12e6feefcf5b642783eebaafcca9a884f66 WHIRLPOOL 5d4c4c3af3796a7c8273abb2cbcd6e1537b255f28adf638e083da13f4708b9b9cc5e77614ff5f4af8edf06778a93e66cc6acdfdefbc9799acdaf78c582a97c63
 AUX udev-postmount 1207 SHA256 0220e949b1f31832a205021c0a8615e77b27b73b7c9b16ef4a61bbd2774aeecb SHA512 a69338328fee67617cddab8375d5008bbed41e82c67610cb9df168ffd95bfa016e3b63544b380afa0b98bb1731e4d76960efbdec5c79bb5e844ca10d6c334e2f WHIRLPOOL c1f027a7200a435d163c7ac66a0afc0b004c97ee9c1ecc8406f981b05e6ef95221d0df51d3abc46e494d3a35a07831cbab8d393b3a7d05b5f0aec70e88d894a2
 DIST eudev-1.1.tar.gz 1706277 SHA256 462659ef77802f244f55cee58fcd6b2a0cf6c24716f64fbb0c6d88a580f398a8 SHA512 e7b54eaa49e21b350341c39848712458d85cd2d3a69233e11fa7e57e93cb7db2382d1138ebd9eebf971650af85b2aebeff2b71a8396c78c444b6759523e69730 WHIRLPOOL 57782df80ef923f9507e0edf31ead8528c764e0b653f69b9ed4c42925e88d5d26a7953d21083dece84e0bcd5521b6ef81e3ffb97215de934c9b631f8dc5ecb52
 DIST eudev-1.2.tar.gz 1677976 SHA256 f9f78c2154eb174a6aab08afde9f5705a9072fc4069031a9f686cabc20beaa22 SHA512 673cd53339d62b23db615e1f67def71ed8d313dcf18edda37498db5fd507a2556073c798f81d16525594b0176fa5f0c9567bea6e4715cc0732b7651d24af4be5 WHIRLPOOL 3329ed127f0fa9696ce4fec406a2e6ff8e9d616ee4fbc6fac0a14a8b80909b6def983dd16c40e7c6abdc93f4da96805fbbb855460daddb1b1352815077b2e009
-EBUILD eudev-1.1.ebuild 6392 SHA256 2afaebf6d976e3ac61979e085cad9aa386741b40da35fb07f725ebc5c6700cf5 SHA512 235e7b6257a9270b5806abf69a63dbfe9376490d6687309dfcad4a8c90aa3ea5bbf33856d2c8d20732a700ee170b0a3409d3ae48a5cc42db501c38f5a7fb44f2 WHIRLPOOL 975d8b69ecf26a7d2f1551658675cca6193075c6b17637569cb29227e71830be744db285ea1302b13be031b04c8122fb4acc50fe7eb00156a77ee2d32e071f35
-EBUILD eudev-1.2-r1.ebuild 7007 SHA256 9292262cc19249a89a80844b246d85807ed787e8348b6cf407fae34e75749040 SHA512 b19af79502a33db066022fbd0cf71d001b6278b6a636665776f1af8d4b5d9acb1ad08edf89ff3a5a5eb3c11ce9ba5a6f884f5ac8988d17ede7de818169b890cd WHIRLPOOL 4a9318b9f51ba32f583d53cfd0f6c30a35331dea155584454ff8d9319287c690426e1bfd77127064562da7288a39f20957a1659f186b71ed5b48e77cd9c32177
-EBUILD eudev-1.2.ebuild 6365 SHA256 9e805cd06a282932e5d39ba64631ee7f65cb69d3d7efb47d274a79de627e9190 SHA512 57443926f019395036e1eb7ebb7b5cb68a54c06d57c1cf15ba4465775cf638d339c3826387bd8bc60f59bdd1303c2c4c78b79483f83285c2caf4330a43b82d39 WHIRLPOOL b3951ed9c18a1ae693254d3ad48d0a98827c52022edeffba1591c8e1c8a9c31ea7e8b641397068a2f427426e106b92ce54566841f32126943c4476cd8e17debf
+EBUILD eudev-1.1.ebuild 6444 SHA256 092fa0793e074f9c5dea149e1929f06197ab4f303dd5258a495f987bcc2d75c6 SHA512 60bbe3d5880ab81bb603a5b0c622bedff10677db74bf41a2bf489b8cbbdad25abdbebec8dd911ae14665a8968a6937b459dcc6e33d288737a845b97db9849980 WHIRLPOOL 1df1edec79f3c14efd69bc257a19c636f88a944f03570a2b2bbf59cdda84b0123d9d31e9a94f0514ad0a02ea689c6f4d49a0d0e5dac107a6af99ec11295f441e
+EBUILD eudev-1.2-r1.ebuild 7053 SHA256 0f0656aa2d72acf597e1400bf5b58a0070d9f7178a76e5df00892634079f6568 SHA512 23668aca705aaced095d720d746eb9aaf50e1868f549d2ca984f0e0fb2e463ae3214e1e77f18d2438081dc9016e6c98a140a77200fab90f29076e0153f23defd WHIRLPOOL f015ddf5e53626936aedaa000cb81afc4ebcfcafa962ee11d75691b12cd63388588c7a00227438c63bbf1b14e574b9bbd5c1f1dde56fc27a20742ad6b1b75cd1
+EBUILD eudev-1.2.ebuild 6412 SHA256 afbb99644ed8683c085879f17405bd541e35c5090b90840bf1f515b4ef02286f SHA512 b84b90bb3d1706cd0fe898ed8c90f2223b3cb602220a45f7333bc3df0f19b479443b6067794bfcb46906de853b86bd4fce5903f94d7fb6672f5023adbaf3ba57 WHIRLPOOL 8604f71996704e47df59cbf6e5b0eaed7579c3a297fd2c722f6ca06fbdd2964d4a9e5053e912de56cf83ac618452499071e75870ff05b3143bc34c790b47a397
 EBUILD eudev-9999.ebuild 7051 SHA256 e216b8a57f49de286adf6e2f0a28d87b0d3497a6e35888a44857f9c5e136cd93 SHA512 f7bc923a77795727db14e03845bef790b1fea052306056c77bad44dec8ad8d3250d78414b39d0c537f634377ab7c4976305fd6efb80c0f2999e6bd2e0b28f088 WHIRLPOOL 0b9bad6e8a1370ae331d6aa4013e2af2c5b8e620d212272e68505d14550f606b8d15c517ca46d4132d4af95c1eda783c28eaa539484d16a0a479920b090ebb41
-MISC ChangeLog 9649 SHA256 600a85bc498f28da586a2bbc7d16f4761319ba4eb1e036b02d867e0d09a24855 SHA512 db764b623bd3d9fcc6d0716921d08ed89ed3a850ad6b41580275d0597a5162f84d76592c146653df688aec2a744f92b44b179a4035268494fa0d89a06b02d4f0 WHIRLPOOL 4acfe241391a0b0ddbf44d7ad23b45699474481c0fb967b51366428b4cb42ee15c00776d3d5192a3da4ee50339b1d83cfbe983c545a682b5f334eea0f9b2e684
+MISC ChangeLog 9900 SHA256 8c336961a6abab9cf12ebea1e2eccd8a850733ae62a60ba3dafd66f2a2352451 SHA512 1d4e36e0437a6d225cab27c697b698fcc3cf9ddb49e3c7c0b81286c48d6f97b971b23faaec003726ad565174f8f7345187750bb855c611a623893d6c7e38240a WHIRLPOOL ccba8669087eeb623ec3762ec507ba0508a26f9520a428511f6bbdd964d16d4be150891f26ea279e9216e9c74f0fb02a1c50c2434aa1523b634110566c909540
 MISC metadata.xml 956 SHA256 2dc374ed7a7236fc2044a93429e8ff9ce68474f5fce8961aff1209914d4bdbcd SHA512 e164394dee8fbd2afb6258fac4899b24607bbde5ec1e1d3cba51059a11768a653e2d841fecad902da0f85cdc579b3e8e2ea64e94d107a448fd1fdcf8362db4d9 WHIRLPOOL c6d492ca4498e509c8e04aead71a89b4481e8294c661968bdc7ca3081bfe116dd486f5676c3dfe08f5c43658a9f37d1fcb815c9378301a8c385852f83ea27544
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIDpuoACgkQVWmRsqeSphNpegCdHqg7P7JxFizHjsxxiHS+AkQ/
-RvYAn3Ux5hh7gXprMHn3k45N4YnUCabM
-=wKgA
+iF4EAREIAAYFAlIDtyUACgkQ2ugaI38ACPBMJAD/cxy/WiLjORbcyT4tzkd3OMph
+T7D+vgEmo4GMCwH+jqQA+wVKSBS/jNxmrCqt3/DyrB87p3+yEbhWVD2abc2mXc7X
+=t802
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.1.ebuild b/sys-fs/eudev/eudev-1.1.ebuild
index fdb9f0f95df0..6370e041a27c 100644
--- a/sys-fs/eudev/eudev-1.1.ebuild
+++ b/sys-fs/eudev/eudev-1.1.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.1.ebuild,v 1.6 2013/08/08 14:10:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.1.ebuild,v 1.7 2013/08/08 15:19:47 axs Exp $
 
 EAPI="5"
 
@@ -97,6 +97,8 @@ src_prepare()
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	epatch "${FILESDIR}"/${PN}-selinux-timespan.patch
+
 	epatch_user
 
 	if [[ ! -e configure ]]
diff --git a/sys-fs/eudev/eudev-1.2-r1.ebuild b/sys-fs/eudev/eudev-1.2-r1.ebuild
index 3fa7e165033e..415a8c75a9cb 100644
--- a/sys-fs/eudev/eudev-1.2-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.2-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.2-r1.ebuild,v 1.2 2013/08/08 12:54:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2-r1.ebuild,v 1.3 2013/08/08 15:19:47 axs Exp $
 
 EAPI="5"
 
@@ -104,6 +104,8 @@ src_prepare()
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	epatch "${FILESDIR}"/${PN}-selinux-timespan.patch
+
 	epatch_user
 
 	if [[ ! -e configure ]]
diff --git a/sys-fs/eudev/eudev-1.2.ebuild b/sys-fs/eudev/eudev-1.2.ebuild
index 6faf7918990d..83040ca8e747 100644
--- a/sys-fs/eudev/eudev-1.2.ebuild
+++ b/sys-fs/eudev/eudev-1.2.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.2.ebuild,v 1.2 2013/08/02 00:31:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2.ebuild,v 1.3 2013/08/08 15:19:47 axs Exp $
 
 EAPI="5"
 
@@ -99,6 +99,8 @@ src_prepare()
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	epatch "${FILESDIR}"/${PN}-selinux-timespan.patch
+
 	epatch_user
 
 	if [[ ! -e configure ]]
diff --git a/sys-fs/eudev/files/eudev-fix-selinux.patch b/sys-fs/eudev/files/eudev-fix-selinux.patch
deleted file mode 100644
index ad13a59d5400..000000000000
--- a/sys-fs/eudev/files/eudev-fix-selinux.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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) {
diff --git a/sys-fs/eudev/files/eudev-selinux-timespan.patch b/sys-fs/eudev/files/eudev-selinux-timespan.patch
new file mode 100644
index 000000000000..0a51ee9bbe40
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-selinux-timespan.patch
@@ -0,0 +1,27 @@
+commit 3cc37a5e294048a52fa3c2aa2c1ed89b0cd07169
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date:   Thu Aug 8 11:09:30 2013 -0400
+
+    Fixed compile error when --enable-selinux
+    
+    FORMAT_TIMESPAN_MAX is used in src/udev/label.c in selinux-related
+    code, but this was not defined as it is located in a shared header
+    in systemd.  Added the define to label.h.  Didn't bother to track
+    down what commit added (or removed) this code (define)
+    
+    Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
+
+diff --git a/src/udev/label.h b/src/udev/label.h
+index 3d12ac2..507fd2c 100644
+--- a/src/udev/label.h
++++ b/src/udev/label.h
+@@ -25,6 +25,9 @@
+ #include <stdbool.h>
+ #include <sys/socket.h>
+ 
++/* from systemd src/shared/time-util.h */
++#define FORMAT_TIMESPAN_MAX 64
++
+ int label_init(const char *prefix);
+ void label_finish(void);
+