Hello community, here is the log from the commit of package star for openSUSE:Factory checked in at 2017-05-17 10:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/star (Old) and /work/SRC/openSUSE:Factory/.star.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "star" Wed May 17 10:44:52 2017 rev:33 rq:482956 version:1.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/star/star.changes 2016-12-26 21:43:34.939064173 +0100 +++ /work/SRC/openSUSE:Factory/.star.new/star.changes 2017-05-17 10:44:57.266165776 +0200 @@ -1,0 +2,13 @@ +Mon Mar 27 11:47:29 UTC 2017 - [email protected] + +- Conform with packaging guidelines for update alternatives + +------------------------------------------------------------------- +Tue Mar 14 08:57:07 UTC 2017 - [email protected] + +- Disable building extra binaries +- Alternatives system for mt and rmt +- Separated subpackage for mt and rmt +- Move rmt to /usr/bin/ + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ star.spec ++++++ --- /var/tmp/diff_new_pack.5l4OX1/_old 2017-05-17 10:44:58.130044254 +0200 +++ /var/tmp/diff_new_pack.5l4OX1/_new 2017-05-17 10:44:58.134043691 +0200 @@ -1,7 +1,7 @@ # # spec file for package star # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,42 +55,48 @@ BuildRequires: libattr-devel BuildRequires: libselinux-devel BuildRequires: libtool -Provides: rmt +Recommends: %{name}-rmt = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package -n spax -Summary: Portable archive exchange -Group: Productivity/Archiving/Backup -Requires: star = %{version} -Provides: pax = 3.5 -Obsoletes: pax < 3.5 - %description Star is a tar like archiver. TAR stands for Tape ARchiver. Star is the fastest known implementation of a tar archiver. Features: - - FIFO to keep the tape streaming. - - remote tape support. - - accurate sparse files (if the OS supports it). - - pattern matcher to archive and extract a subset of files. - -- user tailorable interface for comparing tar archives against file - trees. - +- user tailorable interface for comparing tar archives against file trees. - path names up to 1024 Bytes may be archived. - - stores and restores all 3 file times (even creation time). With POSIX.1-2001 the times are in nanosecond granularity. +%package -n spax +Summary: Portable archive exchange +Group: Productivity/Archiving/Backup +Requires: %{name} = %{version} +Provides: pax = 3.5 +Obsoletes: pax < 3.5 + %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 rmt +Summary: Magnetic tape control and server +Group: Productivity/Archiving/Backup +Requires(post): update-alternatives +Requires(postun): update-alternatives +Provides: mt +Provides: rmt + +%description rmt +The rmt is a program used by programs like star and ufsdump +that like to access remote magnetic tape drives and files +through an interprocess communication connection. This package +contain also mt program for local or remote tape control. + %prep %setup -q -T -b 2 -n tests -b 0 -n star-%{version} %patch0 -p1 @@ -108,7 +114,7 @@ cp %{SOURCE1} . -for PLAT in aarch64 %arm ppc ppc64 ppc64le x86_64 s390 s390x; do +for PLAT in aarch64 %{arm} ppc ppc64 ppc64le x86_64 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 @@ -117,10 +123,12 @@ # disable single "fat" binary cp -a star/all.mk star/Makefile +# do not ship these +rm TARGETS/{25include,55star_sym} %build # x86 is special -%ifarch %ix86 +%ifarch %{ix86} FLAGS="`echo %{optflags} | sed -e 's/\-fomit-frame-pointer//g'`" %else FLAGS="%{optflags}" @@ -135,42 +143,24 @@ LDPATH= \\\ PARCH=%{_target_cpu} \\\ K_ARCH=%{_target_cpu} \\\ - INS_BASE=%{buildroot}%{_prefix} \\\ - INS_RBASE=%{buildroot} \\\ INSTALL='sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS)' \\\ COPTX="$FLAGS -DTRY_EXT2_FS" \\\ DEFCCOM=gcc MAKEPROG=gmake MANDIR=man -cp %{SOURCE1} . make %{?_smp_mflags} %{make_flags} %install -# we need to create all these directories -install -d %{buildroot}/sbin -install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_sysconfdir}/default -install -d %{buildroot}%{_docdir}/star -install -d %{buildroot}%{_docdir}/rmt -install -d %{buildroot}%{_datadir}/share/man/man1/ - -make %{make_flags} install %{?_smp_mflags} - -install -m 644 rmt/rmt.dfl %{buildroot}%{_sysconfdir}/default/rmt -install -m 644 star/star.dfl %{buildroot}%{_sysconfdir}/default/star -mv %{buildroot}%{_sbindir}/rmt %{buildroot}/sbin -# lot of tools assume this location -ln -sf ../sbin/rmt %{buildroot}%{_sysconfdir}/rmt -ln -sf ./star %{buildroot}%{_bindir}/ustar -# Create compatibilty link for LSB. -ln -sf spax %{buildroot}%{_bindir}/pax +make %{make_flags} INS_BASE=%{buildroot}%{_prefix} INS_RBASE=%{buildroot} install + # Install docu -install AN* PORTING README Changelog CDDL.Schily.txt CDDL.Sun.txt README.* TODO %{buildroot}/%{_docdir}/star/ -mv %{buildroot}%{_datadir}/doc/rmt/* %{buildroot}/%{_docdir}/rmt -# do not ship these -rm -f %{buildroot}%{_bindir}/tar -rm -rf %{buildroot}/%{_prefix}/{lib,include,bin/mt} \ - %{buildroot}%{_mandir}/man[35] \ - %{buildroot}%{_mandir}/man1/{gnutar,scpio,smt,suntar,mt}.1 \ - %{buildroot}%{_bindir}/{gnutar,scpio,suntar,star_sym} +install -D -m 644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}-rmt +install -D -m 644 -t %{buildroot}%{_docdir}/star AN* CDDL* README Changelog + +# Alternatives system for rmt & mt +install -d %{buildroot}%{_sysconfdir}/alternatives +ln -sf %{_sysconfdir}/alternatives/rmt %{buildroot}%{_bindir}/rmt +ln -sf %{_sysconfdir}/alternatives/rmt.1%{ext_man} %{buildroot}%{_mandir}/man1/rmt.1%{ext_man} +ln -sf %{_sysconfdir}/alternatives/mt %{buildroot}%{_bindir}/mt +ln -sf %{_sysconfdir}/alternatives/mt.1%{ext_man} %{buildroot}%{_mandir}/man1/mt.1%{ext_man} %check cd %{_builddir}/tests @@ -178,31 +168,52 @@ # FAILS: 36 commands (30 passed, 6 failed) make %{?_smp_mflags} || : +%post rmt +%{_sbindir}/update-alternatives --force \ + --install %{_bindir}/rmt rmt %{_bindir}/srmt 30 \ + --slave %{_mandir}/man1/rmt.1%{ext_man} rmt.1%{ext_man} %{_mandir}/man1/srmt.1%{ext_man} +%{_sbindir}/update-alternatives --force \ + --install %{_bindir}/mt mt %{_bindir}/smt 10 \ + --slave %{_mandir}/man1/mt.1%{ext_man} mt.1%{ext_man} %{_mandir}/man1/smt.1%{ext_man} + +%postun rmt +if [ ! -f %{_bindir}/srmt ] ; then + %{_sbindir}/update-alternatives --remove rmt %{_bindir}/srmt + %{_sbindir}/update-alternatives --remove mt %{_bindir}/smt +fi + %files %defattr(-, root, root) -%dir %{_docdir}/star -%docdir %{_docdir}/star -%attr(644,root,root) %{_docdir}/star/* -%dir %{_docdir}/rmt -%docdir %{_docdir}/rmt -%attr(644,root,root) %{_docdir}/rmt/* -%config(noreplace) %attr(644, root, root) %{_sysconfdir}/default/rmt -%config(noreplace) %attr(644, root, root) %{_sysconfdir}/default/star -%{_bindir}/smt +%{_docdir}/%{name} +%config(noreplace) %{_sysconfdir}/default/star %{_bindir}/star %{_bindir}/tartest %{_bindir}/ustar -/sbin/rmt -%{_sysconfdir}/rmt -%{_mandir}/man1/match.1.gz -%{_mandir}/man1/rmt.1.gz -%{_mandir}/man1/star.1.gz -%{_mandir}/man1/tartest.1.gz +%{_mandir}/man1/match.1%{ext_man} +%{_mandir}/man1/star.1%{ext_man} +%{_mandir}/man1/tartest.1%{ext_man} %files -n spax %defattr(-, root, root) -%{_mandir}/man1/spax.1* +%{_mandir}/man1/spax.1%{ext_man} %{_bindir}/pax %{_bindir}/spax +%files rmt +%defattr(-, root, root) +%{_docdir}/%{name}-rmt +%config(noreplace) %{_sysconfdir}/default/rmt +%{_mandir}/man1/srmt.1%{ext_man} +%{_mandir}/man1/smt.1%{ext_man} +%{_bindir}/srmt +%{_bindir}/smt +%ghost %{_bindir}/rmt +%ghost %{_bindir}/mt +%ghost %{_mandir}/man1/rmt.1%{ext_man} +%ghost %{_mandir}/man1/mt.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/rmt +%ghost %{_sysconfdir}/alternatives/mt +%ghost %{_sysconfdir}/alternatives/rmt.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/mt.1%{ext_man} + %changelog ++++++ star-1.5.3-star-mk.patch ++++++ --- /var/tmp/diff_new_pack.5l4OX1/_old 2017-05-17 10:44:58.222031314 +0200 +++ /var/tmp/diff_new_pack.5l4OX1/_new 2017-05-17 10:44:58.226030751 +0200 @@ -1,8 +1,8 @@ -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 \ +Index: star-1.5.3/star/star.mk +=================================================================== +--- star-1.5.3.orig/star/star.mk ++++ star-1.5.3/star/star.mk +@@ -32,11 +32,11 @@ CFILES= star.c header.c cpiohdr.c xhead subst.c volhdr.c \ chdir.c match.c defaults.c dumpdate.c \ fifo.c device.c checkerr.c \ @@ -13,7 +13,7 @@ - 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 ++LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX) $(LIB_CAP) + XMK_FILE= Makefile.man ########################################################################### ++++++ star-configuration.diff ++++++ --- /var/tmp/diff_new_pack.5l4OX1/_old 2017-05-17 10:44:58.246027938 +0200 +++ /var/tmp/diff_new_pack.5l4OX1/_new 2017-05-17 10:44:58.246027938 +0200 @@ -67,7 +67,7 @@ =================================================================== --- star-1.5.3.orig/RULES/rules.inc +++ star-1.5.3/RULES/rules.inc -@@ -48,8 +48,8 @@ $(PTARGETCX): $(OFILES) $(SRCLIBS) +@@ -48,13 +48,13 @@ $(PTARGETCX): $(OFILES) $(SRCLIBS) # $(PTARGET): $(OINCSDIR) $(PTARGETCX) @echo " ==> GENERATING include file \"$@\""; \ @@ -78,6 +78,12 @@ ########################################################################### include $(SRCROOT)/$(RULESDIR)/sub.htm + include $(SRCROOT)/$(RULESDIR)/rules.clr +-include $(SRCROOT)/$(RULESDIR)/rules.ins ++#include $(SRCROOT)/$(RULESDIR)/rules.ins + include $(SRCROOT)/$(RULESDIR)/rules.tag + include $(SRCROOT)/$(RULESDIR)/rules.hlp + include $(SRCROOT)/$(RULESDIR)/rules.dep Index: star-1.5.3/RULES/rules.prg =================================================================== --- star-1.5.3.orig/RULES/rules.prg @@ -117,15 +123,27 @@ CPPOPTS += -DUSE_REMOTE CPPOPTS += -DSCHILY_PRINT +@@ -17,7 +17,7 @@ CFILES= mt.c + # LIB_CAP is needed for Linux capability support in librmt. + # + LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP) +-XMK_FILE= Makefile.man mt.mk1 ++XMK_FILE= Makefile.man + + ########################################################################### + include $(SRCROOT)/$(RULESDIR)/rules.cmd Index: star-1.5.3/rmt/rmt.1 =================================================================== --- star-1.5.3.orig/rmt/rmt.1 +++ star-1.5.3/rmt/rmt.1 -@@ -20,6 +20,7 @@ rmt \- remote magnetic tape protocol ser - .B /opt/schily/sbin/rmt +@@ -17,9 +17,8 @@ + .SH NAME + rmt \- remote magnetic tape protocol server + .SH SYNOPSIS +-.B /opt/schily/sbin/rmt .br - .B /etc/rmt -+.B /sbin/rmt +-.B /etc/rmt ++.B /usr/bin/rmt .SH DESCRIPTION .IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server" @@ -153,13 +171,153 @@ # # Each ACCESS= entry adds a target or group of targets to the list of visible -@@ -44,7 +42,7 @@ USER=* +@@ -43,8 +41,8 @@ USER=* + # user host file # name name # - #ACCESS=rtape sparky /dev/rmt/* +-#ACCESS=rtape sparky /dev/rmt/* -ACCESS=* * /dev/rmt/* -+#ACCESS=* * /dev/rmt/* ++#ACCESS=rtape sparky /dev/st0 ++#ACCESS=* * /dev/nst* ACCESS=* * /dev/null -ACCESS=* * /dev/zero +#ACCESS=* * /dev/zero #ACCESS=* * * +Index: star-1.5.3/rmt/Makefile +=================================================================== +--- star-1.5.3.orig/rmt/Makefile ++++ star-1.5.3/rmt/Makefile +@@ -5,8 +5,8 @@ RULESDIR= RULES + include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + +-INSDIR= sbin +-TARGET= rmt ++INSDIR= bin ++TARGET= srmt + CPPOPTS += -DUSE_REMOTE + CPPOPTS += -DUSE_LARGEFILES + CFILES= rmt.c +Index: star-1.5.3/rmt/Makefile.doc +=================================================================== +--- star-1.5.3.orig/rmt/Makefile.doc ++++ star-1.5.3/rmt/Makefile.doc +@@ -7,7 +7,7 @@ RULESDIR= RULES + include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + +-INSDIR= share/doc/rmt ++INSDIR= share/doc/packages/star-rmt + TARGET= default-rmt.sample + #XMK_FILE= Makefile.man + +Index: star-1.5.3/rmt/Makefile.man +=================================================================== +--- star-1.5.3.orig/rmt/Makefile.man ++++ star-1.5.3/rmt/Makefile.man +@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to + ########################################################################### + + MANDIR= man +-TARGETMAN= rmt ++TARGETMAN= srmt + MANSECT= $(MANSECT_CMD) + MANSUFFIX= $(MANSUFF_CMD) + MANFILE= rmt.1 +Index: star-1.5.3/star/all.mk +=================================================================== +--- star-1.5.3.orig/star/all.mk ++++ star-1.5.3/star/all.mk +@@ -12,7 +12,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to + # and copy star_fat.mk to Makefile. + # + +-MK_FILES= star.mk pax.mk suntar.mk gnutar.mk cpio.mk ++MK_FILES=star.mk pax.mk Makefile.dfl + + ########################################################################### + include $(SRCROOT)/$(RULESDIR)/rules.mks +Index: star-1.5.3/star/pax.mk +=================================================================== +--- star-1.5.3.orig/star/pax.mk ++++ star-1.5.3/star/pax.mk +@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to + + INSDIR= bin + TARGET= spax +-#SYMLINKS= ustar tar ++SYMLINKS= pax + CPPOPTS += -D__STAR__ + CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH + #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP +Index: star-1.5.3/RULES/rules.lib +=================================================================== +--- star-1.5.3.orig/RULES/rules.lib ++++ star-1.5.3/RULES/rules.lib +@@ -45,7 +45,7 @@ $(PTARGET): $(OFILES) + include $(SRCROOT)/$(RULESDIR)/sub.htm + include $(SRCROOT)/$(RULESDIR)/rules.lnt + include $(SRCROOT)/$(RULESDIR)/rules.clr +-include $(SRCROOT)/$(RULESDIR)/rules.ins ++#include $(SRCROOT)/$(RULESDIR)/rules.ins + include $(SRCROOT)/$(RULESDIR)/rules.tag + include $(SRCROOT)/$(RULESDIR)/rules.hlp + include $(SRCROOT)/$(RULESDIR)/rules.dep +Index: star-1.5.3/conf/Makefile +=================================================================== +--- star-1.5.3.orig/conf/Makefile ++++ star-1.5.3/conf/Makefile +@@ -48,7 +48,7 @@ XMK_FILE= xconfig.mk + ########################################################################### + # Now done in rules.top + #include $(SRCROOT)/$(RULESDIR)/rules.cnf +-include $(SRCROOT)/$(RULESDIR)/rules.ins ++#include $(SRCROOT)/$(RULESDIR)/rules.ins + ########################################################################### + + OTHERTARGETS= clean ibins depend rmdep \ +Index: star-1.5.3/star/star.mk +=================================================================== +--- star-1.5.3.orig/star/star.mk ++++ star-1.5.3/star/star.mk +@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to + + INSDIR= bin + TARGET= star +-SYMLINKS= ustar tar ++SYMLINKS= ustar + CPPOPTS += -D__STAR__ + CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH + #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP +@@ -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,8 +36,8 @@ 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) +-XMK_FILE= Makefile.man starformatman.mk ++LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX) ++XMK_FILE= Makefile.man + + ########################################################################### + include $(SRCROOT)/$(RULESDIR)/rules.cmd +Index: star-1.5.3/man/Makefile +=================================================================== +--- star-1.5.3.orig/man/Makefile ++++ star-1.5.3/man/Makefile +@@ -7,7 +7,7 @@ RULESDIR= RULES + include $(SRCROOT)/$(RULESDIR)/rules.top + ########################################################################### + +-DIRS= man1 man4 ++DIRS= man1 + + ########################################################################### + include $(SRCROOT)/$(RULESDIR)/rules.dir ++++++ star-selinux.patch ++++++ --- /var/tmp/diff_new_pack.5l4OX1/_old 2017-05-17 10:44:58.270024562 +0200 +++ /var/tmp/diff_new_pack.5l4OX1/_new 2017-05-17 10:44:58.274023999 +0200 @@ -149,27 +149,6 @@ /* * 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
