From 24dab9d7c5dd53a15cd7536e00894d41c644096df2edaafcd97381acbad99ce3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 17 May 2018 14:42:47 +0000 Subject: [PATCH] - Update to new upstream release 2018.05.17 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=20 --- psmake-time.diff | 22 ++++++++++++++++++++++ schily-2018-05-02.tar.bz2 | 3 --- schily-2018-05-17.tar.bz2 | 3 +++ schily.changes | 21 +++++++++++++++++++++ schily.spec | 30 ++++++++++++++++++++---------- 5 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 psmake-time.diff delete mode 100644 schily-2018-05-02.tar.bz2 create mode 100644 schily-2018-05-17.tar.bz2 diff --git a/psmake-time.diff b/psmake-time.diff new file mode 100644 index 0000000..19917e9 --- /dev/null +++ b/psmake-time.diff @@ -0,0 +1,22 @@ +Fix a build error when psmake is bootstrapped via MAKE-sh: + ++ gcc -o smake make.o readfile.o parse.o update.o rules.o archconf.o job.o memory.o astoi.o astoll.o comerr.o error.o eaccess.o format.o getexecpath.o jsprintf.o jssnprintf.o saveargs.o seterrno.o strcatl.o strlcpy.o strncpy.o streql.o getargs.o geterrno.o movebytes.o fillbytes.o raisecond.o rename.o searchinpath.o uname.o file_raise.o fileopen.o fcons.o cvmod.o flag.o flush.o dat.o filewrite.o fileread.o fileseek.o niread.o niwrite.o +[ 85s] make.o: In function `gcurtime': +[ 85s] make.c:(.text+0x100f): undefined reference to `getnstimeofday' +[ 85s] collect2: error: ld returned 1 exit status + +--- + psmake/MAKE-sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: schily-2018-05-17/psmake/MAKE-sh +=================================================================== +--- schily-2018-05-17.orig/psmake/MAKE-sh ++++ schily-2018-05-17/psmake/MAKE-sh +@@ -259,4 +259,5 @@ $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINE + $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES fileseek.c + $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES niread.c + $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES niwrite.c +-$CC $LF $LDFLAGS -o smake make.$o readfile.$o parse.$o update.$o rules.$o archconf.$o job.$o memory.$o astoi.$o astoll.$o comerr.$o error.$o eaccess.$o format.$o getexecpath.$o jsprintf.$o jssnprintf.$o saveargs.$o seterrno.$o strcatl.$o strlcpy.$o strncpy.$o streql.$o getargs.$o geterrno.$o movebytes.$o fillbytes.$o raisecond.$o rename.$o searchinpath.$o uname.$o file_raise.$o fileopen.$o fcons.$o cvmod.$o flag.$o flush.$o dat.$o filewrite.$o fileread.$o fileseek.$o niread.$o niwrite.$o ++$CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES ../libschily/getnstimeofday.c ++$CC $LF $LDFLAGS -o smake make.$o readfile.$o parse.$o update.$o rules.$o archconf.$o job.$o memory.$o astoi.$o astoll.$o comerr.$o error.$o eaccess.$o format.$o getexecpath.$o jsprintf.$o jssnprintf.$o saveargs.$o seterrno.$o strcatl.$o strlcpy.$o strncpy.$o streql.$o getargs.$o geterrno.$o movebytes.$o fillbytes.$o raisecond.$o rename.$o searchinpath.$o uname.$o file_raise.$o fileopen.$o fcons.$o cvmod.$o flag.$o flush.$o dat.$o filewrite.$o fileread.$o fileseek.$o niread.$o niwrite.$o getnstimeofday.$o diff --git a/schily-2018-05-02.tar.bz2 b/schily-2018-05-02.tar.bz2 deleted file mode 100644 index f1b4050..0000000 --- a/schily-2018-05-02.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d7de8c7bdadc91bee15e64a3c707d1b87c354adadce8779744c79daf590b061 -size 4218317 diff --git a/schily-2018-05-17.tar.bz2 b/schily-2018-05-17.tar.bz2 new file mode 100644 index 0000000..d4d4ab5 --- /dev/null +++ b/schily-2018-05-17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e3bebf2cf1b5dce385496bf5140edb4450cf086c9bfb4cff6f832a7bd0e94a3 +size 4225066 diff --git a/schily.changes b/schily.changes index df24bd9..ba9b1a5 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu May 17 14:06:18 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 2018.05.17 + * smake: Now using TYPE_MAXVAL(time_t) in gnewtime() instead of + the method from 1996, to work around a problem with gcc-8.1 + and clang-6.0. + * mkisofs: The link count computation did incorrectly count all + directory entries for large (multi extent) files. This + resulted in a link count that was "real number" + (sizeof + file / 2GB) + * mkisofs: File meta data for UDF directories that refer to a + Rock Ridge relocated directory had been emitted as all + zeroes. + * star: nanosecond timestamp support + * libfind: nanosecond timestamp support + * star: Added a new archive format "epax". This is the same as + "pax", but it always includes a POSIX.1-2001 extended header + with timestamps with nanosecond resolution. +- Add psmake-time.diff + ------------------------------------------------------------------- Wed May 16 22:12:34 UTC 2018 - jengelh@inai.de diff --git a/schily.spec b/schily.spec index 263bc68..08a78e5 100644 --- a/schily.spec +++ b/schily.spec @@ -16,12 +16,14 @@ # -%global box_version 2018.05.02 -%global cdr_version 3.02~a09 -%define rver 2018-05-02 +%global box_version 2018.05.17 +%global cdr_version 3.02~a10 +%global smake_version 1.3 +%global star_version 1.5.4 +%define rver 2018-05-17 Name: schily -Version: 2018.05.02 +Version: 2018.05.17 Release: 0 Summary: A collection of command-line utilities maintained by J.Schilling License: CDDL-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND HPND AND ISC @@ -33,6 +35,7 @@ Source: https://downloads.sf.net/schilytools/%name-%rver.tar.bz2 Patch1: gcc48wa.diff Patch2: iconv-name.diff Patch3: gccwarns.diff +Patch4: psmake-time.diff # Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps). BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -368,7 +371,9 @@ connection, and through that, have the rmt program executed. Summary: Portable Archive Exchange License: CDDL-1.0 Group: Productivity/Archiving/Backup -Requires: star = %box_version +Version: %star_version +Release: 0 +Requires: star = %star_version Provides: pax = 3.5 Obsoletes: pax < 3.5 @@ -380,6 +385,8 @@ basically tar, but with additional extended attributes. Summary: tar implementation compliant to POSIX.1-2001 License: CDDL-1.0 Group: Productivity/Archiving/Backup +Version: %star_version +Release: 0 %description -n star Star is a tar-like archiver (tar standing for Tape ARchiver). @@ -396,7 +403,7 @@ Features: %prep %setup -qn %name-%rver -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" %build @@ -410,9 +417,9 @@ rm -fv libshedit/shlshedit.mk # Static link libsiconv. It forwards to glibc iconv for supported charsets. rm -fv libsiconv/shlsiconv.mk -pushd psmake/ -CFLAGS="%optflags -D_FILE_OFFSET_BITS=64" sh MAKE-sh -popd +#pushd psmake/ +#CFLAGS="%optflags" sh MAKE-sh +#popd # (this is a noninteractive build; nobody will read the warnings # or care about the pause, so use GMAKE_NOWARN.) @@ -421,7 +428,7 @@ popd # # Not fully parallel safe, so stick to default. # -mycf="%optflags -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing -fno-omit-frame-pointer -fPIC -finput-charset=ISO-8859-1" +mycf="%optflags -fno-strict-aliasing -fno-omit-frame-pointer -fPIC -finput-charset=ISO-8859-1" gmake RUNPATH="" LINKMODE=dynamic COPTOPT="$mycf" LDOPTX="" rm -fv cdrecord/OBJ/*/cdrecord cdda2wav/OBJ/*/cdda2wav readcd/OBJ/*/readcd gmake RUNPATH="" LINKMODE=dynamic COPTOPT="$mycf -fPIE" LDOPTX=-pie @@ -466,7 +473,10 @@ rm -Rfv "$b/%_datadir/lib/siconv" # spax/star ln -sfv spax "$b/%_bindir/pax" rm -fv "$b/%_bindir/tar" "$b/%_bindir/gnutar" + +# mt/rmt rm -fv "$b/%_bindir/mt" # handled up u-a +ls -l "$b/%_mandir"/man*/*mt* mv "$b/%_mandir/man1/mt.1" "$b/%_mandir/man1/smt.1" mv "$b/%_sbindir/rmt" "$b/%_sbindir/srmt" # make room for u-a mv "$b/%_mandir/man1/rmt.1" "$b/%_mandir/man1/srmt.1"