diff --git a/iconv-name.diff b/iconv-name.diff index a959a8b..dd977d0 100644 --- a/iconv-name.diff +++ b/iconv-name.diff @@ -16,11 +16,11 @@ table. mkisofs/mkisofs.c | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) -Index: schily-2018-03-16/mkisofs/mkisofs.8 +Index: schily-2019-01-22/mkisofs/mkisofs.8 =================================================================== ---- schily-2018-03-16.orig/mkisofs/mkisofs.8 -+++ schily-2018-03-16/mkisofs/mkisofs.8 -@@ -2344,8 +2344,8 @@ Input charset that defines the character +--- schily-2019-01-22.orig/mkisofs/mkisofs.8 ++++ schily-2019-01-22/mkisofs/mkisofs.8 +@@ -2414,8 +2414,8 @@ Input charset that defines the character used with the .I \-mac\-name option. @@ -31,7 +31,7 @@ Index: schily-2018-03-16/mkisofs/mkisofs.8 (Mac Roman) See .B "CHARACTER SETS -@@ -2555,7 +2555,7 @@ any of the various Apple/Unix file forma +@@ -2625,7 +2625,7 @@ any of the various Apple/Unix file forma option. See the .B HFS MACINTOSH FILE NAMES for more information. Defaults to @@ -40,7 +40,7 @@ Index: schily-2018-03-16/mkisofs/mkisofs.8 (Mac Roman). .TP .B \-output\-hfs\-charset -@@ -3070,13 +3070,12 @@ name will be used in the TRANS.TBL file, +@@ -3140,13 +3140,12 @@ name will be used in the TRANS.TBL file, .PP The character set used to convert any HFS file name to a Joliet/Rock Ridge file name defaults to @@ -57,10 +57,10 @@ Index: schily-2018-03-16/mkisofs/mkisofs.8 .PP Note: the character codes used by HFS file names taken from the various Apple/Unix formats will not be converted as they are assumed to be in the -Index: schily-2018-03-16/mkisofs/mkisofs.c +Index: schily-2019-01-22/mkisofs/mkisofs.c =================================================================== ---- schily-2018-03-16.orig/mkisofs/mkisofs.c -+++ schily-2018-03-16/mkisofs/mkisofs.c +--- schily-2019-01-22.orig/mkisofs/mkisofs.c ++++ schily-2019-01-22/mkisofs/mkisofs.c @@ -2849,7 +2849,7 @@ setcharset: #ifdef APPLE_HYB diff --git a/schily-2018-11-22.tar.bz2 b/schily-2018-11-22.tar.bz2 deleted file mode 100644 index 2ff219a..0000000 --- a/schily-2018-11-22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13cb5d9075474f0944c317fb56b3d46578f9653b64fb56815f6afa1830286d19 -size 4309542 diff --git a/schily-2019-01-22.tar.bz2 b/schily-2019-01-22.tar.bz2 new file mode 100644 index 0000000..bda3d4c --- /dev/null +++ b/schily-2019-01-22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f336b78a62136b4ac7c529b2ab75555678e6dd4f1a6ddf56074f9d1c5b7045bf +size 4273776 diff --git a/schily.changes b/schily.changes index d6b530b..8af9cf4 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Jan 24 09:08:27 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 2019.01.22 + * star: fixes for a hang and pipe reading issues + * star: The debug printing for the FIFO has been enhanced to + print more information from the FIFO control structure to + debug problems like the ones mentioned above. + * star now ignores SIGPIPE. + +------------------------------------------------------------------- +Thu Dec 6 18:38:56 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 2018.12.06 + * sccs-prs now prints the SCCS v6 initial path using the new + keyword :Gp:. + * sccs-prs now prints the SCCS v6 unified random using the new + keyword :Gr:. + * sccs: libcomobj: A parser for the SCCS v6 flags has been added. + * sccs: libcomobj: A parser for SCCS v6 global meta data has + been added. +- Package sccs. + ------------------------------------------------------------------- Sun Nov 25 16:42:28 UTC 2018 - Jan Engelhardt @@ -576,7 +599,7 @@ Mon Oct 1 11:18:20 CEST 2012 - zawel1@gmail.com ------------------------------------------------------------------- Tue Mar 27 16:14:24 UTC 2012 - davejplater@gmail.com -- Update to version 3.01a07 Fixed non position independant build of +- Update to version 3.01a07 Fixed non position independent build of cdrecord with "COPTX=-fPIE" and "LDOPTX=-pie -Wl,-pie" ------------------------------------------------------------------- diff --git a/schily.spec b/schily.spec index 49d2094..849b735 100644 --- a/schily.spec +++ b/schily.spec @@ -1,7 +1,7 @@ # # spec file for package schily # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -17,16 +17,17 @@ # grep -r define.VERSION (sometimes also noted down in schily-%rver/AN-%rver) -%global box_version 2018.11.22 +%global box_version 2019.01.22 %global cdr_version 3.02~a10 +%global sccs_version 5.09 %global smake_version 1.3 %global star_version 1.5.4 %global libfind_version 1.7 %global ved_version 1.7 -%define rver 2018-11-22 +%define rver 2019-01-22 Name: schily -Version: 2018.11.22 +Version: 2019.01.22 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 @@ -49,7 +50,6 @@ BuildRequires: libattr-devel BuildRequires: libcap-devel BuildRequires: libselinux-devel BuildRequires: libtool -BuildRequires: makedepend Conflicts: cdrkit-cdrtools-compat %description @@ -372,6 +372,18 @@ interprocess communication connection. A tape client would launch something like ssh for the actual connection, and through that, have the rmt program executed. +%package -n sccs +Summary: Source Code Control System +License: CDDL-1.0 +Group: Development/Tools/Version Control + +%description -n sccs +Source Code Control System (SCCS) is a version control system for +tracking changes in source code and other text files during the +development of a piece of software. This allows the user to retrieve +any of the previous versions of the original source code and the +changes which are stored. + %package -n smake Summary: The Schily "make" program License: CDDL-1.0 @@ -452,14 +464,14 @@ rm -fv libsiconv/shlsiconv.mk # - To enable verbosity, use with CC=cc LDCC=cc DYNLD=cc. # - Not fully parallel safe, so stick to default. # -mycf="%optflags -fno-strict-aliasing -fno-omit-frame-pointer -fPIC -finput-charset=ISO-8859-1" -gmake RUNPATH="" LINKMODE=dynamic COPTOPT="$mycf" LDOPTX="" config all +mycf="%optflags -O0 -ggdb3 -fno-strict-aliasing -fno-omit-frame-pointer -fPIC -finput-charset=ISO-8859-1" +gmake RUNPATH="" LINKMODE=dynamic COPTOPT="$mycf" LDOPTX="" SCCS_BIN_PRE="" SCCS_HELP_PRE="" config all %install b="%buildroot" # D'oh… not parallel safe -gmake GMAKE_NOWARN=true RUNPATH="" LINKMODE=dynamic \ - DESTDIR="$b" INS_BASE="%_prefix" install -j1 +gmake GMAKE_NOWARN=true RUNPATH="" LINKMODE=dynamic SCCS_BIN_PRE="" \ + SCCS_HELP_PRE="" DESTDIR="$b" INS_BASE="%_prefix" install -j1 # Fix permissions again. find "$b" "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" @@ -520,7 +532,7 @@ find "$b/usr/share/doc" -type f -name "*big*" -print -delete # deal with this another time find "$b" rm -Rfv "$b/usr/ccs" "$b/usr/xpg4" "$b/%_bindir/sccs" -rm -f \ +rm -Rfv \ $b/etc/sformat.dat \ $b/usr/bin/Cstyle \ $b/usr/bin/calc \ @@ -530,6 +542,7 @@ rm -f \ $b/usr/bin/copy \ $b/usr/bin/count \ $b/usr/bin/cstyle.js \ + $b/usr/bin/diff \ $b/usr/bin/dmake \ $b/usr/bin/hdump \ $b/usr/bin/label \ @@ -566,32 +579,26 @@ rm -f \ $b/usr/lib*/libstreamar.so \ $b/usr/lib*/libstreamar.so.1.0 \ $b/usr/lib*/svr4.make \ + $b/%_libdir/help/ \ + $b/%_libdir/diffh \ $b/usr/sbin/mountcd \ $b/usr/share/doc/packages/README \ $b/usr/share/doc/packages/libparanoia/README.interface \ $b/usr/share/doc/packages/libparanoia/README.paranoia \ $b/usr/share/doc/packages/schilyutils/dotfiles.tar.bz2 \ $b/usr/share/man/de/man1/sdd.1 \ - $b/usr/share/man/man1/admin.1 \ - $b/usr/share/man/man1/bdiff.1 \ - $b/usr/share/man/man1/bsh.1 \ $b/usr/share/man/man1/calc.1 \ $b/usr/share/man/man1/calltree.1 \ - $b/usr/share/man/man1/cdc.1 \ $b/usr/share/man/man1/change.1 \ - $b/usr/share/man/man1/comb.1 \ $b/usr/share/man/man1/compare.1 \ $b/usr/share/man/man1/copy.1 \ $b/usr/share/man/man1/count.1 \ $b/usr/share/man/man1/cpp.1 \ $b/usr/share/man/man1/cstyle.1 \ - $b/usr/share/man/man1/delta.1 \ $b/usr/share/man/man1/diff.1 \ $b/usr/share/man/man1/dmake.1 \ - $b/usr/share/man/man1/get.1 \ $b/usr/share/man/man1/gnutar.1 \ $b/usr/share/man/man1/hdump.1 \ - $b/usr/share/man/man1/help.1 \ $b/usr/share/man/man1/label.1 \ $b/usr/share/man/man1/lndir.1 \ $b/usr/share/man/man1/make.1 \ @@ -604,33 +611,7 @@ rm -f \ $b/usr/share/man/man1/p.1 \ $b/usr/share/man/man1/patch.1 \ $b/usr/share/man/man1/printf.1 \ - $b/usr/share/man/man1/prs.1 \ - $b/usr/share/man/man1/prt.1 \ $b/usr/share/man/man1/pxupgrade.1 \ - $b/usr/share/man/man1/rcs2sccs.1 \ - $b/usr/share/man/man1/rmdel.1 \ - $b/usr/share/man/man1/sact.1 \ - $b/usr/share/man/man1/sccs-admin.1 \ - $b/usr/share/man/man1/sccs-cdc.1 \ - $b/usr/share/man/man1/sccs-comb.1 \ - $b/usr/share/man/man1/sccs-cvt.1 \ - $b/usr/share/man/man1/sccs-delta.1 \ - $b/usr/share/man/man1/sccs-get.1 \ - $b/usr/share/man/man1/sccs-help.1 \ - $b/usr/share/man/man1/sccs-log.1 \ - $b/usr/share/man/man1/sccs-prs.1 \ - $b/usr/share/man/man1/sccs-prt.1 \ - $b/usr/share/man/man1/sccs-rcs2sccs.1 \ - $b/usr/share/man/man1/sccs-rmdel.1 \ - $b/usr/share/man/man1/sccs-sact.1 \ - $b/usr/share/man/man1/sccs-sccsdiff.1 \ - $b/usr/share/man/man1/sccs-unget.1 \ - $b/usr/share/man/man1/sccs-val.1 \ - $b/usr/share/man/man1/sccs.1 \ - $b/usr/share/man/man1/sccscvt.1 \ - $b/usr/share/man/man1/sccsdiff.1 \ - $b/usr/share/man/man1/sccslog.1 \ - $b/usr/share/man/man1/sccspatch.1 \ $b/usr/share/man/man1/scgcheck.1 \ $b/usr/share/man/man1/scgskeleton.1 \ $b/usr/share/man/man1/scpio.1 \ @@ -646,10 +627,6 @@ rm -f \ $b/usr/share/man/man1/termcap.1 \ $b/usr/share/man/man1/translit.1 \ $b/usr/share/man/man1/udiff.1 \ - $b/usr/share/man/man1/unget.1 \ - $b/usr/share/man/man1/val.1 \ - $b/usr/share/man/man1/vc.1 \ - $b/usr/share/man/man1/what.1 \ $b/usr/share/man/man3/getopt.3 \ $b/usr/share/man/man5/changeset.5 \ $b/usr/share/man/man5/makefiles.5 \ @@ -741,6 +718,7 @@ fi %_bindir/pbosh %_bindir/pfbsh %_bindir/pfsh +%_mandir/man1/bsh.1* %_mandir/man1/bosh.1* %_mandir/man1/jsh.1* %_mandir/man1/obosh.1* @@ -950,6 +928,65 @@ fi %_sbindir/rscsi %_mandir/man1/rscsi.1* +%files -n sccs +%_bindir/admin +%_bindir/bdiff +%_bindir/cdc +%_bindir/comb +%_bindir/delta +%_bindir/get +%_bindir/help +%_bindir/prs +%_bindir/prt +%_bindir/rcs2sccs +%_bindir/rmchg +%_bindir/rmdel +%_bindir/sact +%_bindir/sccscvt +%_bindir/sccsdiff +%_bindir/sccslog +%_bindir/unget +%_bindir/val +%_bindir/vc +%_bindir/what +%_mandir/man1/admin.1* +%_mandir/man1/bdiff.1* +%_mandir/man1/cdc.1* +%_mandir/man1/comb.1* +%_mandir/man1/delta.1* +%_mandir/man1/get.1* +%_mandir/man1/help.1* +%_mandir/man1/prs.1* +%_mandir/man1/prt.1* +%_mandir/man1/rcs2sccs.1* +%_mandir/man1/rmdel.1* +%_mandir/man1/sact.1* +%_mandir/man1/sccs-admin.1* +%_mandir/man1/sccs-cdc.1* +%_mandir/man1/sccs-comb.1* +%_mandir/man1/sccs-cvt.1* +%_mandir/man1/sccs-delta.1* +%_mandir/man1/sccs-get.1* +%_mandir/man1/sccs-help.1* +%_mandir/man1/sccs-log.1* +%_mandir/man1/sccs-prs.1* +%_mandir/man1/sccs-prt.1* +%_mandir/man1/sccs-rcs2sccs.1* +%_mandir/man1/sccs-rmdel.1* +%_mandir/man1/sccs-sact.1* +%_mandir/man1/sccs-sccsdiff.1* +%_mandir/man1/sccs-unget.1* +%_mandir/man1/sccs-val.1* +%_mandir/man1/sccs.1* +%_mandir/man1/sccscvt.1* +%_mandir/man1/sccsdiff.1* +%_mandir/man1/sccslog.1* +%_mandir/man1/sccspatch.1* +%_mandir/man1/unget.1* +%_mandir/man1/val.1* +%_mandir/man1/vc.1* +%_mandir/man1/what.1* + %files -n schily-mt %license CDDL.Schily.txt %_bindir/smt