Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
Pavel Raiskup
|
2165805ab6 | |
|
Pavel Raiskup
|
0454b3b096 |
|
|
@ -1 +1 @@
|
|||
/star-1.5.3.tar.bz2
|
||||
star-1.5.1.tar.bz2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
46ef6425082e60966ec9d33f73fd44b0 star-1.5.3.tar.bz2
|
||||
f9a28f83702624c4c08ef1a343014c7a star-1.5.1.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
--- 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
|
||||
#
|
||||
###########################################################################
|
||||
-DEFCCOM= cc
|
||||
-#DEFCCOM= gcc
|
||||
+#DEFCCOM= cc
|
||||
+DEFCCOM= gcc
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -40,22 +40,21 @@ __LINUX_SRC_INCLUDE= $(_LINUX_SRC_INCLUD
|
||||
LINUX_SRC_INCLUDE= $(__LINUX_SRC_INCLUDE:$(_UNIQ)no%=%)
|
||||
|
||||
DEFINCDIRS= $(SRCROOT)/include
|
||||
-LDPATH= -L/opt/schily/lib
|
||||
-#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
|
||||
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
|
||||
+LDPATH=
|
||||
+RUNPATH=
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
# Installation config stuff
|
||||
#
|
||||
###########################################################################
|
||||
-INS_BASE= /opt/schily
|
||||
-INS_KBASE= /
|
||||
-INS_RBASE= /
|
||||
+INS_BASE= $(RPM_INSTALLDIR)/usr/
|
||||
+INS_KBASE= $(RPM_INSTALLDIR)/
|
||||
+INS_RBASE= $(RPM_INSTALLDIR)/
|
||||
#
|
||||
DEFUMASK= 002
|
||||
#
|
||||
DEFINSMODEF= 444
|
||||
DEFINSMODEX= 755
|
||||
DEFINSUSR= root
|
||||
-DEFINSGRP= bin
|
||||
+DEFINSGRP= root
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
diff --git a/autoconf/configure.in b/autoconf/configure.in
|
||||
index fc9f880..30383e4 100644
|
||||
--- a/autoconf/configure.in
|
||||
+++ b/autoconf/configure.in
|
||||
@@ -906,6 +906,15 @@ LIBS="$LIBS $lib_cap"
|
||||
AC_CHECK_FUNCS(cap_get_proc cap_set_proc cap_set_flag cap_clear_flag)
|
||||
diff -urNp star-1.5.1-orig/autoconf/configure.in star-1.5.1/autoconf/configure.in
|
||||
--- star-1.5.1-orig/autoconf/configure.in
|
||||
+++ star-1.5.1/autoconf/configure.in
|
||||
@@ -452,6 +452,15 @@ AC_CHECK_FUNCS(sched_yield)
|
||||
AC_CHECK_FUNCS(nanosleep)
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
+AC_CHECK_HEADERS(selinux/selinux.h)
|
||||
|
|
@ -16,32 +15,29 @@ index fc9f880..30383e4 100644
|
|||
+fi
|
||||
+
|
||||
dnl Misc OS checks.
|
||||
AC_CHECK_FILES(/dev/tty /dev/null /dev/zero)
|
||||
AC_CHECK_FILES(/dev/stdin /dev/stdout /dev/stderr)
|
||||
@@ -992,6 +1001,7 @@ AC_SUBST(lib_secdb)
|
||||
AC_MSG_CHECKING(for /dev/tty)
|
||||
if test -r /dev/tty; then
|
||||
@@ -543,6 +552,7 @@ AC_SUBST(lib_secdb)
|
||||
AC_SUBST(lib_gen)
|
||||
AC_SUBST(lib_pthread)
|
||||
AC_SUBST(lib_rt)
|
||||
+AC_SUBST(lib_selinux)
|
||||
AC_SUBST(lib_dl)
|
||||
AC_SUBST(lib_dir)
|
||||
AC_SUBST(lib_cap)
|
||||
diff --git a/autoconf/rules.cnf.in b/autoconf/rules.cnf.in
|
||||
index affcb5c..2b7bff2 100644
|
||||
--- a/autoconf/rules.cnf.in
|
||||
+++ b/autoconf/rules.cnf.in
|
||||
@@ -34,6 +34,7 @@ LIB_SECDB = @lib_secdb@
|
||||
|
||||
diff -urNp star-1.5.1-orig/conf/rules.cnf.in star-1.5.1/conf/rules.cnf.in
|
||||
--- star-1.5.1-orig/autoconf/rules.cnf.in
|
||||
+++ star-1.5.1/autoconf/rules.cnf.in
|
||||
@@ -21,5 +21,6 @@ LIB_SECDB = @lib_secdb@
|
||||
LIB_GEN = @lib_gen@
|
||||
LIB_PTHREAD = @lib_pthread@
|
||||
LIB_RT = @lib_rt@
|
||||
+LIB_SELINUX = @lib_selinux@
|
||||
LIB_DL= @lib_dl@
|
||||
LIB_DIR= @lib_dir@
|
||||
LIB_CAP= @lib_cap@
|
||||
diff --git a/star/cpio.mk b/star/cpio.mk
|
||||
index 37a6dd2..8bfc3bd 100644
|
||||
--- a/star/cpio.mk
|
||||
+++ b/star/cpio.mk
|
||||
diff -urNp star-1.5-orig/star/cpio.mk star-1.5/star/cpio.mk
|
||||
--- star-1.5-orig/star/cpio.mk 2008-04-06 20:01:45.000000000 +0200
|
||||
+++ star-1.5/star/cpio.mk 2008-12-18 16:00:27.000000000 +0100
|
||||
@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND
|
||||
CPPOPTS += -DUSE_ACL
|
||||
CPPOPTS += -DUSE_XATTR
|
||||
|
|
@ -50,20 +46,19 @@ index 37a6dd2..8bfc3bd 100644
|
|||
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 \
|
||||
@@ -34,7 +35,7 @@ CFILES= cpio.c header.c cpiohdr.c xheader.c xattr.c \
|
||||
@@ -34,7 +35,7 @@ CFILES= cpio.c header.c cpiohdr.c xhead
|
||||
HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \
|
||||
movearch.h table.h props.h fifo.h diff.h \
|
||||
checkerr.h dumpdate.h bitstring.h pathname.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX)
|
||||
checkerr.h dumpdate.h bitstring.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
|
||||
XMK_FILE= scpioman.mk
|
||||
|
||||
###########################################################################
|
||||
diff --git a/star/extract.c b/star/extract.c
|
||||
index cf60154..98842e1 100644
|
||||
--- a/star/extract.c
|
||||
+++ b/star/extract.c
|
||||
@@ -256,6 +256,17 @@ extern struct WALK walkstate;
|
||||
diff -urNp star-1.5-orig/star/extract.c star-1.5/star/extract.c
|
||||
--- star-1.5-orig/star/extract.c 2008-04-06 17:32:15.000000000 +0200
|
||||
+++ star-1.5/star/extract.c 2008-12-18 15:59:46.000000000 +0100
|
||||
@@ -253,6 +253,17 @@ extern struct WALK walkstate;
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -81,10 +76,9 @@ index cf60154..98842e1 100644
|
|||
if (finfo.f_flags & F_BAD_META) {
|
||||
if (!void_bad(&finfo))
|
||||
break;
|
||||
diff --git a/star/gnutar.mk b/star/gnutar.mk
|
||||
index 1a296e1..6595aa2 100644
|
||||
--- a/star/gnutar.mk
|
||||
+++ b/star/gnutar.mk
|
||||
diff -urNp star-1.5-orig/star/gnutar.mk star-1.5/star/gnutar.mk
|
||||
--- star-1.5-orig/star/gnutar.mk 2008-04-06 20:01:45.000000000 +0200
|
||||
+++ star-1.5/star/gnutar.mk 2008-12-18 16:08:54.000000000 +0100
|
||||
@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND
|
||||
CPPOPTS += -DUSE_ACL
|
||||
CPPOPTS += -DUSE_XATTR
|
||||
|
|
@ -93,19 +87,18 @@ index 1a296e1..6595aa2 100644
|
|||
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 \
|
||||
@@ -34,7 +35,7 @@ CFILES= gnutar.c header.c cpiohdr.c xheader.c xattr.c \
|
||||
@@ -34,7 +35,7 @@ CFILES= gnutar.c header.c cpiohdr.c xhe
|
||||
HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \
|
||||
movearch.h table.h props.h fifo.h diff.h \
|
||||
checkerr.h dumpdate.h bitstring.h pathname.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX)
|
||||
checkerr.h dumpdate.h bitstring.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
|
||||
XMK_FILE= gnutarman.mk
|
||||
|
||||
###########################################################################
|
||||
diff --git a/star/pax.mk b/star/pax.mk
|
||||
index 73c6bc1..d2a52a9 100644
|
||||
--- a/star/pax.mk
|
||||
+++ b/star/pax.mk
|
||||
diff -urNp star-1.5-orig/star/pax.mk star-1.5/star/pax.mk
|
||||
--- star-1.5-orig/star/pax.mk 2008-04-06 20:01:45.000000000 +0200
|
||||
+++ star-1.5/star/pax.mk 2008-12-18 16:03:42.000000000 +0100
|
||||
@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND
|
||||
CPPOPTS += -DUSE_ACL
|
||||
CPPOPTS += -DUSE_XATTR
|
||||
|
|
@ -114,20 +107,19 @@ index 73c6bc1..d2a52a9 100644
|
|||
CPPOPTS += -DPAX
|
||||
CPPOPTS += -DSCHILY_PRINT
|
||||
CFILES= pax.c header.c cpiohdr.c xheader.c xattr.c \
|
||||
@@ -35,7 +36,7 @@ CFILES= pax.c header.c cpiohdr.c xheader.c xattr.c \
|
||||
@@ -35,7 +36,7 @@ CFILES= pax.c header.c cpiohdr.c xheade
|
||||
HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \
|
||||
movearch.h table.h props.h fifo.h diff.h \
|
||||
checkerr.h dumpdate.h bitstring.h pathname.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX)
|
||||
checkerr.h dumpdate.h bitstring.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
|
||||
XMK_FILE= spaxman.mk
|
||||
|
||||
###########################################################################
|
||||
diff --git a/star/star.c b/star/star.c
|
||||
index 9dfcef7..464c751 100644
|
||||
--- a/star/star.c
|
||||
+++ b/star/star.c
|
||||
@@ -48,6 +48,10 @@ static UConst char sccsid[] =
|
||||
diff -urNp star-1.5-orig/star/star.c star-1.5/star/star.c
|
||||
--- star-1.5-orig/star/star.c 2008-04-13 15:01:30.000000000 +0200
|
||||
+++ star-1.5/star/star.c 2008-12-18 16:05:31.000000000 +0100
|
||||
@@ -46,6 +46,10 @@ static char sccsid[] =
|
||||
#include "starsubs.h"
|
||||
#include "checkerr.h"
|
||||
|
||||
|
|
@ -138,7 +130,7 @@ index 9dfcef7..464c751 100644
|
|||
EXPORT int main __PR((int ac, char **av));
|
||||
LOCAL void star_create __PR((int ac, char *const *av));
|
||||
LOCAL void checkdumptype __PR((GINFO *gp));
|
||||
@@ -402,6 +406,10 @@ main(ac, av)
|
||||
@@ -388,6 +392,10 @@ main(ac, av)
|
||||
comerr("Panic cannot set back effective uid.\n");
|
||||
}
|
||||
my_uid = geteuid();
|
||||
|
|
@ -149,31 +141,9 @@ index 9dfcef7..464c751 100644
|
|||
/*
|
||||
* WARNING: We now are no more able to open a new remote connection
|
||||
* unless we have been called by root.
|
||||
diff --git a/star/star.mk b/star/star.mk
|
||||
index a6f6cff..68d3482 100644
|
||||
--- a/star/star.mk
|
||||
+++ b/star/star.mk
|
||||
@@ -21,6 +21,7 @@ CPPOPTS += -DUSE_XATTR
|
||||
CPPOPTS += -DUSE_FFLAGS
|
||||
CPPOPTS += -DCOPY_LINKS_DELAYED
|
||||
CPPOPTS += -DSCHILY_PRINT
|
||||
+CPPOPTS += -DWITH_SELINUX
|
||||
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 \
|
||||
@@ -35,7 +36,7 @@ CFILES= star.c header.c cpiohdr.c xheader.c xattr.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
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
|
||||
XMK_FILE= Makefile.man starformatman.mk
|
||||
|
||||
###########################################################################
|
||||
diff --git a/star/star_fat.mk b/star/star_fat.mk
|
||||
index 1975c94..507fbee 100644
|
||||
--- a/star/star_fat.mk
|
||||
+++ b/star/star_fat.mk
|
||||
diff -urNp star-1.5-orig/star/star_fat.mk star-1.5/star/star_fat.mk
|
||||
--- star-1.5-orig/star/star_fat.mk 2008-04-06 20:02:25.000000000 +0200
|
||||
+++ star-1.5/star/star_fat.mk 2008-12-18 16:04:20.000000000 +0100
|
||||
@@ -29,6 +29,7 @@ CPPOPTS += -DUSE_FFLAGS
|
||||
CPPOPTS += -DCOPY_LINKS_DELAYED
|
||||
CPPOPTS += -DSTAR_FAT
|
||||
|
|
@ -182,7 +152,7 @@ index 1975c94..507fbee 100644
|
|||
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 \
|
||||
@@ -48,7 +49,7 @@ HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \
|
||||
@@ -48,7 +49,7 @@ HFILES= star.h starsubs.h dirtime.h xta
|
||||
|
||||
#LIBS= -lunos
|
||||
#LIBS= -lschily -lc /usr/local/lib/gcc-gnulib
|
||||
|
|
@ -191,11 +161,30 @@ index 1975c94..507fbee 100644
|
|||
#
|
||||
# Wenn -lfind, dann auch $(LIB_INTL)
|
||||
#
|
||||
diff --git a/star/starsubs.h b/star/starsubs.h
|
||||
index a914ade..1e2a233 100644
|
||||
--- a/star/starsubs.h
|
||||
+++ b/star/starsubs.h
|
||||
@@ -317,6 +317,11 @@ extern void opt_xattr __PR((void));
|
||||
diff -urNp star-1.5-orig/star/star.mk star-1.5/star/star.mk
|
||||
--- star-1.5-orig/star/star.mk 2008-04-06 20:01:45.000000000 +0200
|
||||
+++ star-1.5/star/star.mk 2008-12-18 16:06:07.000000000 +0100
|
||||
@@ -21,6 +21,7 @@ CPPOPTS += -DUSE_XATTR
|
||||
CPPOPTS += -DUSE_FFLAGS
|
||||
CPPOPTS += -DCOPY_LINKS_DELAYED
|
||||
CPPOPTS += -DSCHILY_PRINT
|
||||
+CPPOPTS += -DWITH_SELINUX
|
||||
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 \
|
||||
@@ -35,7 +36,7 @@ CFILES= star.c header.c cpiohdr.c xhead
|
||||
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
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
|
||||
XMK_FILE= Makefile.man starformatman.mk
|
||||
|
||||
###########################################################################
|
||||
diff -urNp star-1.5-orig/star/starsubs.h star-1.5/star/starsubs.h
|
||||
--- star-1.5-orig/star/starsubs.h 2008-04-06 17:32:15.000000000 +0200
|
||||
+++ star-1.5/star/starsubs.h 2008-12-18 16:01:15.000000000 +0100
|
||||
@@ -304,6 +304,11 @@ extern void opt_xattr __PR((void));
|
||||
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));
|
||||
|
|
@ -207,10 +196,9 @@ index a914ade..1e2a233 100644
|
|||
#endif
|
||||
|
||||
/*
|
||||
diff --git a/star/suntar.mk b/star/suntar.mk
|
||||
index 9b76a23..1842917 100644
|
||||
--- a/star/suntar.mk
|
||||
+++ b/star/suntar.mk
|
||||
diff -urNp star-1.5-orig/star/suntar.mk star-1.5/star/suntar.mk
|
||||
--- star-1.5-orig/star/suntar.mk 2008-04-06 20:01:45.000000000 +0200
|
||||
+++ star-1.5/star/suntar.mk 2008-12-18 15:58:44.000000000 +0100
|
||||
@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND
|
||||
CPPOPTS += -DUSE_ACL
|
||||
CPPOPTS += -DUSE_XATTR
|
||||
|
|
@ -219,20 +207,19 @@ index 9b76a23..1842917 100644
|
|||
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 \
|
||||
@@ -34,7 +35,7 @@ CFILES= suntar.c header.c cpiohdr.c xheader.c xattr.c \
|
||||
@@ -34,7 +35,7 @@ CFILES= suntar.c header.c cpiohdr.c xhe
|
||||
HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \
|
||||
movearch.h table.h props.h fifo.h diff.h \
|
||||
checkerr.h dumpdate.h bitstring.h pathname.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX)
|
||||
checkerr.h dumpdate.h bitstring.h
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
|
||||
XMK_FILE= suntarman.mk
|
||||
|
||||
###########################################################################
|
||||
diff --git a/star/xattr.c b/star/xattr.c
|
||||
index 2e262ef..08fc42e 100644
|
||||
--- a/star/xattr.c
|
||||
+++ b/star/xattr.c
|
||||
@@ -198,6 +198,27 @@ fail:
|
||||
diff -urNp star-1.5-orig/star/xattr.c star-1.5/star/xattr.c
|
||||
--- star-1.5-orig/star/xattr.c 2008-03-16 16:40:41.000000000 +0100
|
||||
+++ star-1.5/star/xattr.c 2008-12-18 16:08:15.000000000 +0100
|
||||
@@ -196,6 +196,27 @@ fail:
|
||||
#endif /* USE_XATTR */
|
||||
}
|
||||
|
||||
|
|
@ -260,7 +247,7 @@ index 2e262ef..08fc42e 100644
|
|||
/* ARGSUSED */
|
||||
EXPORT BOOL
|
||||
set_xattr(info)
|
||||
@@ -211,6 +232,10 @@ set_xattr(info)
|
||||
@@ -209,6 +230,10 @@ set_xattr(info)
|
||||
return (TRUE);
|
||||
|
||||
for (xap = info->f_xattr; xap->name != NULL; xap++) {
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -urNp star-1.5.1-orig/include/schily/schily.h star-1.5.1/include/schily/schily.h
|
||||
--- star-1.5.1-orig/include/schily/schily.h 2009-10-22 23:18:55.000000000 +0200
|
||||
+++ star-1.5.1/include/schily/schily.h 2010-01-13 13:17:10.000000000 +0100
|
||||
@@ -174,7 +174,7 @@ extern int fexecle __PR((const char *, F
|
||||
/* 6th arg not const, fexecv forces av[ac] = NULL */
|
||||
extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
|
||||
char **));
|
||||
-extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
|
||||
+extern int sch_fexecve __PR((const char *, FILE *, FILE *, FILE *,
|
||||
char * const *, char * const *));
|
||||
extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
|
||||
extern int fspawnl __PR((FILE *, FILE *, FILE *, const char *, ...));
|
||||
@@ -311,7 +311,7 @@ extern char *findbytes __PR((const void
|
||||
extern char *findinpath __PR((char *__name, int __mode, BOOL __plain_file));
|
||||
extern int findline __PR((const char *, char, const char *,
|
||||
int, char **, int));
|
||||
-extern int getline __PR((char *, int));
|
||||
+extern int sch_getline __PR((char *, int));
|
||||
extern int getstr __PR((char *, int));
|
||||
extern int breakline __PR((char *, char, char **, int));
|
||||
extern int getallargs __PR((int *, char * const**, const char *, ...));
|
||||
diff -urNp star-1.5.1-orig/lib/fexec.c star-1.5.1/lib/fexec.c
|
||||
--- star-1.5.1-orig/lib/fexec.c 2009-11-15 15:14:28.000000000 +0100
|
||||
+++ star-1.5.1/lib/fexec.c 2010-01-13 13:17:10.000000000 +0100
|
||||
@@ -198,7 +198,7 @@ const char **pav;
|
||||
} while (p != NULL);
|
||||
va_end(args);
|
||||
|
||||
- ret = fexecve(name, in, out, err, av, env);
|
||||
+ ret = sch_fexecve(name, in, out, err, av, env);
|
||||
if (av != xav)
|
||||
free(av);
|
||||
return (ret);
|
||||
@@ -212,11 +212,11 @@ fexecv(name, in, out, err, ac, av)
|
||||
char *av[];
|
||||
{
|
||||
av[ac] = NULL; /* force list to be null terminated */
|
||||
- return (fexecve(name, in, out, err, av, environ));
|
||||
+ return (sch_fexecve(name, in, out, err, av, environ));
|
||||
}
|
||||
|
||||
EXPORT int
|
||||
-fexecve(name, in, out, err, av, env)
|
||||
+sch_fexecve(name, in, out, err, av, env)
|
||||
const char *name;
|
||||
FILE *in, *out, *err;
|
||||
char * const av[], * const env[];
|
||||
diff -urNp star-1.5.1-orig/lib/libschily-mapvers star-1.5.1/lib/libschily-mapvers
|
||||
--- star-1.5.1-orig/lib/libschily-mapvers 2007-10-06 15:21:55.000000000 +0200
|
||||
+++ star-1.5.1/lib/libschily-mapvers 2010-01-13 13:17:10.000000000 +0100
|
||||
@@ -77,7 +77,7 @@ global:
|
||||
fexecl;
|
||||
fexecle;
|
||||
fexecv;
|
||||
- fexecve;
|
||||
+ sch_fexecve;
|
||||
ffileread;
|
||||
ffilewrite;
|
||||
fgetline;
|
||||
@@ -123,7 +123,7 @@ global:
|
||||
geterrno;
|
||||
getfiles;
|
||||
getfp;
|
||||
- getline;
|
||||
+ sch_getline;
|
||||
getmainfp;
|
||||
#getstr;
|
||||
#handlecond;
|
||||
diff -urNp star-1.5.1-orig/lib/stdio/fgetline.c star-1.5.1/lib/stdio/fgetline.c
|
||||
--- star-1.5.1-orig/lib/stdio/fgetline.c 2004-09-25 14:23:36.000000000 +0200
|
||||
+++ star-1.5.1/lib/stdio/fgetline.c 2010-01-13 13:17:10.000000000 +0100
|
||||
@@ -61,7 +61,7 @@ fgetline(f, buf, len)
|
||||
}
|
||||
|
||||
EXPORT int
|
||||
-getline(buf, len)
|
||||
+sch_getline(buf, len)
|
||||
char *buf;
|
||||
int len;
|
||||
{
|
||||
diff -urNp star-1.5.1-orig/libfind/find.c star-1.5.1/libfind/find.c
|
||||
--- star-1.5.1-orig/libfind/find.c 2009-11-15 16:25:02.000000000 +0100
|
||||
+++ star-1.5.1/libfind/find.c 2010-01-13 13:17:10.000000000 +0100
|
||||
@@ -1747,7 +1747,7 @@ doexec(f, ac, av, state)
|
||||
#endif
|
||||
av[ac] = NULL; /* -exec {} \; is not NULL terminated */
|
||||
|
||||
- fexecve(av[0], state->std[0], state->std[1], state->std[2],
|
||||
+ sch_fexecve(av[0], state->std[0], state->std[1], state->std[2],
|
||||
av, state->env);
|
||||
err = geterrno();
|
||||
#ifdef PLUS_DEBUG
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff -urNp star-1.5.1-orig/star/longnames.c star-1.5.1/star/longnames.c
|
||||
--- star-1.5.1-orig/star/longnames.c 2009-10-16 00:38:55.000000000 +0200
|
||||
+++ star-1.5.1/star/longnames.c 2010-02-03 13:36:03.000000000 +0100
|
||||
@@ -155,7 +155,7 @@ name_to_tcb(info, ptb)
|
||||
if (add)
|
||||
strcatl(ptb->dbuf.t_name, name, "/", (char *)NULL);
|
||||
else
|
||||
- strcpy(ptb->dbuf.t_name, name);
|
||||
+ strncpy(ptb->dbuf.t_name, name, props.pr_maxsname);
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
@@ -198,7 +198,7 @@ name_to_tcb(info, ptb)
|
||||
if (add)
|
||||
strcatl(ptb->dbuf.t_name, &np[1], "/", (char *)NULL);
|
||||
else
|
||||
- strcpy(ptb->dbuf.t_name, &np[1]);
|
||||
+ strncpy(ptb->dbuf.t_name, &np[1], props.pr_maxsname);
|
||||
strncpy(ptb->dbuf.t_prefix, name, np - name);
|
||||
info->f_flags |= F_SPLIT_NAME;
|
||||
return (TRUE);
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -urNp star-1.5.1-orig/star/buffer.c star-1.5.1/star/buffer.c
|
||||
--- star-1.5.1-orig/star/buffer.c 2009-07-13 21:05:02.000000000 +0200
|
||||
+++ star-1.5.1/star/buffer.c 2011-01-04 13:50:25.452138625 +0100
|
||||
@@ -799,7 +799,7 @@ initbuf(nblocks)
|
||||
|
||||
bigptr = bigbuf = ___malloc((size_t) bufsize+10+pagesize,
|
||||
"buffer");
|
||||
- bigptr = bigbuf = (char *)roundup((Intptr_t)bigptr, pagesize);
|
||||
+ bigptr = bigbuf = (char *)roundup((UIntptr_t)bigptr, pagesize);
|
||||
fillbytes(bigbuf, bufsize, '\0');
|
||||
fillbytes(&bigbuf[bufsize], 10, 'U');
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff --git a/star/longnames.c b/star/longnames.c
|
||||
index 33cbe2a..9d2e303 100644
|
||||
--- a/star/longnames.c
|
||||
+++ b/star/longnames.c
|
||||
@@ -155,7 +155,7 @@ name_to_tcb(info, ptb)
|
||||
if (add)
|
||||
strcatl(ptb->ndbuf.t_name, name, "/", (char *)NULL);
|
||||
else
|
||||
- strcpy(ptb->ndbuf.t_name, name);
|
||||
+ strncpy(ptb->ndbuf.t_name, name, props.pr_maxsname);
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
@@ -198,7 +198,7 @@ name_to_tcb(info, ptb)
|
||||
if (add)
|
||||
strcatl(ptb->ndbuf.t_name, &np[1], "/", (char *)NULL);
|
||||
else
|
||||
- strcpy(ptb->ndbuf.t_name, &np[1]);
|
||||
+ strncpy(ptb->ndbuf.t_name, &np[1], props.pr_maxsname);
|
||||
strncpy(ptb->dbuf.t_prefix, name, np - name);
|
||||
info->f_flags |= F_SPLIT_NAME;
|
||||
return (TRUE);
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff --git a/rmt/rmt.dfl b/rmt/rmt.dfl
|
||||
index 7b8ca8b..e0576e8 100644
|
||||
--- a/rmt/rmt.dfl
|
||||
+++ b/rmt/rmt.dfl
|
||||
@@ -44,7 +44,9 @@ USER=*
|
||||
# name name
|
||||
#
|
||||
#ACCESS=rtape sparky /dev/rmt/*
|
||||
-ACCESS=* * /dev/rmt/*
|
||||
-ACCESS=* * /dev/null
|
||||
-ACCESS=* * /dev/zero
|
||||
-#ACCESS=* * *
|
||||
+#ACCESS=* * /dev/rmt/*
|
||||
+#ACCESS=* * /dev/null
|
||||
+#ACCESS=* * /dev/zero
|
||||
+
|
||||
+# Historically, Red Hat rmt was not so ^^ restrictive.
|
||||
+ACCESS=* * *
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/librmt/remote.c b/librmt/remote.c
|
||||
index 4606484..298ecef 100644
|
||||
--- a/librmt/remote.c
|
||||
+++ b/librmt/remote.c
|
||||
@@ -1462,7 +1462,7 @@ _rcmdrsh(ahost, inport, locuser, remuser, cmd, rsh)
|
||||
int pid;
|
||||
|
||||
if (rsh == 0)
|
||||
- rsh = "rsh";
|
||||
+ rsh = "ssh";
|
||||
|
||||
/*
|
||||
* Verify that 'locuser' is present on local host.
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 68f6e16d7d2c8a6c91cd430b12a1a0c7b15672b4 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Raiskup <praiskup@redhat.com>
|
||||
Date: Wed, 17 Dec 2014 12:57:37 +0100
|
||||
Subject: [PATCH] pax: don't segfault with -X option
|
||||
|
||||
Pass a valid address of nomount variable into getallargs().
|
||||
---
|
||||
star/pax.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/star/pax.c b/star/pax.c
|
||||
index 9abe3f8..c627a46 100644
|
||||
--- a/star/pax.c
|
||||
+++ b/star/pax.c
|
||||
@@ -166,7 +166,7 @@ gargs(ac, av)
|
||||
gethdr, &chdrtype, /* -x */
|
||||
gethdr, &chdrtype, /* artype= */
|
||||
#endif /* __old__lint */
|
||||
- nomount) < 0) {
|
||||
+ &nomount) < 0) {
|
||||
errmsgno(EX_BAD, "Bad Option: %s.\n", av[0]);
|
||||
susage(EX_BAD);
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/star/star.mk b/star/star.mk
|
||||
index 68d3482..4961a29 100644
|
||||
--- a/star/star.mk
|
||||
+++ b/star/star.mk
|
||||
@@ -32,11 +32,11 @@ CFILES= star.c header.c cpiohdr.c xheader.c xattr.c \
|
||||
subst.c volhdr.c \
|
||||
chdir.c match.c defaults.c dumpdate.c \
|
||||
fifo.c device.c checkerr.c \
|
||||
- findinfo.c
|
||||
+ findinfo.c pathname.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
|
||||
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
|
||||
+ checkerr.h dumpdate.h bitstring.h pathname.h
|
||||
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX) $(LIB_CAP)
|
||||
XMK_FILE= Makefile.man starformatman.mk
|
||||
|
||||
###########################################################################
|
||||
335
star.spec
335
star.spec
|
|
@ -1,130 +1,63 @@
|
|||
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
|
||||
%global WITH_SELINUX 1
|
||||
%define WITH_SELINUX 1
|
||||
%endif
|
||||
|
||||
%global ALTERNATIVES %{_sbindir}/alternatives
|
||||
|
||||
Summary: An archiving tool with ACL support
|
||||
Name: star
|
||||
Version: 1.5.3
|
||||
Release: 12%{?dist}
|
||||
Version: 1.5.1
|
||||
Release: 10%{?dist}
|
||||
URL: http://cdrecord.berlios.de/old/private/star.html
|
||||
Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
|
||||
|
||||
#use gcc for compilation, change defaults for Linux
|
||||
Patch1: star-1.5-newMake.patch
|
||||
#add SELinux support to star(#)
|
||||
Patch2: star-1.5-selinux.patch
|
||||
#do not segfault with data-change-warn option (#255261)
|
||||
Patch3: star-1.5-changewarnSegv.patch
|
||||
#do not conflict with glibc stdio functions (#494213)
|
||||
Patch4: star-1.5-stdioconflict.patch
|
||||
#Prevent buffer overflow for filenames with length of 100 characters (#556664)
|
||||
Patch5: star-1.5.1-bufferoverflow.patch
|
||||
#Fix some invalid manpage references (#624612)
|
||||
Patch6: star-1.5.1-manpagereferences.patch
|
||||
#fix signedness segfault with multivol option(#666015)
|
||||
Patch7: star-1.5.1-multivolsigsegv.patch
|
||||
# do not crash when xattrs are not set on all files (#861848)
|
||||
Patch8: star-1.5.1-selinux-segfault.patch
|
||||
# note that the H=crc format uses Sum32 algorithm, not CRC
|
||||
Patch9: star-1.5.1-crc.patch
|
||||
|
||||
License: CDDL
|
||||
Group: Applications/Archiving
|
||||
URL: http://freecode.com/projects/star
|
||||
Source: http://downloads.sourceforge.net/s-tar/%{name}-%{version}.tar.bz2
|
||||
|
||||
# add SELinux support to star(#)
|
||||
Patch1: star-1.5.3-selinux.patch
|
||||
|
||||
# do not segfault with data-change-warn option (#255261)
|
||||
Patch2: star-1.5-changewarnSegv.patch
|
||||
|
||||
# Prevent buffer overflow for filenames with length of 100 characters (#556664)
|
||||
Patch3: star-1.5.2-bufferoverflow.patch
|
||||
|
||||
# Fix some invalid manpage references (#624612)
|
||||
Patch4: star-1.5.1-manpagereferences.patch
|
||||
|
||||
# do not crash when xattrs are not set on all files (#861848)
|
||||
Patch5: star-1.5.1-selinux-segfault.patch
|
||||
|
||||
# note that the H=crc format uses Sum32 algorithm, not CRC
|
||||
Patch6: star-1.5.1-crc.patch
|
||||
|
||||
# Allow rmt to access all files.
|
||||
# ~> downstream
|
||||
# ~> #968980
|
||||
Patch8: star-1.5.2-rmt-rh-access.patch
|
||||
|
||||
# Use ssh rather than rsh by default
|
||||
# ~> downstream
|
||||
# ~> related to #968980
|
||||
Patch9: star-1.5.2-use-ssh-by-default.patch
|
||||
|
||||
# Fix broken star.mk in 1.5.3 (included from all.mk)
|
||||
Patch10: star-1.5.3-star-mk.patch
|
||||
|
||||
# Fix segfault for 'pax -X' (rhbz#1175009)
|
||||
# ~> downstream
|
||||
Patch11: star-1.5.3-pax-X-option.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: libattr-devel libacl-devel libtool libselinux-devel
|
||||
BuildRequires: e2fsprogs-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.
|
||||
|
||||
%package -n spax
|
||||
Summary: Portable archive exchange
|
||||
Group: Applications/Archiving
|
||||
Requires(post): %{ALTERNATIVES}
|
||||
Requires(preun): %{ALTERNATIVES}
|
||||
|
||||
|
||||
%description -n spax
|
||||
The pax utility shall read and write archives, write lists of the members of
|
||||
archive files and copy directory hierarchies as is defined in IEEE Std 1003.1.
|
||||
|
||||
%package -n scpio
|
||||
Summary: Copy file archives in and out (LEGACY)
|
||||
Group: Applications/Archiving
|
||||
|
||||
%description -n scpio
|
||||
The scpio utility, depending on the options used: copies files to an archive
|
||||
file, extracts files from an archive file, lists files from an archive file or
|
||||
copies files from one directory tree to another.
|
||||
|
||||
%package -n rmt
|
||||
Summary: Provides certain programs with access to remote tape devices
|
||||
Group: Applications/Archiving
|
||||
# we need to be greater than the version from 'dump' package
|
||||
Epoch: 2
|
||||
|
||||
%description -n rmt
|
||||
The rmt utility provides remote access to tape devices for programs
|
||||
like dump (a filesystem backup program), restore (a program for
|
||||
restoring files from a backup), and tar (an archiving program).
|
||||
|
||||
# "desired" alternative constants
|
||||
%global ALT_NAME pax
|
||||
%global ALT_LINK %{_bindir}/pax
|
||||
%global ALT_SL1_NAME pax-man
|
||||
%global ALT_SL1_LINK %{_mandir}/man1/pax.1.gz
|
||||
|
||||
# "local" alternative constants
|
||||
%global ALT_PATH %{_bindir}/spax
|
||||
%global ALT_SL1_PATH %{_mandir}/man1/spax.1.gz
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .newMake
|
||||
%if %{WITH_SELINUX}
|
||||
%patch1 -p1 -b .selinux
|
||||
%patch2 -p1 -b .selinux
|
||||
%endif
|
||||
%patch2 -p1 -b .changewarnSegv
|
||||
%patch3 -p1 -b .namesoverflow
|
||||
%patch4 -p1 -b .references
|
||||
%patch5 -p1 -b .selinux-segfault
|
||||
%patch6 -p1 -b .crc
|
||||
%patch8 -p1 -b .rmt-access-rules
|
||||
%patch9 -p1 -b .ssh-by-default
|
||||
%patch10 -p1 -b .bug-config-1.5.3
|
||||
%patch11 -p1 -b .pax-X
|
||||
|
||||
# disable single "fat" binary
|
||||
%patch3 -p1 -b .changewarnSegv
|
||||
%patch4 -p1 -b .stdio
|
||||
%patch5 -p1 -b .namesoverflow
|
||||
%patch6 -p1 -b .references
|
||||
%patch7 -p1 -b .multivol
|
||||
%patch8 -p1 -b .selinux-segfault
|
||||
%patch9 -p1 -b .crc
|
||||
cp -a star/all.mk star/Makefile
|
||||
iconv -f iso_8859-1 -t utf-8 AN-1.5 >AN-1.5_utf8
|
||||
mv AN-1.5_utf8 AN-1.5
|
||||
iconv -f iso_8859-1 -t utf-8 star/star.4 >star/star.4_utf8
|
||||
mv star/star.4_utf8 star/star.4
|
||||
cp -a READMEs/README.linux .
|
||||
|
||||
star_recode()
|
||||
{
|
||||
for i in $@; do
|
||||
iconv -f iso_8859-1 -t utf-8 $i > .tmp_file
|
||||
mv .tmp_file $i
|
||||
done
|
||||
}
|
||||
|
||||
star_recode AN-1.5 AN-1.5.2 star/star.4
|
||||
|
||||
for PLAT in %{arm} %{power64} aarch64 %{mips} x86_64 s390 s390x sh3 sh4 sh4a sparcv9; do
|
||||
for PLAT in %{arm} x86_64 ppc64 s390 s390x sh3 sh4 sh4a sparcv9; do
|
||||
for AFILE in gcc cc; do
|
||||
[ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \
|
||||
&& ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul
|
||||
|
|
@ -132,183 +65,69 @@ for PLAT in %{arm} %{power64} aarch64 %{mips} x86_64 s390 s390x sh3 sh4 sh4a spa
|
|||
done
|
||||
|
||||
%build
|
||||
# This is config/work-around for atypical build system. Variables used are
|
||||
# docummented makefiles.5. GMAKE_NOWARN silences irritating warnings in
|
||||
# GNU/Linux ecosystem.
|
||||
%global make_flags GMAKE_NOWARN=true \\\
|
||||
RUNPATH= \\\
|
||||
LDPATH= \\\
|
||||
PARCH=%{_target_cpu} \\\
|
||||
K_ARCH=%{_target_cpu} \\\
|
||||
INS_BASE=$RPM_BUILD_ROOT%{_prefix} \\\
|
||||
INS_RBASE=$RPM_BUILD_ROOT \\\
|
||||
INSTALL='sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS)' \\\
|
||||
COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS" \\\
|
||||
LDOPTX="$RPM_LD_FLAGS" \\\
|
||||
DEFCCOM=gcc
|
||||
export MAKEPROG=gmake
|
||||
# Autoconfiscate
|
||||
(cd autoconf; AC_MACRODIR=. AWK=gawk ./autoconf)
|
||||
|
||||
# Note: disable optimalisation by COPTX='-g3 -O0' LDOPTX='-g3 -O0'
|
||||
make %{?_smp_mflags} %make_flags
|
||||
#make %{?_smp_mflags} PARCH=%{_target_cpu} CPPOPTX="-DNO_FSYNC" \
|
||||
# ~~> enable debug by COPTX='-g3 -O0' LDOPTX='-g3 -O0'
|
||||
make %{?_smp_mflags} PARCH=%{_target_cpu} \
|
||||
COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS" CC="%{__cc}" \
|
||||
K_ARCH=%{_target_cpu} \
|
||||
CONFFLAGS="%{_target_platform} --prefix=%{_prefix} \
|
||||
--exec-prefix=%{_exec_prefix} --bindir=%{_bindir} \
|
||||
--sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
|
||||
--datadir=%{_datadir} --includedir=%{_includedir} \
|
||||
--libdir=%{_libdir} --libexec=%{_libexecdir} \
|
||||
--localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} \
|
||||
--mandir=%{_mandir} --infodir=%{_infodir}" < /dev/null
|
||||
|
||||
%install
|
||||
make install -s %make_flags
|
||||
|
||||
export MAKEPROG=gmake
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man4
|
||||
%makeinstall RPM_INSTALLDIR=${RPM_BUILD_ROOT} PARCH=%{_target_cpu} K_ARCH=%{_target_cpu} < /dev/null
|
||||
rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/rmt
|
||||
mv ${RPM_BUILD_ROOT}/usr/man/man5/star.5 ${RPM_BUILD_ROOT}%{_mandir}/man4/star.4
|
||||
mv ${RPM_BUILD_ROOT}/usr/man/* ${RPM_BUILD_ROOT}%{_mandir}
|
||||
ln -s star.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/ustar.1
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
|
||||
ln -s %{_sbindir}/rmt ${RPM_BUILD_ROOT}%{_sysconfdir}/rmt
|
||||
install -p -m 644 COPYING star/README CDDL.Schily.txt AN-* \
|
||||
${RPM_BUILD_ROOT}%{_pkgdocdir}
|
||||
|
||||
# XXX Nuke unpackaged files.
|
||||
( cd ${RPM_BUILD_ROOT}
|
||||
rm -f .%{_sysconfdir}/default/rmt
|
||||
rm -f .%{_bindir}/mt
|
||||
rm -f .%{_bindir}/smt
|
||||
rm -f .%{_bindir}/tartest
|
||||
rm -f .%{_bindir}/tar
|
||||
rm -f .%{_bindir}/gnutar
|
||||
rm -f .%{_bindir}/scpio
|
||||
rm -f .%{_bindir}/star_fat
|
||||
rm -f .%{_bindir}/star_sym
|
||||
rm -f .%{_bindir}/suntar
|
||||
rm -f .%{_sysconfdir}/default/star
|
||||
rm -rf .%{_prefix}%{_sysconfdir}
|
||||
rm -rf .%{_prefix}/include
|
||||
rm -rf .%{_prefix}/lib # hard-wired intently
|
||||
rm -rf .%{_prefix}/lib
|
||||
rm -rf .%{_mandir}/man5
|
||||
rm -rf .%{_mandir}/man3
|
||||
rm -rf .%{_mandir}/man5/{makefiles,makerules}.5*
|
||||
rm -rf .%{_mandir}/man1/{tartest,gnutar,smt,mt,suntar,match}.1*
|
||||
rm -rf .%{_docdir}/star/testscripts
|
||||
rm -rf .%{_docdir}/star/TODO
|
||||
rm -rf .%{_docdir}/rmt
|
||||
rm -rf .%{_mandir}/man1/{tartest,rmt,gnutar,scpio,smt,suntar,match}.1*
|
||||
rm -rf .%{_sbindir}
|
||||
)
|
||||
|
||||
%clean
|
||||
|
||||
%global general_docs \
|
||||
%dir %{_pkgdocdir} \
|
||||
%doc %{_pkgdocdir}/COPYING \
|
||||
%doc %{_pkgdocdir}/CDDL.Schily.txt \
|
||||
|
||||
%post -n spax
|
||||
%{ALTERNATIVES} \
|
||||
--install %{ALT_LINK} %{ALT_NAME} %{ALT_PATH} 66 \
|
||||
--slave %{ALT_SL1_LINK} %{ALT_SL1_NAME} %{ALT_SL1_PATH}
|
||||
|
||||
%preun -n spax
|
||||
if [ $1 -eq 0 ]; then
|
||||
# only on pure uninstall (not upgrade)
|
||||
%{ALTERNATIVES} --remove %{ALT_NAME} %{ALT_PATH}
|
||||
fi
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files
|
||||
%doc %{_pkgdocdir}
|
||||
%defattr(-,root,root)
|
||||
%doc README AN* COPYING CDDL.Schily.txt README.SSPM STATUS.alpha TODO README.linux
|
||||
%{_bindir}/star
|
||||
%{_bindir}/ustar
|
||||
%{_mandir}/man1/star.1*
|
||||
%{_mandir}/man1/ustar.1*
|
||||
%{_mandir}/man5/star.5*
|
||||
|
||||
%files -n scpio
|
||||
%general_docs
|
||||
%doc %{_mandir}/man1/scpio.1*
|
||||
%{_bindir}/scpio
|
||||
|
||||
%files -n spax
|
||||
%general_docs
|
||||
%doc %{_mandir}/man1/spax.1*
|
||||
%{_bindir}/spax
|
||||
%ghost %verify(not md5 size mode mtime) %{ALT_LINK}
|
||||
%ghost %verify(not md5 size mode mtime) %{ALT_SL1_LINK}
|
||||
|
||||
%files -n rmt
|
||||
%general_docs
|
||||
%{_sbindir}/rmt
|
||||
%{_mandir}/man1/rmt.1*
|
||||
%config %{_sysconfdir}/default/rmt
|
||||
# This symlink is used by cpio, star, spax, scpio, .. thus it is needed. Even
|
||||
# if the cpio may be configured to use /sbin/rmt rather than /etc/rmt, star (and
|
||||
# thus spax, ..) has the lookup path hardcoded to '/etc/rmt' (it means that even
|
||||
# non rpm based systems will try to look for /etc/rmt). And - the conclusion is
|
||||
# - it does not make sense to fight against /etc/rmt symlink ATM (year 2013).
|
||||
%{_sysconfdir}/rmt
|
||||
%{_mandir}/man1/star.1*
|
||||
%{_mandir}/man1/spax.1*
|
||||
%{_mandir}/man1/ustar.1*
|
||||
%{_mandir}/man4/star.4*
|
||||
|
||||
%changelog
|
||||
* Mon Apr 09 2018 Rafael Santos <rdossant@redhat.com> - 1.5.3-12
|
||||
- Use standard Fedora linker flags (bug #1548670)
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 1.5.3-7
|
||||
- Build properly on MIPS
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Wed Dec 17 2014 Pavel Raiskup <praiskup@redhat.com> - 1.5.3-4
|
||||
- fix segfault for pax -X (#1175009)
|
||||
|
||||
* Tue Sep 16 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.3-3
|
||||
- Re-enable profiling on aarch64
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Fri Jun 27 2014 Pavel Raiskup <praiskup@redhat.com> - 1.5.3-1
|
||||
- rebase to 1.5.3
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri Jan 17 2014 Pavel Raiskup <praiskup@redhat.com> - 1.5.2-10
|
||||
- enable build for ppc64le (#1054401)
|
||||
|
||||
* Mon Jan 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.2-9
|
||||
- Temporarily disable profiling on aarch64
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Jun 20 2013 Pavel Raiskup <praiskup@redhat.com> - 1.5.2-7
|
||||
- we should provide /etc/rmt symlink for a while (related to #968980)
|
||||
- use the ssh as the default remote access method
|
||||
|
||||
* Thu May 30 2013 Pavel Raiskup <praiskup@redhat.com> - 1.5.2-6
|
||||
- subpackage also 'rmt' (#968980)
|
||||
|
||||
* Fri May 24 2013 Pavel Raiskup <praiskup@redhat.com> - 1.5.2-5
|
||||
- add missing ghost files (#960007)
|
||||
- fix the upgrade path, sorry for the noise (#959917, #960007)
|
||||
|
||||
* Mon May 06 2013 Pavel Raiskup <praiskup@redhat.com> - 1.5.2-2
|
||||
- package spax and scpio separately (#959917)
|
||||
- fedora-review fixes, unapplied patch
|
||||
- make the spax to be pax alternative (#960007)
|
||||
|
||||
* Wed Apr 10 2013 Pavel Raiskup <praiskup@redhat.com> - 1.5.2-1
|
||||
- rebase to most up2date upstream tarball, remove patches already upstream, fix
|
||||
code movements in patches (#928758)
|
||||
- fix man-page-day objections (private #948866)
|
||||
- fix the build for aarch64 (#926571)
|
||||
|
||||
* Thu Mar 21 2013 Pavel Raiskup <praiskup@redhat.com> - 1.5.1-12
|
||||
- package also the 'scpio' utility (#771926)
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Thu Oct 18 2012 Pavel Raiskup <praiskup@redhat.com> - 1.5.1-10
|
||||
- do not crash during extracting if extended attributes are not set on all
|
||||
archived files (#861848)
|
||||
|
|
|
|||
Loading…
Reference in New Issue