From 8ed73825ba7d62d8a1704b570cc85030690dc71e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 31 Jan 2024 06:35:56 +0100 Subject: Adding upstream version 1.13. Signed-off-by: Daniel Baumann --- ChangeLog | 11 +++++------ INSTALL | 2 +- README | 2 +- arg_parser.cc | 2 +- arg_parser.h | 2 +- configure | 6 +++--- doc/zcat.1 | 4 ++-- doc/zcmp.1 | 4 ++-- doc/zdiff.1 | 4 ++-- doc/zgrep.1 | 4 ++-- doc/ztest.1 | 4 ++-- doc/zupdate.1 | 4 ++-- doc/zutils.info | 34 +++++++++++++++++----------------- doc/zutils.texi | 6 +++--- rc.cc | 4 ++-- rc.h | 2 +- recursive.cc | 2 +- testsuite/check.sh | 2 +- zcat.cc | 2 +- zcatgrep.cc | 2 +- zcmp.cc | 2 +- zcmpdiff.cc | 2 +- zdiff.cc | 2 +- zgrep.cc | 2 +- ztest.cc | 2 +- zupdate.cc | 2 +- zutils.cc | 4 ++-- zutils.h | 2 +- 28 files changed, 60 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05db9f6..459ca03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -2023-12-31 Antonio Diaz Diaz +2024-01-23 Antonio Diaz Diaz - * Version 1.13-rc1 released. + * Version 1.13 released. * zutils.cc (test_format): Fix detection of bzip2 with no blocks. * rc.h (format_order): Put fmt_gz before fmt_bz2. * zcmpdiff.cc (open_other_instream): Try also other compressed formats. @@ -231,8 +231,7 @@ * Version 0.1 released. -Copyright (C) 2009-2023 Antonio Diaz Diaz. +Copyright (C) 2009-2024 Antonio Diaz Diaz. -This file is a collection of facts, and thus it is not copyrightable, -but just in case, you have unlimited permission to copy, distribute, and -modify it. +This file is a collection of facts, and thus it is not copyrightable, but just +in case, you have unlimited permission to copy, distribute, and modify it. diff --git a/INSTALL b/INSTALL index c6dc16b..70e2568 100644 --- a/INSTALL +++ b/INSTALL @@ -77,7 +77,7 @@ After running 'configure', you can run 'make' and 'make install' as explained above. -Copyright (C) 2009-2023 Antonio Diaz Diaz. +Copyright (C) 2009-2024 Antonio Diaz Diaz. This file is free documentation: you have unlimited permission to copy, distribute, and modify it. diff --git a/README b/README index d734e0c..c9043c3 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ been compressed. Decompressed is used to refer to data which have undergone the process of decompression. -Copyright (C) 2009-2023 Antonio Diaz Diaz. +Copyright (C) 2009-2024 Antonio Diaz Diaz. This file is free documentation: you have unlimited permission to copy, distribute, and modify it. diff --git a/arg_parser.cc b/arg_parser.cc index 766abe0..0c04d8e 100644 --- a/arg_parser.cc +++ b/arg_parser.cc @@ -1,5 +1,5 @@ /* Arg_parser - POSIX/GNU command-line argument parser. (C++ version) - Copyright (C) 2006-2023 Antonio Diaz Diaz. + Copyright (C) 2006-2024 Antonio Diaz Diaz. This library is free software. Redistribution and use in source and binary forms, with or without modification, are permitted provided diff --git a/arg_parser.h b/arg_parser.h index a24ffd1..1eeec9a 100644 --- a/arg_parser.h +++ b/arg_parser.h @@ -1,5 +1,5 @@ /* Arg_parser - POSIX/GNU command-line argument parser. (C++ version) - Copyright (C) 2006-2023 Antonio Diaz Diaz. + Copyright (C) 2006-2024 Antonio Diaz Diaz. This library is free software. Redistribution and use in source and binary forms, with or without modification, are permitted provided diff --git a/configure b/configure index d3f25fd..6bf4999 100755 --- a/configure +++ b/configure @@ -1,12 +1,12 @@ #! /bin/sh # configure script for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009-2023 Antonio Diaz Diaz. +# Copyright (C) 2009-2024 Antonio Diaz Diaz. # # This configure script is free software: you have unlimited permission # to copy, distribute, and modify it. pkgname=zutils -pkgversion=1.13-rc1 +pkgversion=1.13 srctrigger=doc/${pkgname}.texi # clear some things potentially inherited from environment. @@ -183,7 +183,7 @@ echo "GREP = ${GREP}" rm -f Makefile cat > Makefile << EOF # Makefile for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009-2023 Antonio Diaz Diaz. +# Copyright (C) 2009-2024 Antonio Diaz Diaz. # This file was generated automatically by configure. Don't edit. # # This Makefile is free software: you have unlimited permission diff --git a/doc/zcat.1 b/doc/zcat.1 index 97701f2..a27254b 100644 --- a/doc/zcat.1 +++ b/doc/zcat.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH ZCAT "1" "December 2023" "zutils 1.13-rc1" "User Commands" +.TH ZCAT "1" "January 2024" "zutils 1.13" "User Commands" .SH NAME zcat \- decompress and concatenate files to standard output .SH SYNOPSIS @@ -102,7 +102,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2023 Antonio Diaz Diaz. +Copyright \(co 2024 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. diff --git a/doc/zcmp.1 b/doc/zcmp.1 index ea9ce7b..09af2a5 100644 --- a/doc/zcmp.1 +++ b/doc/zcmp.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH ZCMP "1" "December 2023" "zutils 1.13-rc1" "User Commands" +.TH ZCMP "1" "January 2024" "zutils 1.13" "User Commands" .SH NAME zcmp \- decompress and compare two files byte by byte .SH SYNOPSIS @@ -89,7 +89,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2023 Antonio Diaz Diaz. +Copyright \(co 2024 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. diff --git a/doc/zdiff.1 b/doc/zdiff.1 index c169de1..bbcdc94 100644 --- a/doc/zdiff.1 +++ b/doc/zdiff.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH ZDIFF "1" "December 2023" "zutils 1.13-rc1" "User Commands" +.TH ZDIFF "1" "January 2024" "zutils 1.13" "User Commands" .SH NAME zdiff \- decompress and compare two files line by line .SH SYNOPSIS @@ -120,7 +120,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2023 Antonio Diaz Diaz. +Copyright \(co 2024 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. diff --git a/doc/zgrep.1 b/doc/zgrep.1 index dd5699f..605f1cb 100644 --- a/doc/zgrep.1 +++ b/doc/zgrep.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH ZGREP "1" "December 2023" "zutils 1.13-rc1" "User Commands" +.TH ZGREP "1" "January 2024" "zutils 1.13" "User Commands" .SH NAME zgrep \- search compressed files for a regular expression .SH SYNOPSIS @@ -175,7 +175,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2023 Antonio Diaz Diaz. +Copyright \(co 2024 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. diff --git a/doc/ztest.1 b/doc/ztest.1 index 7ecb7c5..caa0b2a 100644 --- a/doc/ztest.1 +++ b/doc/ztest.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH ZTEST "1" "December 2023" "zutils 1.13-rc1" "User Commands" +.TH ZTEST "1" "January 2024" "zutils 1.13" "User Commands" .SH NAME ztest \- check the integrity of compressed files .SH SYNOPSIS @@ -83,7 +83,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2023 Antonio Diaz Diaz. +Copyright \(co 2024 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. diff --git a/doc/zupdate.1 b/doc/zupdate.1 index c45b2bd..c50a2df 100644 --- a/doc/zupdate.1 +++ b/doc/zupdate.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH ZUPDATE "1" "December 2023" "zutils 1.13-rc1" "User Commands" +.TH ZUPDATE "1" "January 2024" "zutils 1.13" "User Commands" .SH NAME zupdate \- recompress bzip2, gzip, xz, zstd files to lzip format .SH SYNOPSIS @@ -103,7 +103,7 @@ Report bugs to zutils\-bug@nongnu.org .br Zutils home page: http://www.nongnu.org/zutils/zutils.html .SH COPYRIGHT -Copyright \(co 2023 Antonio Diaz Diaz. +Copyright \(co 2024 Antonio Diaz Diaz. License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. diff --git a/doc/zutils.info b/doc/zutils.info index 78e5996..d7f9cb4 100644 --- a/doc/zutils.info +++ b/doc/zutils.info @@ -11,7 +11,7 @@ File: zutils.info, Node: Top, Next: Introduction, Up: (dir) Zutils Manual ************* -This manual is for Zutils (version 1.13-rc1, 31 December 2023). +This manual is for Zutils (version 1.13, 23 January 2024). * Menu: @@ -28,7 +28,7 @@ This manual is for Zutils (version 1.13-rc1, 31 December 2023). * Concept index:: Index of concepts - Copyright (C) 2009-2023 Antonio Diaz Diaz. + Copyright (C) 2009-2024 Antonio Diaz Diaz. This manual is free documentation: you have unlimited permission to copy, distribute, and modify it. @@ -964,21 +964,21 @@ Concept index  Tag Table: Node: Top217 -Node: Introduction1157 -Ref: search-order2309 -Node: Common options3466 -Ref: version4032 -Ref: compressor-requirements5983 -Node: Configuration7372 -Node: Zcat8405 -Node: Zcmp11144 -Node: Zdiff14412 -Node: Zgrep17495 -Node: Ztest23642 -Node: Zupdate26435 -Ref: lz-compressor31843 -Node: Problems32544 -Node: Concept index33078 +Node: Introduction1152 +Ref: search-order2304 +Node: Common options3461 +Ref: version4027 +Ref: compressor-requirements5978 +Node: Configuration7367 +Node: Zcat8400 +Node: Zcmp11139 +Node: Zdiff14407 +Node: Zgrep17490 +Node: Ztest23637 +Node: Zupdate26430 +Ref: lz-compressor31838 +Node: Problems32539 +Node: Concept index33073  End Tag Table diff --git a/doc/zutils.texi b/doc/zutils.texi index 824f5b1..1646e7d 100644 --- a/doc/zutils.texi +++ b/doc/zutils.texi @@ -6,8 +6,8 @@ @finalout @c %**end of header -@set UPDATED 31 December 2023 -@set VERSION 1.13-rc1 +@set UPDATED 23 January 2024 +@set VERSION 1.13 @dircategory Compression @direntry @@ -50,7 +50,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}). @end menu @sp 1 -Copyright @copyright{} 2009-2023 Antonio Diaz Diaz. +Copyright @copyright{} 2009-2024 Antonio Diaz Diaz. This manual is free documentation: you have unlimited permission to copy, distribute, and modify it. diff --git a/rc.cc b/rc.cc index b671200..f68ec6c 100644 --- a/rc.cc +++ b/rc.cc @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009-2023 Antonio Diaz Diaz. + Copyright (C) 2009-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ int verbosity = 0; namespace { const char * const config_file_name = "zutils.conf"; -const char * const program_year = "2023"; +const char * const program_year = "2024"; std::string compressor_names[num_formats] = { "bzip2", "gzip", "lzip", "xz", "zstd" }; // default compressor names diff --git a/rc.h b/rc.h index 2888c5a..7c4c949 100644 --- a/rc.h +++ b/rc.h @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009-2023 Antonio Diaz Diaz. + Copyright (C) 2009-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/recursive.cc b/recursive.cc index d992258..21c33c9 100644 --- a/recursive.cc +++ b/recursive.cc @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009-2023 Antonio Diaz Diaz. + Copyright (C) 2009-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/testsuite/check.sh b/testsuite/check.sh index dc6ae2c..730dfa6 100755 --- a/testsuite/check.sh +++ b/testsuite/check.sh @@ -1,6 +1,6 @@ #! /bin/sh # check script for Zutils - Utilities dealing with compressed files -# Copyright (C) 2009-2023 Antonio Diaz Diaz. +# Copyright (C) 2009-2024 Antonio Diaz Diaz. # # This script is free software: you have unlimited permission # to copy, distribute, and modify it. diff --git a/zcat.cc b/zcat.cc index 4ac2866..e055fea 100644 --- a/zcat.cc +++ b/zcat.cc @@ -1,5 +1,5 @@ /* Zcat - decompress and concatenate files to standard output - Copyright (C) 2010-2023 Antonio Diaz Diaz. + Copyright (C) 2010-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zcatgrep.cc b/zcatgrep.cc index 19e7a8d..9bbb359 100644 --- a/zcatgrep.cc +++ b/zcatgrep.cc @@ -1,5 +1,5 @@ /* Common code for zcat and zgrep - Copyright (C) 2010-2023 Antonio Diaz Diaz. + Copyright (C) 2010-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zcmp.cc b/zcmp.cc index e7e1b44..5336a13 100644 --- a/zcmp.cc +++ b/zcmp.cc @@ -1,5 +1,5 @@ /* Zcmp - decompress and compare two files byte by byte - Copyright (C) 2010-2023 Antonio Diaz Diaz. + Copyright (C) 2010-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zcmpdiff.cc b/zcmpdiff.cc index 961a32a..16e3980 100644 --- a/zcmpdiff.cc +++ b/zcmpdiff.cc @@ -1,5 +1,5 @@ /* Common code for zcmp and zdiff - Copyright (C) 2010-2023 Antonio Diaz Diaz. + Copyright (C) 2010-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zdiff.cc b/zdiff.cc index ab63df6..a601459 100644 --- a/zdiff.cc +++ b/zdiff.cc @@ -1,5 +1,5 @@ /* Zdiff - decompress and compare two files line by line - Copyright (C) 2010-2023 Antonio Diaz Diaz. + Copyright (C) 2010-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zgrep.cc b/zgrep.cc index b127158..8f4bc9d 100644 --- a/zgrep.cc +++ b/zgrep.cc @@ -1,5 +1,5 @@ /* Zgrep - search compressed files for a regular expression - Copyright (C) 2010-2023 Antonio Diaz Diaz. + Copyright (C) 2010-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/ztest.cc b/ztest.cc index 9b5dadd..5f74c20 100644 --- a/ztest.cc +++ b/ztest.cc @@ -1,5 +1,5 @@ /* Ztest - check the integrity of compressed files - Copyright (C) 2010-2023 Antonio Diaz Diaz. + Copyright (C) 2010-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zupdate.cc b/zupdate.cc index 15d91d6..64ca0d3 100644 --- a/zupdate.cc +++ b/zupdate.cc @@ -1,5 +1,5 @@ /* Zupdate - recompress bzip2, gzip, xz, zstd files to lzip format - Copyright (C) 2013-2023 Antonio Diaz Diaz. + Copyright (C) 2013-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zutils.cc b/zutils.cc index 14fe6c3..2509d10 100644 --- a/zutils.cc +++ b/zutils.cc @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009-2023 Antonio Diaz Diaz. + Copyright (C) 2009-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -244,7 +244,7 @@ bool set_data_feeder( const std::string & filename, int * const infdp, } -// Return format_index, or -1 if uncompressed or shorter than magic_buf_size. +// Return format_index, or -1 if uncompressed or read error. // int test_format( const int infd, uint8_t magic_data[], int * const magic_sizep ) diff --git a/zutils.h b/zutils.h index b2e2c45..270ae57 100644 --- a/zutils.h +++ b/zutils.h @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009-2023 Antonio Diaz Diaz. + Copyright (C) 2009-2024 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit v1.2.3