From d181987e91065dc3ceb90b7a3d5acf020bd6b935 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Mon, 22 Nov 2004 14:57:57 +0000 Subject: [PATCH] upgrade & repatch --- .cvsignore | 1 + sources | 2 +- star-1.5-newMake.patch | 42 +++++++++++ star-1.5-selinux.patch | 167 +++++++++++++++++++++++++++++++++++++++++ star.spec | 20 ++--- 5 files changed, 222 insertions(+), 10 deletions(-) create mode 100644 star-1.5-newMake.patch create mode 100644 star-1.5-selinux.patch diff --git a/.cvsignore b/.cvsignore index a0cc16c..854d317 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ star-1.5a25.tar.bz2 +star-1.5a54.tar.gz diff --git a/sources b/sources index 1eeccf2..986414a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -824a185dfa7760ecd88be5c441db4de4 star-1.5a25.tar.bz2 +4e26f080bcd29aa1b92fd9d8d2dc7ced star-1.5a54.tar.gz diff --git a/star-1.5-newMake.patch b/star-1.5-newMake.patch new file mode 100644 index 0000000..87d9bc3 --- /dev/null +++ b/star-1.5-newMake.patch @@ -0,0 +1,42 @@ +--- star-1.5/DEFAULTS/Defaults.linux.newMake 2003-02-16 01:01:48.000000000 +0100 ++++ star-1.5/DEFAULTS/Defaults.linux 2004-11-22 12:29:02.973507632 +0100 +@@ -8,8 +8,8 @@ + # Compiler stuff + # + ########################################################################### +-DEFCCOM= cc +-#DEFCCOM= gcc ++#DEFCCOM= cc ++DEFCCOM= gcc + ########################################################################### + # + # If the next line is commented out, compilation is done with max warn level +@@ -18,21 +18,21 @@ + ########################################################################### + CWARNOPTS= + +-DEFINCDIRS= $(SRCROOT)/include /usr/src/linux/include +-LDPATH= -L/opt/schily/lib +-RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) ++DEFINCDIRS= $(SRCROOT)/include ++LDPATH= ++RUNPATH= + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /opt/schily +-INS_KBASE= / ++INS_BASE= $(RPM_INSTALLDIR)/usr/ ++INS_KBASE= $(RPM_INSTALLDIR)/ + # + DEFUMASK= 002 + # + DEFINSMODEF= 444 + DEFINSMODEX= 755 +-DEFINSUSR= bin +-DEFINSGRP= bin ++DEFINSUSR= root ++DEFINSGRP= root diff --git a/star-1.5-selinux.patch b/star-1.5-selinux.patch new file mode 100644 index 0000000..a1d0cdc --- /dev/null +++ b/star-1.5-selinux.patch @@ -0,0 +1,167 @@ +--- star-1.5/conf/configure.in.selinux 2004-10-10 23:50:37.000000000 +0200 ++++ star-1.5/conf/configure.in 2004-11-22 14:58:09.205473648 +0100 +@@ -313,6 +313,15 @@ + LIBS="$ac_save_LIBS" + fi + ++AC_CHECK_HEADERS(selinux/selinux.h) ++if test "$ac_cv_header_selinux_selinux_h" = yes; then ++ AC_CHECKING(for SELinux support) ++ AC_CHECK_LIB(selinux, is_selinux_enabled, lib_selinux="-lselinux -lattr") ++ ac_save_LIBS="$LIBS" ++ LIBS="$LIBS $lib_selinux" ++ AC_CHECK_FUNCS(is_selinux_enabled) ++fi ++ + AC_SUBST(largefile_cc_opt) + + AC_SUBST(lib_crypt) +@@ -320,5 +329,6 @@ + AC_SUBST(lib_acl) + AC_SUBST(lib_acl_test) + AC_SUBST(lib_attr) ++AC_SUBST(lib_selinux) + + AC_OUTPUT(rules.cnf) +--- star-1.5/conf/rules.cnf.in.selinux 2004-10-07 20:32:26.000000000 +0200 ++++ star-1.5/conf/rules.cnf.in 2004-11-22 15:00:24.109965048 +0100 +@@ -9,3 +9,4 @@ + LIB_ACL= @lib_acl@ + LIB_ACL_TEST= @lib_acl_test@ + LIB_ATTR = @lib_attr@ ++LIB_SELINUX = @lib_selinux@ +--- star-1.5/star/pax.mk.selinux 2004-10-09 14:10:12.000000000 +0200 ++++ star-1.5/star/pax.mk 2004-11-22 14:52:56.830961792 +0100 +@@ -17,6 +17,7 @@ + CPPOPTS += -DUSE_LARGEFILES + CPPOPTS += -DUSE_ACL + CPPOPTS += -DUSE_XATTR ++CPPOPTS += -DWITH_SELINUX + CPPOPTS += -DUSE_FFLAGS + CPPOPTS += -DPAX + CFILES= pax.c header.c cpiohdr.c xheader.c xattr.c \ +@@ -35,7 +36,7 @@ + checkerr.h dumpdate.h bitstring.h + #LIBS= -lunos + #LIBS= -lschily -lc /usr/local/lib/gcc-gnulib +-LIBS= -ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) ++LIBS= -ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SELINUX) $(LIB_SOCKET) + XMK_FILE= spaxman.mk + + ########################################################################### +--- star-1.5/star/Makefile.selinux 2004-10-09 13:42:57.000000000 +0200 ++++ star-1.5/star/Makefile 2004-11-22 14:43:23.823072232 +0100 +@@ -17,6 +17,7 @@ + CPPOPTS += -DUSE_LARGEFILES + CPPOPTS += -DUSE_ACL + CPPOPTS += -DUSE_XATTR ++CPPOPTS += -DWITH_SELINUX + CPPOPTS += -DUSE_FFLAGS + CPPOPTS += -DCOPY_LINKS_DELAYED + CFILES= star.c header.c cpiohdr.c xheader.c xattr.c \ +@@ -35,7 +36,7 @@ + checkerr.h dumpdate.h bitstring.h + #LIBS= -lunos + #LIBS= -lschily -lc /usr/local/lib/gcc-gnulib +-LIBS= -ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) ++LIBS= -ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SELINUX) $(LIB_SOCKET) + XMK_FILE= Makefile.man starformatman.mk + + ########################################################################### +--- star-1.5/star/star.c.selinux 2004-11-01 14:46:52.000000000 +0100 ++++ star-1.5/star/star.c 2004-11-22 14:31:32.269244856 +0100 +@@ -46,6 +46,10 @@ + #endif + #include "dumpdate.h" + ++#ifdef WITH_SELINUX ++int selinux_enabled=0; ++#endif ++ + EXPORT int main __PR((int ac, char **av)); + LOCAL void star_create __PR((int ac, char *const *av)); + LOCAL void checkdumptype __PR((GINFO *gp)); +@@ -357,6 +361,10 @@ + #endif + comerr("Panic cannot set back effective uid.\n"); + } ++#ifdef WITH_SELINUX ++ selinux_enabled=is_selinux_enabled()>0; ++#endif ++ + /* + * WARNING: We now are no more able to open a new remote connection + * unless we have been called by root. +--- star-1.5/star/extract.c.selinux 2004-11-22 13:52:54.000000000 +0100 ++++ star-1.5/star/extract.c 2004-11-22 14:51:00.350669488 +0100 +@@ -212,6 +212,15 @@ + if (prblockno) + (void) tblocks(); /* set curblockno */ + ++#ifdef WITH_SELINUX ++ if (!to_stdout && selinux_enabled) { ++ if (setselinux(&finfo) == FALSE) { ++ errmsgno(EX_BAD, ++ "Can not setup security context for '%s'. Not created.\n", ++ finfo.f_name); ++ } ++ } ++#endif + if (is_volhdr(&finfo)) { + if (!get_volhdr(&finfo, vhname)) { + excomerrno(EX_BAD, +--- star-1.5/star/starsubs.h.selinux 2004-10-18 23:17:26.000000000 +0200 ++++ star-1.5/star/starsubs.h 2004-11-22 14:47:42.514745120 +0100 +@@ -288,6 +288,11 @@ + extern BOOL get_xattr __PR((register FINFO *info)); + extern BOOL set_xattr __PR((register FINFO *info)); + extern void free_xattr __PR((star_xattr_t **xattr)); ++#ifdef WITH_SELINUX ++#include ++extern BOOL setselinux __PR((register FINFO *info)); ++extern int selinux_enabled; ++#endif + #endif + + /* +--- star-1.5/star/xattr.c.selinux 2004-09-25 14:14:49.000000000 +0200 ++++ star-1.5/star/xattr.c 2004-11-22 14:39:53.747008648 +0100 +@@ -166,6 +166,27 @@ + #endif /* USE_XATTR */ + } + ++#ifdef WITH_SELINUX ++EXPORT BOOL ++setselinux(info) ++ register FINFO *info; ++{ ++#if defined(USE_XATTR) && defined(HAVE_SETXATTR) && defined(WITH_SELINUX) ++ if (info->f_xattr) { ++ star_xattr_t *xap; ++ for (xap = info->f_xattr; xap->name != NULL; xap++) { ++ if (strcmp(xap->name, "security.selinux") == 0) { ++ if (setfscreatecon(xap->value)) { ++ return FALSE; ++ } ++ } ++ } ++ } ++#endif /* USE_XATTR && WITH_SELINUX */ ++ return TRUE; ++} ++#endif ++ + /* ARGSUSED */ + EXPORT BOOL + set_xattr(info) +@@ -178,6 +199,10 @@ + return (TRUE); + + for (xap = info->f_xattr; xap->name != NULL; xap++) { ++#ifdef WITH_SELINUX ++ if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0)) ++ continue; ++#endif + if (setxattr(info->f_name, xap->name, xap->value, + xap->value_len, 0) != 0) { + if (!errhidden(E_SETXATTR, info->f_name)) { diff --git a/star.spec b/star.spec index 758df9e..0531566 100644 --- a/star.spec +++ b/star.spec @@ -3,15 +3,14 @@ %endif Summary: An archiving tool with ACL support Name: star -Version: 1.5a25 -Release: 7 +Version: 1.5a54 +Release: 1 URL: http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html -Source: ftp://ftp.fokus.gmd.de/pub/unix/star/alpha/%{name}-%{version}.tar.bz2 -Patch: star-1.5-icantusethestandardwayandmademyownmake.patch -Patch1: star-acl-fix.patch -Patch2: star-nofsync.patch +Source: ftp://ftp.fokus.gmd.de/pub/unix/star/alpha/%{name}-%{version}.tar.gz +Patch0: star-1.5-newMake.patch +Patch2: star-1.5-nofsync.patch Patch3: star-1.5-davej.patch -Patch4: star-selinux.patch +Patch4: star-1.5-selinux.patch License: GPL Group: Applications/Archiving BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -23,8 +22,7 @@ and can restore individual files from the archive. Star supports ACL. %prep %setup -q -n star-1.5 -%patch0 -p1 -%patch1 -p1 -b .acl-fix +%patch0 -p1 -b .newMake %patch2 -p1 -b .nofsync %patch3 -p1 -b .davej %if %{WITH_SELINUX} @@ -84,8 +82,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/*star %{_bindir}/spax %{_mandir}/man1/star* +%{_mandir}/man1/*.1.gz %changelog +* Mon Nov 22 2004 Peter Vrabec +- upgrade 1.5a54-1 & rebuild + * Mon Oct 25 2004 Peter Vrabec - fix dependencie (#123770)