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

2 files changed, 128 insertions, 0 deletions

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))
+