upgrade software to v1.10
This commit is contained in:
parent
d68b535dd0
commit
4da855bf53
38
gzexe.patch
38
gzexe.patch
@ -1,38 +0,0 @@
|
|||||||
From 21cd963565a43dabd59516bd4cca5c76a614f255 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jakub Martisko <jamartis@redhat.com>
|
|
||||||
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
|
|
||||||
|
|
||||||
BIN
gzip-1.10.tar.xz
Normal file
BIN
gzip-1.10.tar.xz
Normal file
Binary file not shown.
BIN
gzip-1.9.tar.xz
BIN
gzip-1.9.tar.xz
Binary file not shown.
@ -1,37 +0,0 @@
|
|||||||
From 26c140cf5377585d38d2a13a949e109724d4d406 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
|
||||||
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
|
|
||||||
|
|
||||||
11
gzip.spec
11
gzip.spec
@ -1,15 +1,13 @@
|
|||||||
Name: gzip
|
Name: gzip
|
||||||
Version: 1.9
|
Version: 1.10
|
||||||
Release: 18
|
Release: 1
|
||||||
Summary: A data compression utility
|
Summary: A data compression utility
|
||||||
|
|
||||||
License: GPLv3+ and GFDL
|
License: GPLv3+ and GFDL
|
||||||
URL: https://www.gnu.org/software/gzip
|
URL: https://www.gnu.org/software/gzip
|
||||||
Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz
|
Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz
|
||||||
|
|
||||||
Patch0: gnulib.patch
|
Patch0: gzexe.patch
|
||||||
Patch1: gzip-fix-use-of-uninitialized-memory.patch
|
|
||||||
Patch2: gzexe.patch
|
|
||||||
Patch9000: fix-verbose-disable.patch
|
Patch9000: fix-verbose-disable.patch
|
||||||
Patch9100: performance-neoncrc32-and-prfm.patch
|
Patch9100: performance-neoncrc32-and-prfm.patch
|
||||||
|
|
||||||
@ -60,6 +58,9 @@ make check
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 24 2020 BruceGW <gyl93216@163.com> - 1.10-1
|
||||||
|
* update upstream to 1.10
|
||||||
|
|
||||||
* Fri Jan 17 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.9-18
|
* Fri Jan 17 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.9-18
|
||||||
- Type:performance improve
|
- Type:performance improve
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user