commit 4cd1c817085e0492b63535ce807e26f12f398e36212d6c9c48f74359f9b3bd10 Author: Martin Pluskal Date: Mon Jan 20 11:30:30 2025 +0000 - update to 1.14: * zupdate.cc: '-r -d' now keeps last component of dir arguments. * zutils.texi: New chapter 'Syntax of command-line arguments'. * check.sh: Use 'cp' instead of 'cat'. OBS-URL: https://build.opensuse.org/package/show/Archiving/zutils?expand=0&rev=26 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/zutils-1.13.tar.lz b/zutils-1.13.tar.lz new file mode 100644 index 0000000..56fbd96 --- /dev/null +++ b/zutils-1.13.tar.lz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:957d03c6c1b6b68c94e313ff9633bf6c7e32ab50e150ab67cc244b0ccd2a4c17 +size 63316 diff --git a/zutils-1.13.tar.lz.sig b/zutils-1.13.tar.lz.sig new file mode 100644 index 0000000..d34fbc5 Binary files /dev/null and b/zutils-1.13.tar.lz.sig differ diff --git a/zutils-1.14.tar.lz b/zutils-1.14.tar.lz new file mode 100644 index 0000000..bd5c8a3 --- /dev/null +++ b/zutils-1.14.tar.lz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0225a7cbe3bdeade33ef08323d7fe7fb0c6edb1e8e0955287d50b21b7b5d989e +size 64446 diff --git a/zutils-1.14.tar.lz.sig b/zutils-1.14.tar.lz.sig new file mode 100644 index 0000000..e75ef74 Binary files /dev/null and b/zutils-1.14.tar.lz.sig differ diff --git a/zutils-1.7-noconflict.patch b/zutils-1.7-noconflict.patch new file mode 100644 index 0000000..6f060f6 --- /dev/null +++ b/zutils-1.7-noconflict.patch @@ -0,0 +1,59 @@ +From: Luigi Baldoni +Date: 2018-08-25 14:19:22 +0200 +Subject: Avoid conflict with gzip package +References: boo#1105973 + +Use zutils- prefix with executables also present in the gzip +package. + +--- +Index: zutils-1.12/Makefile.in +=================================================================== +--- zutils-1.12.orig/Makefile.in ++++ zutils-1.12/Makefile.in +@@ -126,12 +126,12 @@ install-strip-compress : install-bin-str + + install-bin : all + if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi +- $(INSTALL_PROGRAM) ./zcat "$(DESTDIR)$(bindir)/zcat" +- $(INSTALL_PROGRAM) ./zcmp "$(DESTDIR)$(bindir)/zcmp" +- $(INSTALL_PROGRAM) ./zdiff "$(DESTDIR)$(bindir)/zdiff" +- $(INSTALL_SCRIPT) ./zegrep "$(DESTDIR)$(bindir)/zegrep" +- $(INSTALL_SCRIPT) ./zfgrep "$(DESTDIR)$(bindir)/zfgrep" +- $(INSTALL_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zgrep" ++ $(INSTALL_PROGRAM) ./zcat "$(DESTDIR)$(bindir)/zutils-zcat" ++ $(INSTALL_PROGRAM) ./zcmp "$(DESTDIR)$(bindir)/zutils-zcmp" ++ $(INSTALL_PROGRAM) ./zdiff "$(DESTDIR)$(bindir)/zutils-zdiff" ++ $(INSTALL_SCRIPT) ./zegrep "$(DESTDIR)$(bindir)/zutils-zegrep" ++ $(INSTALL_SCRIPT) ./zfgrep "$(DESTDIR)$(bindir)/zutils-zfgrep" ++ $(INSTALL_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zutils-zgrep" + $(INSTALL_PROGRAM) ./ztest "$(DESTDIR)$(bindir)/ztest" + $(INSTALL_PROGRAM) ./zupdate "$(DESTDIR)$(bindir)/zupdate" + if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname).conf" ] ; then \ +@@ -161,18 +161,18 @@ install-man : + -rm -f "$(DESTDIR)$(mandir)/man1/zgrep.1"* + -rm -f "$(DESTDIR)$(mandir)/man1/ztest.1"* + -rm -f "$(DESTDIR)$(mandir)/man1/zupdate.1"* +- $(INSTALL_DATA) $(VPATH)/doc/zcat.1 "$(DESTDIR)$(mandir)/man1/zcat.1" +- $(INSTALL_DATA) $(VPATH)/doc/zcmp.1 "$(DESTDIR)$(mandir)/man1/zcmp.1" +- $(INSTALL_DATA) $(VPATH)/doc/zdiff.1 "$(DESTDIR)$(mandir)/man1/zdiff.1" +- $(INSTALL_DATA) $(VPATH)/doc/zgrep.1 "$(DESTDIR)$(mandir)/man1/zgrep.1" ++ $(INSTALL_DATA) $(VPATH)/doc/zcat.1 "$(DESTDIR)$(mandir)/man1/zutils-zcat.1" ++ $(INSTALL_DATA) $(VPATH)/doc/zcmp.1 "$(DESTDIR)$(mandir)/man1/zutils-zcmp.1" ++ $(INSTALL_DATA) $(VPATH)/doc/zdiff.1 "$(DESTDIR)$(mandir)/man1/zutils-zdiff.1" ++ $(INSTALL_DATA) $(VPATH)/doc/zgrep.1 "$(DESTDIR)$(mandir)/man1/zutils-zgrep.1" + $(INSTALL_DATA) $(VPATH)/doc/ztest.1 "$(DESTDIR)$(mandir)/man1/ztest.1" + $(INSTALL_DATA) $(VPATH)/doc/zupdate.1 "$(DESTDIR)$(mandir)/man1/zupdate.1" + + install-man-compress : install-man +- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zcat.1" +- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zcmp.1" +- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zdiff.1" +- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zgrep.1" ++ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zcat.1" ++ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zcmp.1" ++ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zdiff.1" ++ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zgrep.1" + lzip -v -9 "$(DESTDIR)$(mandir)/man1/ztest.1" + lzip -v -9 "$(DESTDIR)$(mandir)/man1/zupdate.1" + diff --git a/zutils.changes b/zutils.changes new file mode 100644 index 0000000..18bbf7d --- /dev/null +++ b/zutils.changes @@ -0,0 +1,168 @@ +------------------------------------------------------------------- +Sun Jan 19 13:32:23 UTC 2025 - Andrea Manzini + +- update to 1.14: + * zupdate.cc: '-r -d' now keeps last component of dir arguments. + * zutils.texi: New chapter 'Syntax of command-line arguments'. + * check.sh: Use 'cp' instead of 'cat'. + +------------------------------------------------------------------- +Sat Feb 10 16:37:17 UTC 2024 - Andreas Stieger + +- update to 1.13: + * Fix detection of bzip2 files with no compressed blocks + * When zcat, zcmp, zdiff, or zgrep need to try compressed file + names, gzip (.gz) is now tried before bzip2 (.bz2). + * When only one compressed file is passed to zcmp or zdiff, they + now try to compare it with a compressed file of any of the + remaining formats if the corresponding uncompressed file does + not exist. + * zcmp now reports EOF on empty file like GNU cmp: + "zcmp: EOF on FILE which is empty". + * File diagnostics in zupdate have been reformatted as + 'PROGRAM: FILE: MESSAGE'. + +------------------------------------------------------------------- +Sun Jan 22 11:39:46 UTC 2023 - Andreas Stieger + +- update to 1.12: + * 'zutilsrc' has been renamed to 'zutils.conf', and is loog for in + $XDG_CONFIG_HOME/zutils.conf instead of $HOME/.zutilsrc. + (XDG_CONFIG_HOME defaults to $HOME/.config). + * In zcat, zcmp, zdiff, and zgrep, the option '-O, --force-format' + now can force also "uncompressed" format. + * zcmp now accepts the option '-H, --hexadecimal' to print byte + values in hexadecimal instead of octal. + * zcmp: option '-s' changed to '--script' + * zcmp: '-q' has been assigned to options '--quiet' and '--silent' + * zcmp: '-q' now only suppresses diagnostic messages written to + stderr + * zcmp: '-s' now only suppresses messages about file differences + written to stdout or stderr. + * zcmp: Option '-l, --list' is now different from option '-v, + --verbose', whichnow undoes the effect of '--quiet'. + * zcmp now prints byte and line in EOF message like GNU cmp: + "zcmp: EOF on FILE after byte B, in line L". + * zgrep now also accepts the following options: + '-G, --basic-regexp', + '--label=