Blame SOURCES/star-1.5.2-selinux.patch

646d41
diff --git a/autoconf/configure.in b/autoconf/configure.in
646d41
index 1465ce1..3046a62 100644
646d41
--- a/autoconf/configure.in
646d41
+++ b/autoconf/configure.in
646d41
@@ -817,6 +817,15 @@ AC_CHECK_FUNCS(sched_yield)
646d41
 AC_CHECK_FUNCS(nanosleep)
646d41
 LIBS="$ac_save_LIBS"
646d41
 
646d41
+AC_CHECK_HEADERS(selinux/selinux.h)
646d41
+if test "$ac_cv_header_selinux_selinux_h" = yes; then
646d41
+  AC_CHECKING(for SELinux support)
646d41
+  AC_CHECK_LIB(selinux, is_selinux_enabled, lib_selinux="-lselinux -lattr")
646d41
+  ac_save_LIBS="$LIBS"
646d41
+  LIBS="$LIBS $lib_selinux"
646d41
+  AC_CHECK_FUNCS(is_selinux_enabled)
646d41
+fi
646d41
+
646d41
 dnl Misc OS checks.
646d41
 AC_CHECK_FILES(/dev/tty /dev/null /dev/zero)
646d41
 AC_CHECK_FILES(/dev/stdin /dev/stdout /dev/stderr)
646d41
@@ -894,6 +903,7 @@ AC_SUBST(lib_secdb)
646d41
 AC_SUBST(lib_gen)
646d41
 AC_SUBST(lib_pthread)
646d41
 AC_SUBST(lib_rt)
646d41
+AC_SUBST(lib_selinux)
646d41
 AC_SUBST(lib_dl)
646d41
 AC_SUBST(lib_dir)
646d41
 
646d41
diff --git a/autoconf/rules.cnf.in b/autoconf/rules.cnf.in
646d41
index 6de994c..31b1575 100644
646d41
--- a/autoconf/rules.cnf.in
646d41
+++ b/autoconf/rules.cnf.in
646d41
@@ -30,5 +30,6 @@ LIB_SECDB = @lib_secdb@
646d41
 LIB_GEN = @lib_gen@
646d41
 LIB_PTHREAD = @lib_pthread@
646d41
 LIB_RT = @lib_rt@
646d41
+LIB_SELINUX = @lib_selinux@
646d41
 LIB_DL= @lib_dl@
646d41
 LIB_DIR= @lib_dir@
646d41
diff --git a/star/cpio.mk b/star/cpio.mk
646d41
index ec48a95..8a2c7a0 100644
646d41
--- a/star/cpio.mk
646d41
+++ b/star/cpio.mk
646d41
@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
646d41
 CPPOPTS +=	-DUSE_ACL
646d41
 CPPOPTS +=	-DUSE_XATTR
646d41
 CPPOPTS +=	-DUSE_FFLAGS
646d41
+CPPOPTS +=	-DWITH_SELINUX
646d41
 CPPOPTS +=	-DSCHILY_PRINT
646d41
 CFILES=		cpio.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 		list.c extract.c create.c append.c diff.c restore.c \
646d41
@@ -34,7 +35,7 @@ CFILES=		cpio.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
646d41
 		movearch.h table.h props.h fifo.h diff.h \
646d41
 		checkerr.h dumpdate.h bitstring.h
646d41
-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
646d41
+LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
646d41
 XMK_FILE=	scpioman.mk
646d41
 
646d41
 ###########################################################################
646d41
diff --git a/star/extract.c b/star/extract.c
646d41
index 9a83bf4..3d68c43 100644
646d41
--- a/star/extract.c
646d41
+++ b/star/extract.c
646d41
@@ -253,6 +253,17 @@ extern	struct WALK walkstate;
646d41
 			continue;
646d41
 		}
646d41
 #endif
646d41
+
646d41
+#ifdef WITH_SELINUX
646d41
+                if (!to_stdout && selinux_enabled) {
646d41
+                    if (setselinux(&finfo) == FALSE) {
646d41
+                    errmsgno(EX_BAD,
646d41
+                             "Can not setup security context for '%s'. Not created.\n",
646d41
+                              finfo.f_name);
646d41
+                    }
646d41
+                }
646d41
+#endif
646d41
+
646d41
 		if (finfo.f_flags & F_BAD_META) {
646d41
 			if (!void_bad(&finfo))
646d41
 				break;
646d41
diff --git a/star/gnutar.mk b/star/gnutar.mk
646d41
index d0da54b..9c5de30 100644
646d41
--- a/star/gnutar.mk
646d41
+++ b/star/gnutar.mk
646d41
@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
646d41
 CPPOPTS +=	-DUSE_ACL
646d41
 CPPOPTS +=	-DUSE_XATTR
646d41
 CPPOPTS +=	-DUSE_FFLAGS
646d41
+CPPOPTS +=	-DWITH_SELINUX
646d41
 CPPOPTS +=	-DSCHILY_PRINT
646d41
 CFILES=		gnutar.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 		list.c extract.c create.c append.c diff.c restore.c \
646d41
@@ -34,7 +35,7 @@ CFILES=		gnutar.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
646d41
 		movearch.h table.h props.h fifo.h diff.h \
646d41
 		checkerr.h dumpdate.h bitstring.h
646d41
-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
646d41
+LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
646d41
 XMK_FILE=	gnutarman.mk
646d41
 
646d41
 ###########################################################################
646d41
diff --git a/star/pax.mk b/star/pax.mk
646d41
index 0254e77..15c8ea0 100644
646d41
--- a/star/pax.mk
646d41
+++ b/star/pax.mk
646d41
@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
646d41
 CPPOPTS +=	-DUSE_ACL
646d41
 CPPOPTS +=	-DUSE_XATTR
646d41
 CPPOPTS +=	-DUSE_FFLAGS
646d41
+CPPOPTS +=	-DWITH_SELINUX
646d41
 CPPOPTS +=	-DPAX
646d41
 CPPOPTS +=	-DSCHILY_PRINT
646d41
 CFILES=		pax.c header.c cpiohdr.c xheader.c xattr.c \
646d41
@@ -35,7 +36,7 @@ CFILES=		pax.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
646d41
 		movearch.h table.h props.h fifo.h diff.h \
646d41
 		checkerr.h dumpdate.h bitstring.h
646d41
-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
646d41
+LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
646d41
 XMK_FILE=	spaxman.mk
646d41
 
646d41
 ###########################################################################
646d41
diff --git a/star/star.c b/star/star.c
646d41
index 7b58964..fe9d984 100644
646d41
--- a/star/star.c
646d41
+++ b/star/star.c
646d41
@@ -46,6 +46,10 @@ static	UConst char sccsid[] =
646d41
 #include "starsubs.h"
646d41
 #include "checkerr.h"
646d41
 
646d41
+#ifdef WITH_SELINUX
646d41
+int selinux_enabled=0;
646d41
+#endif
646d41
+
646d41
 EXPORT	int	main		__PR((int ac, char **av));
646d41
 LOCAL	void	star_create	__PR((int ac, char *const *av));
646d41
 LOCAL	void	checkdumptype	__PR((GINFO *gp));
646d41
@@ -399,6 +403,10 @@ main(ac, av)
646d41
 			comerr("Panic cannot set back effective uid.\n");
646d41
 	}
646d41
 	my_uid = geteuid();
646d41
+
646d41
+#ifdef WITH_SELINUX
646d41
+	selinux_enabled=is_selinux_enabled()>0;
646d41
+#endif
646d41
 	/*
646d41
 	 * WARNING: We now are no more able to open a new remote connection
646d41
 	 * unless we have been called by root.
646d41
diff --git a/star/star.mk b/star/star.mk
646d41
index a6f6cff..68d3482 100644
646d41
--- a/star/star.mk
646d41
+++ b/star/star.mk
646d41
@@ -21,6 +21,7 @@ CPPOPTS +=	-DUSE_XATTR
646d41
 CPPOPTS +=	-DUSE_FFLAGS
646d41
 CPPOPTS +=	-DCOPY_LINKS_DELAYED
646d41
 CPPOPTS +=	-DSCHILY_PRINT
646d41
+CPPOPTS +=	-DWITH_SELINUX
646d41
 CFILES=		star.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 		list.c extract.c create.c append.c diff.c restore.c \
646d41
 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
646d41
@@ -35,7 +36,7 @@ CFILES=		star.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
646d41
 		movearch.h table.h props.h fifo.h diff.h restore.h \
646d41
 		checkerr.h dumpdate.h bitstring.h
646d41
-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
646d41
+LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
646d41
 XMK_FILE=	Makefile.man starformatman.mk
646d41
 
646d41
 ###########################################################################
646d41
diff --git a/star/star_fat.mk b/star/star_fat.mk
646d41
index 1975c94..507fbee 100644
646d41
--- a/star/star_fat.mk
646d41
+++ b/star/star_fat.mk
646d41
@@ -29,6 +29,7 @@ CPPOPTS +=	-DUSE_FFLAGS
646d41
 CPPOPTS +=	-DCOPY_LINKS_DELAYED
646d41
 CPPOPTS +=	-DSTAR_FAT
646d41
 CPPOPTS +=	-DSCHILY_PRINT
646d41
+CPPOPTS +=	-DWITH_SELINUX
646d41
 CFILES=		star_fat.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 		list.c extract.c create.c append.c diff.c restore.c \
646d41
 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
646d41
@@ -48,7 +49,7 @@ HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
646d41
 
646d41
 #LIBS=		-lunos
646d41
 #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
646d41
-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
646d41
+LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
646d41
 #
646d41
 #	Wenn -lfind, dann auch  $(LIB_INTL)
646d41
 #
646d41
diff --git a/star/starsubs.h b/star/starsubs.h
646d41
index a914ade..1e2a233 100644
646d41
--- a/star/starsubs.h
646d41
+++ b/star/starsubs.h
646d41
@@ -317,6 +317,11 @@ extern	void	opt_xattr	__PR((void));
646d41
 extern	BOOL	get_xattr	__PR((register FINFO *info));
646d41
 extern	BOOL	set_xattr	__PR((register FINFO *info));
646d41
 extern	void	free_xattr	__PR((star_xattr_t **xattr));
646d41
+# ifdef WITH_SELINUX
646d41
+#include <selinux/selinux.h>
646d41
+extern BOOL    setselinux __PR((register FINFO *info));
646d41
+extern int selinux_enabled;
646d41
+# endif
646d41
 #endif
646d41
 
646d41
 /*
646d41
diff --git a/star/suntar.mk b/star/suntar.mk
646d41
index 5690c9f..f781f63 100644
646d41
--- a/star/suntar.mk
646d41
+++ b/star/suntar.mk
646d41
@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
646d41
 CPPOPTS +=	-DUSE_ACL
646d41
 CPPOPTS +=	-DUSE_XATTR
646d41
 CPPOPTS +=	-DUSE_FFLAGS
646d41
+CPPOPTS +=	-DWITH_SELINUX
646d41
 CPPOPTS +=	-DSCHILY_PRINT
646d41
 CFILES=		suntar.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 		list.c extract.c create.c append.c diff.c restore.c \
646d41
@@ -34,7 +35,7 @@ CFILES=		suntar.c header.c cpiohdr.c xheader.c xattr.c \
646d41
 HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
646d41
 		movearch.h table.h props.h fifo.h diff.h \
646d41
 		checkerr.h dumpdate.h bitstring.h
646d41
-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
646d41
+LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
646d41
 XMK_FILE=	suntarman.mk
646d41
 
646d41
 ###########################################################################
646d41
diff --git a/star/xattr.c b/star/xattr.c
646d41
index 1462950..6493447 100644
646d41
--- a/star/xattr.c
646d41
+++ b/star/xattr.c
646d41
@@ -196,6 +196,27 @@ fail:
646d41
 #endif  /* USE_XATTR */
646d41
 }
646d41
 
646d41
+#ifdef WITH_SELINUX
646d41
+EXPORT BOOL
646d41
+setselinux(info)
646d41
+       register FINFO *info;
646d41
+{
646d41
+#if defined(USE_XATTR) && defined(HAVE_SETXATTR) && defined(WITH_SELINUX)
646d41
+       if (info->f_xattr) {
646d41
+               star_xattr_t    *xap;
646d41
+               for (xap = info->f_xattr; xap->name != NULL; xap++) {
646d41
+                 if (strcmp(xap->name, "security.selinux") == 0) {
646d41
+                   if (setfscreatecon(xap->value)) {
646d41
+                     return FALSE;
646d41
+                   }
646d41
+                 }
646d41
+               }
646d41
+       }
646d41
+#endif  /* USE_XATTR && WITH_SELINUX */
646d41
+       return TRUE;
646d41
+}
646d41
+#endif
646d41
+
646d41
 /* ARGSUSED */
646d41
 EXPORT BOOL
646d41
 set_xattr(info)
646d41
@@ -209,6 +230,10 @@ set_xattr(info)
646d41
 		return (TRUE);
646d41
 
646d41
 	for (xap = info->f_xattr; xap->name != NULL; xap++) {
646d41
+#ifdef WITH_SELINUX
646d41
+		if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0))
646d41
+			continue;
646d41
+#endif
646d41
 		if (lsetxattr(info->f_name, xap->name, xap->value,
646d41
 		    xap->value_len, 0) != 0) {
646d41
 			if (!errhidden(E_SETXATTR, info->f_name)) {