diff --git a/gzexe.patch b/gzexe.patch deleted file mode 100644 index 2af78e9..0000000 --- a/gzexe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 21cd963565a43dabd59516bd4cca5c76a614f255 Mon Sep 17 00:00:00 2001 -From: Jakub Martisko -Date: Tue, 26 Mar 2019 12:29:30 +0100 -Subject: [PATCH] Fix: the value of the skip variable in the gzexe - ---- - gzexe.in | 4 ++-- - tests/Makefile.am | 1 + - tests/gzexe | 20 ++++++++++++++++++++ - 3 files changed, 23 insertions(+), 2 deletions(-) - create mode 100755 tests/gzexe - -diff --git a/gzexe.in b/gzexe.in -index 6c61183..cffa84e 100644 ---- a/gzexe.in -+++ b/gzexe.in -@@ -145,7 +145,7 @@ for i do - if test $decomp -eq 0; then - (cat <<'EOF' && - #!/bin/sh --skip=44 -+skip=49 - - tab=' ' - nl=' -@@ -201,7 +201,7 @@ EOF - - else - # decompression -- skip=44 -+ skip=49 - skip_line=`sed -e 1d -e 2q "$file"` - case $skip_line in - skip=[0-9] | skip=[0-9][0-9] | skip=[0-9][0-9][0-9]) - --- -2.21.0 - diff --git a/gzip-1.10.tar.xz b/gzip-1.10.tar.xz new file mode 100644 index 0000000..15bf4f4 Binary files /dev/null and b/gzip-1.10.tar.xz differ diff --git a/gzip-1.9.tar.xz b/gzip-1.9.tar.xz deleted file mode 100644 index 26b7f19..0000000 Binary files a/gzip-1.9.tar.xz and /dev/null differ diff --git a/gzip-fix-use-of-uninitialized-memory.patch b/gzip-fix-use-of-uninitialized-memory.patch deleted file mode 100644 index b6b1734..0000000 --- a/gzip-fix-use-of-uninitialized-memory.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 26c140cf5377585d38d2a13a949e109724d4d406 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Fri, 30 Nov 2018 13:00:42 -0800 -Subject: [PATCH 11/23] gzip: fix use of uninitialized memory -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Hanno Böck (Bug#33501). -* NEWS: Mention this. -* inflate.c (inflate_dynamic): Return if code is invalid. -Fix by Mark Adler. -* tests/hufts: Add test case for the bug. ---- - inflate.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletion(-) - -diff --git a/inflate.c b/inflate.c -index d372685..bcafcf1 100644 ---- a/inflate.c -+++ b/inflate.c -@@ -799,6 +799,12 @@ inflate_dynamic(void) - NEEDBITS((unsigned)bl) - j = (td = tl + ((unsigned)b & m))->b; - DUMPBITS(j) -+ if (td->e == 99) -+ { -+ /* Invalid code. */ -+ huft_free (tl); -+ return 2; -+ } - j = td->v.n; - if (j < 16) /* length of code in bits (0..15) */ - ll[i++] = l = j; /* save last length in l */ --- -1.8.3.1 - diff --git a/gzip.spec b/gzip.spec index e312ebf..2404d1a 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,15 +1,13 @@ Name: gzip -Version: 1.9 -Release: 18 +Version: 1.10 +Release: 1 Summary: A data compression utility License: GPLv3+ and GFDL URL: https://www.gnu.org/software/gzip Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz -Patch0: gnulib.patch -Patch1: gzip-fix-use-of-uninitialized-memory.patch -Patch2: gzexe.patch +Patch0: gzexe.patch Patch9000: fix-verbose-disable.patch Patch9100: performance-neoncrc32-and-prfm.patch @@ -60,6 +58,9 @@ make check %{_mandir}/man1/* %changelog +* Fri Apr 24 2020 BruceGW - 1.10-1 +* update upstream to 1.10 + * Fri Jan 17 2020 openEuler Buildteam - 1.9-18 - Type:performance improve - ID:NA