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

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

6 files changed, 42 insertions, 53 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/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);
+