From adba8398de66ae2ed3e15cc71da1d1ecd2cc240ea226e773f970a7cea3b24f92 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 17 Nov 2022 17:29:57 +0000 Subject: [PATCH] - Update to release 2022.10.16 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=141 --- iconv-name.diff | 24 +++---- schily-2018-05-25_star_configuration.patch | 76 +++++++++------------- schily-2021-09-01.tar.bz2 | 3 - schily-2022-10-16.tar.bz2 | 3 + schily.changes | 10 +++ schily.spec | 17 ++--- 6 files changed, 63 insertions(+), 70 deletions(-) delete mode 100644 schily-2021-09-01.tar.bz2 create mode 100644 schily-2022-10-16.tar.bz2 diff --git a/iconv-name.diff b/iconv-name.diff index dd977d0..b0865bb 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-2019-01-22/mkisofs/mkisofs.8 +Index: schily-2022-10-16/mkisofs/mkisofs.8 =================================================================== ---- 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 +--- schily-2022-10-16.orig/mkisofs/mkisofs.8 ++++ schily-2022-10-16/mkisofs/mkisofs.8 +@@ -2500,8 +2500,8 @@ Input charset that defines the character used with the .I \-mac\-name option. @@ -30,8 +30,8 @@ Index: schily-2019-01-22/mkisofs/mkisofs.8 +.I macintosh (Mac Roman) See - .B "CHARACTER SETS -@@ -2625,7 +2625,7 @@ any of the various Apple/Unix file forma + .B "CHARACTER SETS" +@@ -2711,7 +2711,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-2019-01-22/mkisofs/mkisofs.8 (Mac Roman). .TP .B \-output\-hfs\-charset -@@ -3140,13 +3140,12 @@ name will be used in the TRANS.TBL file, +@@ -3227,13 +3227,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,11 +57,11 @@ Index: schily-2019-01-22/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-2019-01-22/mkisofs/mkisofs.c +Index: schily-2022-10-16/mkisofs/mkisofs.c =================================================================== ---- schily-2019-01-22.orig/mkisofs/mkisofs.c -+++ schily-2019-01-22/mkisofs/mkisofs.c -@@ -2849,7 +2849,7 @@ setcharset: +--- schily-2022-10-16.orig/mkisofs/mkisofs.c ++++ schily-2022-10-16/mkisofs/mkisofs.c +@@ -2888,7 +2888,7 @@ setcharset: #ifdef APPLE_HYB if (hfs_icharset == NULL || strcmp(hfs_icharset, "mac-roman") == 0) { @@ -70,7 +70,7 @@ Index: schily-2019-01-22/mkisofs/mkisofs.c } hfs_inls = sic_open(hfs_icharset); -@@ -2857,7 +2857,7 @@ setcharset: +@@ -2896,7 +2896,7 @@ setcharset: hfs_ocharset = hfs_inls ? hfs_inls->sic_name : NULL; } if (hfs_ocharset == NULL || strcmp(hfs_ocharset, "mac-roman") == 0) { diff --git a/schily-2018-05-25_star_configuration.patch b/schily-2018-05-25_star_configuration.patch index 858b289..c250cc8 100644 --- a/schily-2018-05-25_star_configuration.patch +++ b/schily-2018-05-25_star_configuration.patch @@ -7,7 +7,6 @@ Some default values for configuration/compilation --- DEFAULTS/Defaults.linux | 11 +++++------ include/schily/schily.h | 2 +- - man/Makefile | 2 +- mt/Makefile | 4 ++-- rmt/Makefile | 4 ++-- rmt/Makefile.man | 2 +- @@ -16,12 +15,12 @@ Some default values for configuration/compilation star/all.mk | 2 +- star/pax.mk | 2 +- star/star.mk | 4 ++-- - 11 files changed, 24 insertions(+), 28 deletions(-) + 10 files changed, 23 insertions(+), 27 deletions(-) -Index: schily-2021-09-01/DEFAULTS/Defaults.linux +Index: schily-2022-10-16/DEFAULTS/Defaults.linux =================================================================== ---- schily-2021-09-01.orig/DEFAULTS/Defaults.linux -+++ schily-2021-09-01/DEFAULTS/Defaults.linux +--- schily-2022-10-16.orig/DEFAULTS/Defaults.linux ++++ schily-2022-10-16/DEFAULTS/Defaults.linux @@ -26,7 +26,7 @@ DEFLINKMODE= static # If the next line is uncommented, compilation is done with minimal warnings # @@ -59,10 +58,10 @@ Index: schily-2021-09-01/DEFAULTS/Defaults.linux DEFINSMODEX= 755 DEFINSUSR= root DEFINSGRP= bin -Index: schily-2021-09-01/include/schily/schily.h +Index: schily-2022-10-16/include/schily/schily.h =================================================================== ---- schily-2021-09-01.orig/include/schily/schily.h -+++ schily-2021-09-01/include/schily/schily.h +--- schily-2022-10-16.orig/include/schily/schily.h ++++ schily-2022-10-16/include/schily/schily.h @@ -431,7 +431,7 @@ extern int _comerr __PR((FILE *, int, i #endif /* EOF */ @@ -72,23 +71,10 @@ Index: schily-2021-09-01/include/schily/schily.h /*PRINTFLIKE1*/ extern int gterror __PR((const char *, ...)) __printflike__(1, 2); -Index: schily-2021-09-01/man/Makefile +Index: schily-2022-10-16/mt/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 - ########################################################################### - --DIRS= man4 -+DIRS= man1 - - ########################################################################### - include $(SRCROOT)/$(RULESDIR)/rules.dir -Index: schily-2021-09-01/mt/Makefile -=================================================================== ---- schily-2021-09-01.orig/mt/Makefile -+++ schily-2021-09-01/mt/Makefile +--- schily-2022-10-16.orig/mt/Makefile ++++ schily-2022-10-16/mt/Makefile @@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin @@ -107,10 +93,10 @@ Index: schily-2021-09-01/mt/Makefile ########################################################################### include $(SRCROOT)/$(RULESDIR)/rules.cmd -Index: schily-2021-09-01/rmt/Makefile +Index: schily-2022-10-16/rmt/Makefile =================================================================== ---- schily-2021-09-01.orig/rmt/Makefile -+++ schily-2021-09-01/rmt/Makefile +--- schily-2022-10-16.orig/rmt/Makefile ++++ schily-2022-10-16/rmt/Makefile @@ -5,8 +5,8 @@ RULESDIR= RULES include $(SRCROOT)/$(RULESDIR)/rules.top ########################################################################### @@ -122,10 +108,10 @@ Index: schily-2021-09-01/rmt/Makefile CPPOPTS += -DUSE_REMOTE CPPOPTS += -DUSE_LARGEFILES CFILES= rmt.c -Index: schily-2021-09-01/rmt/Makefile.man +Index: schily-2022-10-16/rmt/Makefile.man =================================================================== ---- schily-2021-09-01.orig/rmt/Makefile.man -+++ schily-2021-09-01/rmt/Makefile.man +--- schily-2022-10-16.orig/rmt/Makefile.man ++++ schily-2022-10-16/rmt/Makefile.man @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### @@ -135,10 +121,10 @@ Index: schily-2021-09-01/rmt/Makefile.man MANSECT= $(MANSECT_CMD) MANSUFFIX= $(MANSUFF_CMD) MANFILE= rmt.1 -Index: schily-2021-09-01/rmt/rmt.1 +Index: schily-2022-10-16/rmt/rmt.1 =================================================================== ---- schily-2021-09-01.orig/rmt/rmt.1 -+++ schily-2021-09-01/rmt/rmt.1 +--- schily-2022-10-16.orig/rmt/rmt.1 ++++ schily-2022-10-16/rmt/rmt.1 @@ -17,9 +17,8 @@ .SH NAME rmt \- remote magnetic tape protocol server @@ -150,10 +136,10 @@ Index: schily-2021-09-01/rmt/rmt.1 .SH DESCRIPTION .IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server" -Index: schily-2021-09-01/rmt/rmt.dfl +Index: schily-2022-10-16/rmt/rmt.dfl =================================================================== ---- schily-2021-09-01.orig/rmt/rmt.dfl -+++ schily-2021-09-01/rmt/rmt.dfl +--- schily-2022-10-16.orig/rmt/rmt.dfl ++++ schily-2022-10-16/rmt/rmt.dfl @@ -18,15 +18,13 @@ # Each USER= entry adds the listed user to the users who may run rmt # @@ -186,10 +172,10 @@ Index: schily-2021-09-01/rmt/rmt.dfl -ACCESS=* * /dev/zero +#ACCESS=* * /dev/zero #ACCESS=* * * -Index: schily-2021-09-01/star/all.mk +Index: schily-2022-10-16/star/all.mk =================================================================== ---- schily-2021-09-01.orig/star/all.mk -+++ schily-2021-09-01/star/all.mk +--- schily-2022-10-16.orig/star/all.mk ++++ schily-2022-10-16/star/all.mk @@ -12,7 +12,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to # and copy star_fat.mk to Makefile. # @@ -199,10 +185,10 @@ Index: schily-2021-09-01/star/all.mk ########################################################################### include $(SRCROOT)/$(RULESDIR)/rules.mks -Index: schily-2021-09-01/star/pax.mk +Index: schily-2022-10-16/star/pax.mk =================================================================== ---- schily-2021-09-01.orig/star/pax.mk -+++ schily-2021-09-01/star/pax.mk +--- schily-2022-10-16.orig/star/pax.mk ++++ schily-2022-10-16/star/pax.mk @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin @@ -212,10 +198,10 @@ Index: schily-2021-09-01/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-2021-09-01/star/star.mk +Index: schily-2022-10-16/star/star.mk =================================================================== ---- schily-2021-09-01.orig/star/star.mk -+++ schily-2021-09-01/star/star.mk +--- schily-2022-10-16.orig/star/star.mk ++++ schily-2022-10-16/star/star.mk @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin diff --git a/schily-2021-09-01.tar.bz2 b/schily-2021-09-01.tar.bz2 deleted file mode 100644 index e61c559..0000000 --- a/schily-2021-09-01.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d1a6a1ff73144f3933367900a4f1ebe4aed63e5bb0db4e6aa2a108bb08024b8 -size 4954006 diff --git a/schily-2022-10-16.tar.bz2 b/schily-2022-10-16.tar.bz2 new file mode 100644 index 0000000..cd2f4a5 --- /dev/null +++ b/schily-2022-10-16.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce82ed7c2e634380b7db835c3c4a44db9c79a10bd8bd75b3eb8873d292484b66 +size 4864898 diff --git a/schily.changes b/schily.changes index f26243b..bbab6fc 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Nov 17 16:35:18 UTC 2022 - Jan Engelhardt + +- Update to release 2022.10.16 + * bsh: Implement ^L support + * libmdigest: Add support for BLAKE2 digests + * mkisofs: No longer warn about Joliet being nonstandard. With + the 2019 revision of ECMA 119, Joliet has been added as an + annex to the standard. + ------------------------------------------------------------------- Wed Aug 31 14:28:57 UTC 2022 - Thorsten Kukuk diff --git a/schily.spec b/schily.spec index 2256e1f..1a1ca13 100644 --- a/schily.spec +++ b/schily.spec @@ -17,8 +17,8 @@ # grep -Pir 'define\s+VERSION|strvers' -%define rver 2021-09-01 -%global box_version 2021.09.01 +%define rver 2022-10-16 +%global box_version 2022.10.16 %global cdr_version 3.02~a10 %global sccs_version 5.09 %global smake_version 1.6 @@ -29,13 +29,12 @@ Name: schily Version: %box_version Release: 0 -Summary: A collection of command-line utilities maintained by J.Schilling +Summary: A collection of command-line utilities originally written by J.Schilling License: BSD-2-Clause AND CDDL-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND BSD-3-Clause AND HPND AND ISC Group: Productivity/Multimedia/CD/Record -URL: http://cdrtools.sourceforge.net/private/cdrecord.html -#Freshcode-URL: http://freshcode.club/projects/schily +URL: https://codeberg.org/schilytools/schilytools -Source: https://downloads.sf.net/schilytools/%name-%rver.tar.bz2 +Source: http://fuz.su/pub/schilytools/%name-%rver.tar.bz2 Source1: README-FIRST # Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps). @@ -52,7 +51,7 @@ BuildRequires: libtool Conflicts: cdrkit-cdrtools-compat %description -The "Schily" Tool Box is a set of tools written or managed by Jörg Schilling. +The "Schily" Tool Box is a set of tools originally written by Jörg Schilling. %package -n bosh Summary: Multibyte-capable POSIX-conforming Bourne shell @@ -462,9 +461,7 @@ GB). %prep %autosetup -n %name-%rver -p1 - find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" - cp %{SOURCE1} . %build @@ -791,7 +788,7 @@ fi %_mandir/man1/cdda2wav.1* %files -n cdrecord -%license CDDL.Schily.txt cdrecord/COPYING +%license CDDL.Schily.txt %doc cdrecord/README* %config %_sysconfdir/default/cdrecord %verify(not mode caps) %attr(0755,root,root) %_bindir/cdrecord