diff options
author | wiz <wiz@pkgsrc.org> | 2022-04-08 06:24:00 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2022-04-08 06:24:00 +0000 |
commit | 202deb9c3531f8388b88453963103bd42c76a7c5 (patch) | |
tree | edf32aa60bca5ef7000153483167bf7e59f09606 | |
parent | 543aa559fe6027db70b6055fc38f7ae4ca7d58fb (diff) | |
download | pkgsrc-202deb9c3531f8388b88453963103bd42c76a7c5.tar.gz |
gzip: update to 1.12.
* Noteworthy changes in release 1.12 (2022-04-07) [stable]
** Changes in behavior
'gzip -l' no longer misreports file lengths 4 GiB and larger.
Previously, 'gzip -l' output the 32-bit value stored in the gzip
header even though that is the uncompressed length modulo 2**32.
Now, 'gzip -l' calculates the uncompressed length by decompressing
the data and counting the resulting bytes. Although this can take
much more time, nowadays the correctness pros seem to outweigh the
performance cons.
'zless' is no longer installed on platforms lacking 'less'.
** Bug fixes
zgrep applied to a crafted file name with two or more newlines
can no longer overwrite an arbitrary, attacker-selected file.
[bug introduced in gzip-1.3.10]
zgrep now names input file on error instead of mislabeling it as
"(standard input)", if grep supports the GNU -H and --label options.
'zdiff -C 5' no longer misbehaves by treating '5' as a file name.
[bug present since the beginning]
Configure-time options like --program-prefix now work.
* Noteworthy changes in release 1.11 (2021-09-03) [stable]
** Performance improvements
IBM Z platforms now support hardware-accelerated deflation.
-rw-r--r-- | archivers/gzip/Makefile | 7 | ||||
-rw-r--r-- | archivers/gzip/distinfo | 11 | ||||
-rw-r--r-- | archivers/gzip/patches/patch-aa | 13 | ||||
-rw-r--r-- | archivers/gzip/patches/patch-ab | 30 | ||||
-rw-r--r-- | archivers/gzip/patches/patch-lib_fflush.c | 16 |
5 files changed, 6 insertions, 71 deletions
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile index 1a42d614bc0..adecc91bab6 100644 --- a/archivers/gzip/Makefile +++ b/archivers/gzip/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2020/01/18 23:29:55 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2022/04/08 06:24:00 wiz Exp $ -DISTNAME= gzip-1.10 +DISTNAME= gzip-1.12 CATEGORIES= archivers #MASTER_SITES= ${MASTER_SITE_GNU:=gzip/} #EXTRACT_SUFX= .tar.xz @@ -19,7 +19,4 @@ MAKE_FLAGS+= manlinks=so INFO_FILES= yes CHECK_PERMS= no # can't depend on checkperms; its distfile is gzipped -#bug 20453 in bug-gzip list, passed onto gnulib -CONFIGURE_ENV.AIX+= ac_cv_header_wctype_h=no - .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gzip/distinfo b/archivers/gzip/distinfo index 0daecceda4e..d6449e92cc2 100644 --- a/archivers/gzip/distinfo +++ b/archivers/gzip/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.12 2021/10/26 09:57:07 nia Exp $ +$NetBSD: distinfo,v 1.13 2022/04/08 06:24:00 wiz Exp $ -BLAKE2s (gzip-1.10.tar) = 480593a6dea69feae9d6b8622fdc442a5149f03746aa7eaabf8099e8f7a506c7 -SHA512 (gzip-1.10.tar) = fc54f62e5b1db56bde178e0019fb831af6bfad73fc346742ae830de9623e5982dbc1e5463a34fbf0b88777b53901ffbbecfba724fb3ae7d9f758c5701bb54098 -Size (gzip-1.10.tar) = 5355520 bytes -SHA1 (patch-aa) = a08b277aa95df808d055f4daf95fd1462c300290 -SHA1 (patch-ab) = 738d6e5f9300c2718694cc4134b36637b323ea8a -SHA1 (patch-lib_fflush.c) = 4012b674c04f83f2b3bffdef6107a7836ce21d8e +BLAKE2s (gzip-1.12.tar) = 1edddfdf2946083367ef0295fb2c8d191a6ddc5777f6a2c48629bd25ad8b6033 +SHA512 (gzip-1.12.tar) = 79a54c63c3442061f3e47de7bdd5bfee2d2d40d1f09b8eabbbabe96295f9eb8fc2e0dd580f6bad528fd0e7e336f6e759ddf52863c0f0da733d1a184e57fde90f +Size (gzip-1.12.tar) = 6041600 bytes diff --git a/archivers/gzip/patches/patch-aa b/archivers/gzip/patches/patch-aa deleted file mode 100644 index 282226978a7..00000000000 --- a/archivers/gzip/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2013/06/10 11:56:58 ryoon Exp $ - ---- gzip.h.orig 2012-01-01 08:53:58.000000000 +0000 -+++ gzip.h -@@ -204,6 +204,8 @@ extern int test; /* check .z f - extern int to_stdout; /* output to stdout (-c) */ - extern int save_orig_name; /* set if original name must be saved */ - -+#define MIN(a,b) ((a) <= (b) ? (a) : (b)) -+ - #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) - #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) - diff --git a/archivers/gzip/patches/patch-ab b/archivers/gzip/patches/patch-ab deleted file mode 100644 index 2809c0a6ae5..00000000000 --- a/archivers/gzip/patches/patch-ab +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2013/06/11 08:28:30 adam Exp $ - ---- unpack.c.orig 2013-02-02 04:39:13.000000000 +0000 -+++ unpack.c -@@ -21,7 +21,6 @@ - #include "tailor.h" - #include "gzip.h" - --#define MIN(a,b) ((a) <= (b) ? (a) : (b)) - /* The arguments must not have side effects. */ - - #define MAX_BITLEN 25 -@@ -157,7 +156,7 @@ local void read_tree() - /* Remember where the literals of this length start in literal[] : */ - lit_base[len] = base; - /* And read the literals: */ -- for (n = leaves[len]; n > 0; n--) { -+ for (n = leaves[len]; n > 0 && base < LITERALS; n--) { - literal[base++] = read_byte (); - } - } -@@ -193,7 +192,7 @@ local void build_tree() - prefixp = &prefix_len[1<<peek_bits]; - for (len = 1; len <= peek_bits; len++) { - int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */ -- while (prefixes--) *--prefixp = (uch)len; -+ while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len; - } - /* The length of all other codes is unknown: */ - while (prefixp > prefix_len) *--prefixp = 0; diff --git a/archivers/gzip/patches/patch-lib_fflush.c b/archivers/gzip/patches/patch-lib_fflush.c deleted file mode 100644 index e8fd9229295..00000000000 --- a/archivers/gzip/patches/patch-lib_fflush.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-lib_fflush.c,v 1.3 2019/01/10 06:47:42 gutteridge Exp $ - -Address seek function API change from circa NetBSD 6, originally -reported as PR pkg/47914. - ---- lib/fflush.c.orig 2018-06-25 04:09:24.000000000 +0000 -+++ lib/fflush.c -@@ -101,7 +101,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P - { - # if defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ --# if defined __CYGWIN__ -+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix - /* fp_->_offset is typed as an integer. */ - fp_->_offset = pos; - # else |