rpms/star/FC-6 star-1.5-changewarnSegv.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 star-1.5-newMake.patch, 1.1, 1.2 star-1.5-selinux.patch, 1.5, 1.6 star.spec, 1.30, 1.31

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Aug 28 08:19:58 UTC 2007 

Author: pvrabec

Update of /cvs/dist/rpms/star/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26966

Modified Files:
	.cvsignore sources star-1.5-newMake.patch 
	star-1.5-selinux.patch star.spec 
Added Files:
	star-1.5-changewarnSegv.patch 
Log Message:
- fix segfault of data-change-warn option (#255261),
  patch from dkopecek at redhat.com
- new upstream release with CVE-2007-4134 fix



star-1.5-changewarnSegv.patch:
 checkerr.c |   75 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 38 insertions(+), 37 deletions(-)

--- NEW FILE star-1.5-changewarnSegv.patch ---
--- star-1.5/star/checkerr.c.orig-segv	2006-10-31 18:06:25.000000000 +0100
+++ star-1.5/star/checkerr.c	2007-08-27 11:42:39.000000000 +0200
@@ -183,44 +183,45 @@ LOCAL struct eflags {
  */
 LOCAL UInt32_t
 errflags(eflag, doexit)
-	char	*eflag;
-	BOOL	doexit;
+     char	*eflag;
+     BOOL	doexit;
 {
-	register char		*p = eflag;
-		char		*ef = _endword(eflag);
-		char		ec;
-	register struct eflags	*ep;
-	register int		slen;
-	register UInt32_t	nflags = 0;
-
-	ec = *ef;
-	*ef = '\0';
-	do {
-		for (ep = eflags; ep->fname; ep++) {
-			slen = strlen(ep->fname);
-			if ((strncmp(ep->fname, p, slen) == 0) &&
-			    (p[slen] == '|' || p[slen] == ' ' ||
-			    p[slen] == '\0')) {
-				nflags |= ep->fval;
-				break;
-			}
-		}
-		if (ep->fname == NULL) {
-			if (doexit)
-				comerrno(EX_BAD, "Bad flag '%s'\n", p);
-			*ef = ec;	/* Restore old character */
-			return (0);
-		}
-		p = strchr(p, '|');
-	} while (p && *p++ == '|');
-
-	*ef = ec;			/* Restore old character */
-	if ((nflags & ~(UInt32_t)(E_ABORT|E_WARN)) == 0) {
-		if (doexit)
-			comerrno(EX_BAD, "Bad error condition '%s'.\n", eflag);
-		return (0);
-	}
-	return (nflags);
+  register struct eflags	*ep;
+  register int		slen;
+  register UInt32_t	nflags = 0;
+  char *curflags;
+  char *curflag;
+  
+  curflags = strdup (eflag);
+  *_endword(curflags) = '\0';
+  curflag   = strtok (curflags, "|");
+  
+  while (curflag != NULL) {
+    for (ep = eflags; ep->fname; ep++) {
+      slen = strlen (ep->fname);
+      if ((strncmp (ep->fname, curflag, slen)) == 0) {
+	nflags |= ep->fval;
+	goto next;
+      }
+    }
+    
+    if (doexit)
+      comerrno (EX_BAD, "Bad flag '%s' \n", curflag);
+
+    free (curflags);
+    return (0);
+  next:
+    curflag = strtok (NULL, "|");
+  }
+  
+  free (curflags);
+
+  if ((nflags & ~(UInt32_t)(E_ABORT|E_WARN)) == 0) {
+    if (doexit)
+      comerrno(EX_BAD, "Bad error condition '%s'.\n", eflag);
+    return (0);
+  }
+  return (nflags);
 }
 
 LOCAL ec_t *


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/star/FC-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	8 Aug 2006 12:03:38 -0000	1.16
+++ .cvsignore	28 Aug 2007 08:19:56 -0000	1.17
@@ -1 +1 @@
-star-1.5a75.tar.bz2
+star-1.5a84.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/star/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	8 Aug 2006 12:03:38 -0000	1.17
+++ sources	28 Aug 2007 08:19:56 -0000	1.18
@@ -1 +1 @@
-5caa472e213964065baed871ca0f06f7  star-1.5a75.tar.bz2
+7b3860592468e46396fe34157f338d42  star-1.5a84.tar.bz2

star-1.5-newMake.patch:
 Defaults.linux |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Index: star-1.5-newMake.patch
===================================================================
RCS file: /cvs/dist/rpms/star/FC-6/star-1.5-newMake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- star-1.5-newMake.patch	22 Nov 2004 14:57:57 -0000	1.1
+++ star-1.5-newMake.patch	28 Aug 2007 08:19:56 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- star-1.5/DEFAULTS/Defaults.linux.fix	2007-08-23 13:35:54.000000000 +0200
++++ star-1.5/DEFAULTS/Defaults.linux	2007-08-23 13:51:33.000000000 +0200
 @@ -8,8 +8,8 @@
  # Compiler stuff
  #
@@ -8,19 +8,17 @@
 -#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=
+@@ -40,20 +40,20 @@ __LINUX_SRC_INCLUDE=	$(_LINUX_SRC_INCLUD
+ LINUX_SRC_INCLUDE=      $(__LINUX_SRC_INCLUDE:$(_UNIQ)no%=%)
  
--DEFINCDIRS=	$(SRCROOT)/include /usr/src/linux/include
+ DEFINCDIRS=	$(SRCROOT)/include
 -LDPATH=		-L/opt/schily/lib
--RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
-+DEFINCDIRS=	$(SRCROOT)/include
-+LDPATH=		
-+RUNPATH=	
+-RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
++LDPATH= 
++RUNPATH= 
  
  ###########################################################################
  #

star-1.5-selinux.patch:
 conf/configure.in |   15 ++++++++++++++
 conf/rules.cnf.in |    1 
 star/Makefile     |   57 +++++-------------------------------------------------
 star/cpio.mk      |    3 +-
 star/extract.c    |   11 ++++++++++
 star/gnutar.mk    |    3 +-
 star/pax.mk       |    4 ++-
 star/star.c       |    9 ++++++++
 star/star.mk      |    3 +-
 star/star_fat.mk  |    3 +-
 star/starsubs.h   |    5 ++++
 star/suntar.mk    |    3 +-
 star/xattr.c      |   26 ++++++++++++++++++++++++
 13 files changed, 86 insertions(+), 57 deletions(-)

Index: star-1.5-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/star/FC-6/star-1.5-selinux.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- star-1.5-selinux.patch	22 Feb 2006 10:14:45 -0000	1.5
+++ star-1.5-selinux.patch	28 Aug 2007 08:19:56 -0000	1.6
@@ -1,115 +1,192 @@
---- star-1.5/conf/configure.in.selinux	2006-02-07 11:23:13.000000000 -0500
-+++ star-1.5/conf/configure.in	2006-02-22 10:11:28.000000000 -0500
-@@ -357,6 +357,15 @@
- 	echo no
- 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
-+
- dnl Checks for OS madness.
- AC_BROKEN_LINUX_EXT2_FS_H
- AC_BROKEN_SRC_LINUX_EXT2_FS_H
-@@ -373,5 +382,6 @@
- AC_SUBST(lib_acl_test)
- AC_SUBST(lib_attr)
- AC_SUBST(lib_secdb)
-+AC_SUBST(lib_selinux)
- 
- AC_OUTPUT(rules.cnf)
---- star-1.5/conf/rules.cnf.in.selinux	2005-12-20 06:41:02.000000000 -0500
-+++ star-1.5/conf/rules.cnf.in	2006-02-22 10:12:56.000000000 -0500
-@@ -10,3 +10,5 @@
- LIB_ACL_TEST= @lib_acl_test@
- LIB_ATTR = @lib_attr@
- LIB_SECDB = @lib_secdb@
-+LIB_SELINUX = @lib_selinux@
-+
---- star-1.5/star/pax.mk.selinux	2006-02-02 10:00:31.000000000 -0500
-+++ star-1.5/star/pax.mk	2006-02-22 10:10:09.000000000 -0500
-@@ -17,6 +17,7 @@
- CPPOPTS +=	-DUSE_LARGEFILES
+--- star-1.5/star/suntar.mk.selinux	2007-02-17 15:51:23.000000000 +0100
++++ star-1.5/star/suntar.mk	2007-08-24 11:51:13.000000000 +0200
+@@ -18,6 +18,7 @@
  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 \
++CPPOPTS +=      -DWITH_SELINUX
+ CPPOPTS +=	-DSCHILY_PRINT
+ CFILES=		suntar.c header.c cpiohdr.c xheader.c xattr.c \
+ 		list.c extract.c create.c append.c diff.c restore.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_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	spaxman.mk
+ XMK_FILE=	suntarman.mk
  
  ###########################################################################
---- star-1.5/star/star.mk.selinux	2005-08-28 07:22:30.000000000 -0400
-+++ star-1.5/star/star.mk	2006-02-22 10:10:09.000000000 -0500
-@@ -19,6 +19,7 @@
+--- star-1.5/star/extract.c.selinux	2007-06-03 17:06:52.000000000 +0200
++++ star-1.5/star/extract.c	2007-08-24 11:51:13.000000000 +0200
+@@ -246,6 +246,17 @@
+ 			continue;
+ 		}
+ #endif
++
++#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 (finfo.f_flags & F_BAD_META) {
+ 			if (!void_bad(&finfo))
+ 				break;
+--- star-1.5/star/cpio.mk.selinux	2007-02-17 15:51:23.000000000 +0100
++++ star-1.5/star/cpio.mk	2007-08-24 11:51:13.000000000 +0200
+@@ -18,6 +18,7 @@
+ CPPOPTS +=	-DUSE_ACL
  CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
- CPPOPTS +=	-DCOPY_LINKS_DELAYED
 +CPPOPTS +=	-DWITH_SELINUX
- CFILES=		star.c header.c cpiohdr.c xheader.c xattr.c \
+ CPPOPTS +=	-DSCHILY_PRINT
+ CFILES=		cpio.c header.c cpiohdr.c xheader.c xattr.c \
  		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.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_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	Makefile.man starformatman.mk
+ XMK_FILE=	scpioman.mk
+ 
+ ###########################################################################
+--- star-1.5/star/starsubs.h.selinux	2007-07-15 19:38:52.000000000 +0200
++++ star-1.5/star/starsubs.h	2007-08-24 11:51:13.000000000 +0200
+@@ -297,6 +297,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 <selinux/selinux.h>
++extern BOOL    setselinux __PR((register FINFO *info));
++extern int selinux_enabled;
++#endif
+ #endif
+ 
+ /*
+--- star-1.5/star/Makefile.selinux	2007-06-16 16:46:18.000000000 +0200
++++ star-1.5/star/Makefile	2007-08-24 11:51:13.000000000 +0200
+@@ -1,64 +1,19 @@
+-#ident @(#)star_fat.mk	1.21 07/06/16 
++#ident @(#)all.mk	1.1 05/02/16 
+ ###########################################################################
+-#include		$(MAKE_M_ARCH).def
+ SRCROOT=	..
+ RULESDIR=	RULES
+ include		$(SRCROOT)/$(RULESDIR)/rules.top
+ ###########################################################################
  
+ #
+-# This is star_fat.mk, it creates one "fat" binary for all functionality.
++# This is all.mk, it creates sevral binaries, one for each function.
+ #
+-# If you like to create non "fat" binaries, remove Makefile
+-# and copy all.mk to Makefile.
++# If you like to create one single "fat" binary, remove Makefile
++# and copy star_fat.mk to Makefile.
+ #
+-INSDIR=		bin
+-TARGET=		star
+-#SYMLINKS=	ustar tar
+-SYMLINKS=	ustar tar gnutar suntar scpio spax
+-CPPOPTS +=	-D__STAR__
+-CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
+-#CPPOPTS +=	-DSET_CTIME -DFIFO -DUSE_MMAP
+-#CPPOPTS +=	-DSET_CTIME -DUSE_MMAP
+-#CPPOPTS +=	-DFIFO -DUSE_MMAP
+-CPPOPTS +=	-DUSE_LARGEFILES
+-CPPOPTS +=	-DUSE_FIND
+-CPPOPTS +=	-DUSE_ACL
+-CPPOPTS +=	-DUSE_XATTR
+-CPPOPTS +=	-DUSE_FFLAGS
+-CPPOPTS +=	-DCOPY_LINKS_DELAYED
+-CPPOPTS +=	-DSTAR_FAT
+-CPPOPTS +=	-DSCHILY_PRINT
+-CFILES=		star_fat.c header.c cpiohdr.c xheader.c xattr.c \
+-		list.c extract.c create.c append.c diff.c restore.c \
+-		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+-		buffer.c dirtime.c lhash.c \
+-		hole.c longnames.c names.c \
+-		movearch.c table.c props.c \
+-		fetchdir.c \
+-		unicode.c \
+-		subst.c volhdr.c \
+-		chdir.c match.c defaults.c dumpdate.c \
+-		fifo.c device.c checkerr.c \
+-		\
+-		findinfo.c find.c walk.c find_list.c find_misc.c
+-HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
+-		movearch.h table.h props.h fifo.h diff.h restore.h \
+-		checkerr.h dumpdate.h bitstring.h \
+-		\
+-		find.h fetchdir.h walk.h find_list.h find_misc.h
+-#LIBS=		-lunos
+-#LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
+-LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
+-XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
+-		spaxman.mk suntarman.mk Makefile.dfl Makefile.doc
+ 
+-star_fat.c: star.c
+-	$(RM) $(RM_FORCE) $@; cp star.c $@
++MK_FILES= star.mk pax.mk suntar.mk gnutar.mk cpio.mk 
+ 
+ ###########################################################################
+-include		$(SRCROOT)/$(RULESDIR)/rules.cmd
++include		$(SRCROOT)/$(RULESDIR)/rules.mks
  ###########################################################################
---- star-1.5/star/star_fat.mk.selinux	2005-11-01 15:53:51.000000000 -0500
-+++ star-1.5/star/star_fat.mk	2006-02-22 10:10:09.000000000 -0500
-@@ -28,6 +28,7 @@
+-count:	$(CFILES) $(HFILES)
+-	count $r1
+-
+--- star-1.5/star/pax.mk.selinux	2007-02-17 15:51:23.000000000 +0100
++++ star-1.5/star/pax.mk	2007-08-24 11:51:13.000000000 +0200
+@@ -18,8 +18,10 @@
+ CPPOPTS +=	-DUSE_ACL
+ CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
- CPPOPTS +=	-DCOPY_LINKS_DELAYED
- CPPOPTS +=	-DSTAR_FAT
-+CPPOPTS +=	-DWITH_SELINUX
- CFILES=		star_fat.c header.c cpiohdr.c xheader.c xattr.c \
++CPPOPTS +=      -DWITH_SELINUX
+ CPPOPTS +=	-DPAX
+ CPPOPTS +=	-DSCHILY_PRINT
++
+ CFILES=		pax.c header.c cpiohdr.c xheader.c xattr.c \
  		list.c extract.c create.c append.c diff.c restore.c \
  		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
-@@ -48,7 +49,7 @@
- 		find.h gettnum.h fetchdir.h walk.h find_list.h mem.h find_misc.h
+@@ -36,7 +38,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_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
- 		spaxman.mk suntarman.mk Makefile.dfl
+ XMK_FILE=	spaxman.mk
  
---- star-1.5/star/Makefile.selinux	2005-11-01 15:53:51.000000000 -0500
-+++ star-1.5/star/Makefile	2006-02-22 10:10:09.000000000 -0500
-@@ -25,6 +25,7 @@
- CPPOPTS +=	-DUSE_FIND
- CPPOPTS +=	-DUSE_ACL
- CPPOPTS +=	-DUSE_XATTR
-+CPPOPTS +=      -DWITH_SELINUX
- CPPOPTS +=	-DUSE_FFLAGS
+ ###########################################################################
+--- star-1.5/star/star_fat.mk.selinux	2007-06-16 16:46:18.000000000 +0200
++++ star-1.5/star/star_fat.mk	2007-08-24 11:51:13.000000000 +0200
+@@ -29,6 +29,7 @@
  CPPOPTS +=	-DCOPY_LINKS_DELAYED
  CPPOPTS +=	-DSTAR_FAT
-@@ -48,7 +49,7 @@
- 		find.h gettnum.h fetchdir.h walk.h find_list.h mem.h find_misc.h
+ CPPOPTS +=	-DSCHILY_PRINT
++CPPOPTS +=      -DWITH_SELINUX
+ CFILES=		star_fat.c header.c cpiohdr.c xheader.c xattr.c \
+ 		list.c extract.c create.c append.c diff.c restore.c \
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+@@ -49,7 +50,7 @@
+ 		find.h fetchdir.h walk.h find_list.h find_misc.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_SOCKET) $(LIB_SELINUX)
  XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
- 		spaxman.mk suntarman.mk Makefile.dfl
+ 		spaxman.mk suntarman.mk Makefile.dfl Makefile.doc
  
---- star-1.5/star/star.c.selinux	2006-02-18 14:09:39.000000000 -0500
-+++ star-1.5/star/star.c	2006-02-22 10:10:09.000000000 -0500
-@@ -42,6 +42,10 @@
+--- star-1.5/star/star.c.selinux	2007-07-16 09:43:14.000000000 +0200
++++ star-1.5/star/star.c	2007-08-24 11:51:13.000000000 +0200
+@@ -45,6 +45,10 @@
  #include "starsubs.h"
  #include "checkerr.h"
  
@@ -120,116 +197,43 @@
  EXPORT	int	main		__PR((int ac, char **av));
  LOCAL	void	star_create	__PR((int ac, char *const *av));
  LOCAL	void	checkdumptype	__PR((GINFO *gp));
-@@ -375,6 +379,11 @@
+@@ -384,6 +388,11 @@
  			comerr("Panic cannot set back effective uid.\n");
  	}
  	my_uid = geteuid();
 +
 +#ifdef WITH_SELINUX
-+       selinux_enabled=is_selinux_enabled()>0;
++    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	2005-11-13 08:57:21.000000000 -0500
-+++ star-1.5/star/extract.c	2006-02-22 10:14:45.000000000 -0500
-@@ -224,6 +224,17 @@
- 			continue;
- 		}
- #endif
-+
-+#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 (finfo.f_flags & F_BAD_META) {
- 			if (!void_bad(&finfo))
- 				break;
---- star-1.5/star/cpio.mk.selinux	2006-02-02 10:01:18.000000000 -0500
-+++ star-1.5/star/cpio.mk	2006-02-22 10:10:09.000000000 -0500
-@@ -18,6 +18,7 @@
- CPPOPTS +=	-DUSE_ACL
- CPPOPTS +=	-DUSE_XATTR
- CPPOPTS +=	-DUSE_FFLAGS
-+CPPOPTS +=	-DWITH_SELINUX
- CFILES=		cpio.c header.c cpiohdr.c xheader.c xattr.c \
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
-@@ -34,7 +35,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_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	scpioman.mk
- 
- ###########################################################################
---- star-1.5/star/gnutar.mk.selinux	2006-02-02 10:00:31.000000000 -0500
-+++ star-1.5/star/gnutar.mk	2006-02-22 10:10:09.000000000 -0500
-@@ -18,6 +18,7 @@
- CPPOPTS +=	-DUSE_ACL
- CPPOPTS +=	-DUSE_XATTR
- CPPOPTS +=	-DUSE_FFLAGS
-+CPPOPTS +=	-DWITH_SELINUX
- CFILES=		gnutar.c header.c cpiohdr.c xheader.c xattr.c \
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
-@@ -34,7 +35,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_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	gnutarman.mk
- 
- ###########################################################################
---- star-1.5/star/suntar.mk.selinux	2006-02-02 10:00:31.000000000 -0500
-+++ star-1.5/star/suntar.mk	2006-02-22 10:10:09.000000000 -0500
-@@ -18,6 +18,7 @@
- CPPOPTS +=	-DUSE_ACL
+--- star-1.5/star/star.mk.selinux	2007-02-17 15:51:23.000000000 +0100
++++ star-1.5/star/star.mk	2007-08-24 11:51:13.000000000 +0200
+@@ -19,6 +19,7 @@
  CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
-+CPPOPTS +=	-DWITH_SELINUX
- CFILES=		suntar.c header.c cpiohdr.c xheader.c xattr.c \
+ CPPOPTS +=	-DCOPY_LINKS_DELAYED
++CPPOPTS +=      -DWITH_SELINUX
+ CPPOPTS +=	-DSCHILY_PRINT
+ CFILES=		star.c header.c cpiohdr.c xheader.c xattr.c \
  		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
-@@ -34,7 +35,7 @@
+@@ -36,7 +37,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_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	suntarman.mk
+ XMK_FILE=	Makefile.man starformatman.mk
  
  ###########################################################################
---- star-1.5/star/starsubs.h.selinux	2005-11-01 16:32:18.000000000 -0500
-+++ star-1.5/star/starsubs.h	2006-02-22 10:10:09.000000000 -0500
-@@ -301,6 +301,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 <selinux/selinux.h>
-+extern BOOL    setselinux __PR((register FINFO *info));
-+extern int selinux_enabled;
-+#endif
- #endif
- 
- /*
---- star-1.5/star/xattr.c.selinux	2006-02-13 20:00:40.000000000 -0500
-+++ star-1.5/star/xattr.c	2006-02-22 10:16:44.000000000 -0500
-@@ -181,6 +181,29 @@
+--- star-1.5/star/xattr.c.selinux	2006-09-13 18:24:20.000000000 +0200
++++ star-1.5/star/xattr.c	2007-08-24 11:53:56.000000000 +0200
+@@ -184,6 +184,28 @@
  #endif  /* USE_XATTR */
  }
  
-+
 +#ifdef WITH_SELINUX
 +EXPORT BOOL
 +setselinux(info)
@@ -255,14 +259,77 @@
  /* ARGSUSED */
  EXPORT BOOL
  set_xattr(info)
-@@ -194,6 +217,10 @@
+@@ -197,6 +219,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;
++               	if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0))
++                    continue;
 +#endif
  		if (lsetxattr(info->f_name, xap->name, xap->value,
  		    xap->value_len, 0) != 0) {
  			if (!errhidden(E_SETXATTR, info->f_name)) {
+--- star-1.5/star/gnutar.mk.selinux	2007-02-17 15:51:23.000000000 +0100
++++ star-1.5/star/gnutar.mk	2007-08-24 11:51:13.000000000 +0200
+@@ -18,6 +18,7 @@
+ CPPOPTS +=	-DUSE_ACL
+ CPPOPTS +=	-DUSE_XATTR
+ CPPOPTS +=	-DUSE_FFLAGS
++CPPOPTS +=      -DWITH_SELINUX
+ CPPOPTS +=	-DSCHILY_PRINT
+ CFILES=		gnutar.c header.c cpiohdr.c xheader.c xattr.c \
+ 		list.c extract.c create.c append.c diff.c restore.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_SOCKET) $(LIB_SELINUX)
+ XMK_FILE=	gnutarman.mk
+ 
+ ###########################################################################
+--- star-1.5/conf/rules.cnf.in.selinux	2007-05-19 14:52:46.000000000 +0200
++++ star-1.5/conf/rules.cnf.in	2007-08-24 11:51:13.000000000 +0200
+@@ -20,3 +20,4 @@
+ LIB_SECDB = @lib_secdb@
+ LIB_PTHREAD = @lib_pthread@
+ LIB_RT = @lib_rt@
++LIB_SELINUX = @lib_selinux@
+--- star-1.5/conf/configure.in.selinux	2007-07-10 05:58:54.000000000 +0200
++++ star-1.5/conf/configure.in	2007-08-24 11:51:13.000000000 +0200
+@@ -403,6 +403,8 @@
+   LIBS="$ac_save_LIBS"
+ fi
+ 
++
++
+ AC_CHECKING(for RBAC support)
+ AC_CHECK_LIB(secdb, getuserattr, lib_secdb="-lsecdb")
+ ac_save_LIBS="$LIBS"
+@@ -441,6 +443,18 @@
+ else
+ 	echo no
+ 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_MSG_CHECKING(for /dev/null)
+ if test -r /dev/null; then
+ 	echo yes
+@@ -523,5 +537,6 @@
+ AC_SUBST(lib_secdb)
+ AC_SUBST(lib_pthread)
+ AC_SUBST(lib_rt)
++AC_SUBST(lib_selinux)
+ 
+ AC_OUTPUT(rules.cnf)


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/FC-6/star.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- star.spec	8 Aug 2006 12:03:38 -0000	1.30
+++ star.spec	28 Aug 2007 08:19:56 -0000	1.31
@@ -3,18 +3,19 @@
 %endif
 Summary:  An archiving tool with ACL support
 Name: star
-Version: 1.5a75
-Release: 1
+Version: 1.5a84
+Release: 2%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
 Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-selinux.patch
-
+Patch3: star-1.5-changewarnSegv.patch
 License: CDDL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libattr-devel libacl-devel libtool libselinux-devel
-
+BuildRequires: libattr-devel libacl-devel libtool libselinux-devel 
+BuildRequires: e2fsprogs-devel gawk
+ 
 %description
 Star saves many files together into a single tape or disk archive,
 and can restore individual files from the archive. Star supports ACL.
@@ -25,8 +26,9 @@
 %if %{WITH_SELINUX}
 %patch2 -p1 -b .selinux
 %endif
+%patch3 -p1 -b .changewarnSegv
 
-for PLAT in x86_64 ppc64 s390 s390x; do
+for PLAT in %{arm} x86_64 ppc64 s390 s390x; do
         for AFILE in gcc cc; do
                 [ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \
                 && ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul
@@ -58,6 +60,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 %makeinstall RPM_INSTALLDIR=${RPM_BUILD_ROOT} PARCH=%{_target_cpu} K_ARCH=%{_target_cpu} < /dev/null
 rm -rf $RPM_BUILD_ROOT/usr/share/man
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/rmt
 mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT%{_mandir}
 
 # XXX Nuke unpackaged files.
@@ -86,10 +89,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AN* COPYING CDDL.Schily.txt README.ACL README.crash README.largefiles README.linux
-%doc README.otherbugs README.pattern README.posix-2001  README.SSPM
-%doc STARvsGNUTAR
-%doc STATUS.alpha TODO
+%doc README AN* COPYING CDDL.Schily.txt README.SSPM STATUS.alpha TODO
 %{_bindir}/star
 %{_bindir}/ustar
 %{_bindir}/spax
@@ -97,6 +97,22 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Mon Aug 27 2007 Peter Vrabec <pvrabec at redhat.com> 1.5a84-2
+- fix segfault of data-change-warn option (#255261), 
+  patch from dkopecek at redhat.com
+
+* Fri Aug 24 2007 Peter Vrabec <pvrabec at redhat.com> 1.5a84-1
+- new upstream release with CVE-2007-4134 fix
+
+* Sun Jun 24 2007 Peter Vrabec <pvrabec at redhat.com> 1.5a76-3
+- build star on ARM platforms (#245465)
+
+* Mon Jan 29 2007 Peter Vrabec <pvrabec at redhat.com> 1.5a76-2
+- fix buildreq. and rebuild
+
+* Thu Jan 18 2007 Jan Cholasta <grubber.x at gmail.com> 1.5a76-1 
+- upgrade
+
 * Tue Aug 08 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a75-1
 - upgrade

More information about the fedora-cvs-commits mailing list