diff --git a/schily-2018-05-25_star_configuration.patch b/schily-2018-05-25_star_configuration.patch index a417478..858b289 100644 --- a/schily-2018-05-25_star_configuration.patch +++ b/schily-2018-05-25_star_configuration.patch @@ -18,10 +18,10 @@ Some default values for configuration/compilation star/star.mk | 4 ++-- 11 files changed, 24 insertions(+), 28 deletions(-) -Index: schily-2018-10-30/DEFAULTS/Defaults.linux +Index: schily-2021-09-01/DEFAULTS/Defaults.linux =================================================================== ---- schily-2018-10-30.orig/DEFAULTS/Defaults.linux -+++ schily-2018-10-30/DEFAULTS/Defaults.linux +--- schily-2021-09-01.orig/DEFAULTS/Defaults.linux ++++ schily-2021-09-01/DEFAULTS/Defaults.linux @@ -26,7 +26,7 @@ DEFLINKMODE= static # If the next line is uncommented, compilation is done with minimal warnings # @@ -59,10 +59,10 @@ Index: schily-2018-10-30/DEFAULTS/Defaults.linux DEFINSMODEX= 755 DEFINSUSR= root DEFINSGRP= bin -Index: schily-2018-10-30/include/schily/schily.h +Index: schily-2021-09-01/include/schily/schily.h =================================================================== ---- schily-2018-10-30.orig/include/schily/schily.h -+++ schily-2018-10-30/include/schily/schily.h +--- schily-2021-09-01.orig/include/schily/schily.h ++++ schily-2021-09-01/include/schily/schily.h @@ -431,7 +431,7 @@ extern int _comerr __PR((FILE *, int, i #endif /* EOF */ @@ -72,10 +72,10 @@ Index: schily-2018-10-30/include/schily/schily.h /*PRINTFLIKE1*/ extern int gterror __PR((const char *, ...)) __printflike__(1, 2); -Index: schily-2018-10-30/man/Makefile +Index: schily-2021-09-01/man/Makefile =================================================================== ---- schily-2018-10-30.orig/man/Makefile -+++ schily-2018-10-30/man/Makefile +--- schily-2021-09-01.orig/man/Makefile ++++ schily-2021-09-01/man/Makefile @@ -7,7 +7,7 @@ RULESDIR= RULES include $(SRCROOT)/$(RULESDIR)/rules.top ########################################################################### @@ -85,10 +85,10 @@ Index: schily-2018-10-30/man/Makefile ########################################################################### include $(SRCROOT)/$(RULESDIR)/rules.dir -Index: schily-2018-10-30/mt/Makefile +Index: schily-2021-09-01/mt/Makefile =================================================================== ---- schily-2018-10-30.orig/mt/Makefile -+++ schily-2018-10-30/mt/Makefile +--- schily-2021-09-01.orig/mt/Makefile ++++ schily-2021-09-01/mt/Makefile @@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin @@ -97,20 +97,20 @@ Index: schily-2018-10-30/mt/Makefile +#SYMLINKS= mt CPPOPTS += -DUSE_REMOTE CPPOPTS += -DSCHILY_PRINT - -@@ -17,7 +17,7 @@ CFILES= mt.c + CPPOPTS += -DUSE_NLS # Include locale support +@@ -21,7 +21,7 @@ CFILES= mt.c # LIB_CAP is needed for Linux capability support in librmt. # - LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP) + LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP) $(LIB_INTL) -XMK_FILE= Makefile.man mt.mk1 +XMK_FILE= Makefile.man ########################################################################### include $(SRCROOT)/$(RULESDIR)/rules.cmd -Index: schily-2018-10-30/rmt/Makefile +Index: schily-2021-09-01/rmt/Makefile =================================================================== ---- schily-2018-10-30.orig/rmt/Makefile -+++ schily-2018-10-30/rmt/Makefile +--- schily-2021-09-01.orig/rmt/Makefile ++++ schily-2021-09-01/rmt/Makefile @@ -5,8 +5,8 @@ RULESDIR= RULES include $(SRCROOT)/$(RULESDIR)/rules.top ########################################################################### @@ -122,10 +122,10 @@ Index: schily-2018-10-30/rmt/Makefile CPPOPTS += -DUSE_REMOTE CPPOPTS += -DUSE_LARGEFILES CFILES= rmt.c -Index: schily-2018-10-30/rmt/Makefile.man +Index: schily-2021-09-01/rmt/Makefile.man =================================================================== ---- schily-2018-10-30.orig/rmt/Makefile.man -+++ schily-2018-10-30/rmt/Makefile.man +--- schily-2021-09-01.orig/rmt/Makefile.man ++++ schily-2021-09-01/rmt/Makefile.man @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### @@ -135,10 +135,10 @@ Index: schily-2018-10-30/rmt/Makefile.man MANSECT= $(MANSECT_CMD) MANSUFFIX= $(MANSUFF_CMD) MANFILE= rmt.1 -Index: schily-2018-10-30/rmt/rmt.1 +Index: schily-2021-09-01/rmt/rmt.1 =================================================================== ---- schily-2018-10-30.orig/rmt/rmt.1 -+++ schily-2018-10-30/rmt/rmt.1 +--- schily-2021-09-01.orig/rmt/rmt.1 ++++ schily-2021-09-01/rmt/rmt.1 @@ -17,9 +17,8 @@ .SH NAME rmt \- remote magnetic tape protocol server @@ -150,10 +150,10 @@ Index: schily-2018-10-30/rmt/rmt.1 .SH DESCRIPTION .IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server" -Index: schily-2018-10-30/rmt/rmt.dfl +Index: schily-2021-09-01/rmt/rmt.dfl =================================================================== ---- schily-2018-10-30.orig/rmt/rmt.dfl -+++ schily-2018-10-30/rmt/rmt.dfl +--- schily-2021-09-01.orig/rmt/rmt.dfl ++++ schily-2021-09-01/rmt/rmt.dfl @@ -18,15 +18,13 @@ # Each USER= entry adds the listed user to the users who may run rmt # @@ -186,10 +186,10 @@ Index: schily-2018-10-30/rmt/rmt.dfl -ACCESS=* * /dev/zero +#ACCESS=* * /dev/zero #ACCESS=* * * -Index: schily-2018-10-30/star/all.mk +Index: schily-2021-09-01/star/all.mk =================================================================== ---- schily-2018-10-30.orig/star/all.mk -+++ schily-2018-10-30/star/all.mk +--- schily-2021-09-01.orig/star/all.mk ++++ schily-2021-09-01/star/all.mk @@ -12,7 +12,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to # and copy star_fat.mk to Makefile. # @@ -199,10 +199,10 @@ Index: schily-2018-10-30/star/all.mk ########################################################################### include $(SRCROOT)/$(RULESDIR)/rules.mks -Index: schily-2018-10-30/star/pax.mk +Index: schily-2021-09-01/star/pax.mk =================================================================== ---- schily-2018-10-30.orig/star/pax.mk -+++ schily-2018-10-30/star/pax.mk +--- schily-2021-09-01.orig/star/pax.mk ++++ schily-2021-09-01/star/pax.mk @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin @@ -212,10 +212,10 @@ Index: schily-2018-10-30/star/pax.mk CPPOPTS += -D__STAR__ CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -Index: schily-2018-10-30/star/star.mk +Index: schily-2021-09-01/star/star.mk =================================================================== ---- schily-2018-10-30.orig/star/star.mk -+++ schily-2018-10-30/star/star.mk +--- schily-2021-09-01.orig/star/star.mk ++++ schily-2021-09-01/star/star.mk @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin @@ -225,7 +225,7 @@ Index: schily-2018-10-30/star/star.mk CPPOPTS += -D__STAR__ CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -@@ -38,7 +38,7 @@ HFILES= star.h starsubs.h dirtime.h xta +@@ -39,7 +39,7 @@ HFILES= star.h starsubs.h dirtime.h xta 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) diff --git a/schily-2021-08-14.tar.bz2 b/schily-2021-08-14.tar.bz2 deleted file mode 100644 index 2b11a92..0000000 --- a/schily-2021-08-14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb4e4c0ca534aa28127f7e7556c9017e059f4c7b93f6bfc33965f28091230f10 -size 4942864 diff --git a/schily-2021-09-01.tar.bz2 b/schily-2021-09-01.tar.bz2 new file mode 100644 index 0000000..e61c559 --- /dev/null +++ b/schily-2021-09-01.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d1a6a1ff73144f3933367900a4f1ebe4aed63e5bb0db4e6aa2a108bb08024b8 +size 4954006 diff --git a/schily-stksz.diff b/schily-stksz.diff deleted file mode 100644 index 3868599..0000000 --- a/schily-stksz.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Jan Engelhardt -Date: 2021-08-15 18:31:19.413482687 +0200 - -Due to VLA support in gcc, the sigsegv_stack test variable needs to be outside -of a function for the test not to generate a false positive. ---- - autoconf/configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: schily-2021-08-14/autoconf/configure -=================================================================== ---- schily-2021-08-14.orig/autoconf/configure -+++ schily-2021-08-14/autoconf/configure -@@ -6662,8 +6662,8 @@ else - #line 6663 "configure" - #include "confdefs.h" - #include --int main() { - char sigsegv_stack[SIGSTKSZ]; -+int main() { - ; return 0; } - EOF - if { { eval echo configure:6670: \"$ac_compile\" ;} 1>&5; { eval $ac_compile ;} 2>&5; }; then diff --git a/schily.changes b/schily.changes index 7f19ccb..7cdd30a 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 1 23:41:15 UTC 2021 - Jan Engelhardt + +- Update to release 2021.09.01 + * smake: The man page now better describes pattern macro + replacement. +- Drop schily-stksz.diff (resolved upstream) + ------------------------------------------------------------------- Sun Aug 15 16:01:01 UTC 2021 - Jan Engelhardt diff --git a/schily.spec b/schily.spec index dc52513..988f422 100644 --- a/schily.spec +++ b/schily.spec @@ -17,8 +17,8 @@ # grep -Pir 'define\s+VERSION|strvers' -%define rver 2021-08-14 -%global box_version 2021.08.14 +%define rver 2021-09-01 +%global box_version 2021.09.01 %global cdr_version 3.02~a10 %global sccs_version 5.09 %global smake_version 1.6 @@ -41,7 +41,6 @@ Source1: README-FIRST # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps). Patch1: iconv-name.diff Patch2: schily-2018-05-25_star_configuration.patch -Patch3: schily-stksz.diff BuildRequires: autoconf BuildRequires: fdupes BuildRequires: gcc-c++