compile against sys-apps/attr only if linux-headers are older than 2.4.20.

5 files changed, 143 insertions, 5 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index fd602de5c208..9b6b71fcc4ec 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.10 2003/10/07 18:16:23 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.11 2003/10/21 02:25:21 pebenito Exp $
+
+*libselinux-1.2-r2 (20 Oct 2003)
+
+  20 Oct 2003; Chris PeBenito <pebenito@gentoo.org> libselinux-1.2-r2.ebuild,
+  files/libselinux-1.2-attr.diff:
+  Compile against sys-apps/attr only if linux-headers are older than 2.4.20.
 
 *libselinux-1.2-r1 (07 Oct 2003)
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 58a98b3fd5b2..e4a657a0dabb 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,6 +1,7 @@
-MD5 8c139a18d3ec058c9c704758d1b990e9 libselinux-1.2-r1.ebuild 844
+MD5 b69d7ab6f178c8847a4e7d6997dfd25e libselinux-1.2-r2.ebuild 993
 MD5 652c5e8a0a081bf4317359f04f65a603 metadata.xml 537
-MD5 be0d42c6d14e38275e47d80f4e73cab1 ChangeLog 1968
+MD5 81e49000c84111788e5ce98f6d18f0c7 ChangeLog 2192
+MD5 ed35b412c4b957fe6121ea3d8d0a01ac files/digest-libselinux-1.2-r2 62
 MD5 740bc8d55ebd8f695dd659ef63aef072 files/libselinux-1.2-const.diff 5020
-MD5 ed35b412c4b957fe6121ea3d8d0a01ac files/digest-libselinux-1.2-r1 62
+MD5 be018c3c6dab771a2ca39a7d5897f091 files/libselinux-1.2-attr.diff 4446
 MD5 ef5854592774ac33f6427e1d8651edf8 files/libselinux-1.2-gentoo.diff 1591
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.2-r1 b/sys-libs/libselinux/files/digest-libselinux-1.2-r2
index 32663d6490ab..32663d6490ab 100644
--- a/sys-libs/libselinux/files/digest-libselinux-1.2-r1
+++ b/sys-libs/libselinux/files/digest-libselinux-1.2-r2
diff --git a/sys-libs/libselinux/files/libselinux-1.2-attr.diff b/sys-libs/libselinux/files/libselinux-1.2-attr.diff
new file mode 100644
index 000000000000..c99dd1c65641
--- /dev/null
+++ b/sys-libs/libselinux/files/libselinux-1.2-attr.diff
@@ -0,0 +1,128 @@
+Index: libselinux/src/Makefile
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/Makefile,v
+retrieving revision 1.14
+diff -u -r1.14 Makefile
+--- libselinux/src/Makefile	8 Oct 2003 19:30:44 -0000	1.14
++++ libselinux/src/Makefile	9 Oct 2003 19:45:08 -0000
+@@ -20,7 +20,7 @@
+ 	ranlib $@
+ 
+ $(LIBSO): $(OBJS)
+-	$(CC) $(LDFLAGS) -shared -o $@ $^ -lattr -Wl,-soname,$(LIBSO) 
++	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,$(LIBSO) 
+ 	ln -sf $@ $(TARGET) 
+ 
+ %.o:  %.c
+Index: libselinux/src/fgetfilecon.c
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/fgetfilecon.c,v
+retrieving revision 1.4
+diff -u -r1.4 fgetfilecon.c
+--- libselinux/src/fgetfilecon.c	17 Jul 2003 14:03:27 -0000	1.4
++++ libselinux/src/fgetfilecon.c	9 Oct 2003 19:44:51 -0000
+@@ -4,7 +4,7 @@
+ #include <selinux/selinux.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "policy.h"
+ 
+ int fgetfilecon(int fd, security_context_t *context)
+Index: libselinux/src/fsetfilecon.c
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/fsetfilecon.c,v
+retrieving revision 1.1
+diff -u -r1.1 fsetfilecon.c
+--- libselinux/src/fsetfilecon.c	28 Apr 2003 14:09:37 -0000	1.1
++++ libselinux/src/fsetfilecon.c	9 Oct 2003 19:44:51 -0000
+@@ -4,7 +4,7 @@
+ #include <selinux/selinux.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "policy.h"
+ 
+ int fsetfilecon(int fd, security_context_t context)
+Index: libselinux/src/getfilecon.c
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/getfilecon.c,v
+retrieving revision 1.4
+diff -u -r1.4 getfilecon.c
+--- libselinux/src/getfilecon.c	17 Jul 2003 14:03:28 -0000	1.4
++++ libselinux/src/getfilecon.c	9 Oct 2003 19:44:51 -0000
+@@ -4,7 +4,7 @@
+ #include <selinux/selinux.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "policy.h"
+ 
+ int getfilecon(const char *path, security_context_t *context)
+Index: libselinux/src/lgetfilecon.c
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/lgetfilecon.c,v
+retrieving revision 1.4
+diff -u -r1.4 lgetfilecon.c
+--- libselinux/src/lgetfilecon.c	17 Jul 2003 14:03:28 -0000	1.4
++++ libselinux/src/lgetfilecon.c	9 Oct 2003 19:44:51 -0000
+@@ -4,7 +4,7 @@
+ #include <selinux/selinux.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "policy.h"
+ 
+ int lgetfilecon(const char *path, security_context_t *context)
+Index: libselinux/src/lsetfilecon.c
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/lsetfilecon.c,v
+retrieving revision 1.1
+diff -u -r1.1 lsetfilecon.c
+--- libselinux/src/lsetfilecon.c	28 Apr 2003 14:09:37 -0000	1.1
++++ libselinux/src/lsetfilecon.c	9 Oct 2003 19:44:51 -0000
+@@ -4,7 +4,7 @@
+ #include <selinux/selinux.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "policy.h"
+ 
+ int lsetfilecon(const char *path, security_context_t context)
+Index: libselinux/src/setfilecon.c
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/src/setfilecon.c,v
+retrieving revision 1.1
+diff -u -r1.1 setfilecon.c
+--- libselinux/src/setfilecon.c	28 Apr 2003 14:09:37 -0000	1.1
++++ libselinux/src/setfilecon.c	9 Oct 2003 19:44:51 -0000
+@@ -4,7 +4,7 @@
+ #include <selinux/selinux.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "policy.h"
+ 
+ int setfilecon(const char *path, security_context_t context)
+Index: libselinux/utils/Makefile
+===================================================================
+RCS file: /nfshome/pal/CVS/selinux-usr/libselinux/utils/Makefile,v
+retrieving revision 1.5
+diff -u -r1.5 Makefile
+--- libselinux/utils/Makefile	7 Jul 2003 12:53:42 -0000	1.5
++++ libselinux/utils/Makefile	9 Oct 2003 19:45:14 -0000
+@@ -4,7 +4,7 @@
+ 
+ CFLAGS = -Wall
+ override CFLAGS += -I../include
+-LDLIBS += -L../src -lselinux -lattr
++LDLIBS += -L../src -lselinux 
+ 
+ TARGETS=$(patsubst %.c,%,$(wildcard *.c))
+ 
diff --git a/sys-libs/libselinux/libselinux-1.2-r1.ebuild b/sys-libs/libselinux/libselinux-1.2-r2.ebuild
index 69bcde863375..d8cc14ba91d3 100644
--- a/sys-libs/libselinux/libselinux-1.2-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.2-r1.ebuild,v 1.1 2003/10/07 18:16:23 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.2-r2.ebuild,v 1.1 2003/10/21 02:25:21 pebenito Exp $
 
 IUSE=""
 
@@ -21,6 +21,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/libselinux-1.2-gentoo.diff
 	epatch ${FILESDIR}/libselinux-1.2-const.diff
+
+	# use sys-apps/attr with headers older than 2.4.20
+	has_version '>=sys-kernel/linux-headers-2.4.20' && epatch ${FILESDIR}/libselinux-1.2-attr.diff
 }
 
 src_compile() {