Accepting request 563553 from home:kbabioch:branches:Base:System
Bump to gzip version 1.9 OBS-URL: https://build.opensuse.org/request/show/563553 OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=58
This commit is contained in:
Git OBS Bridge
parent
00e4a78145
commit
ce8c81a170
@ -1,95 +0,0 @@
|
||||
From 79f88bd1e54d6042fbe50c212f836920fa208e56 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 16 Oct 2017 01:02:54 -0700
|
||||
Subject: gzip: fix bug in unpack EOB check
|
||||
|
||||
Problem reported by Vidar Holen (Bug#28861).
|
||||
* NEWS: Mention fix.
|
||||
* tests/unpack-valid: New test.
|
||||
* tests/Makefile.am (TESTS): Add it.
|
||||
* unpack.c (build_tree): Report an error if Huffman tree has
|
||||
too few leaves.
|
||||
* unpack.c (unpack): Fix check for EOB.
|
||||
Remove now-unnecessary check for code out of range.
|
||||
---
|
||||
tests/Makefile.am | 1 +
|
||||
tests/unpack-valid | 32 ++++++++++++++++++++++++++++++++
|
||||
unpack.c | 7 ++++---
|
||||
4 files changed, 40 insertions(+), 3 deletions(-)
|
||||
create mode 100755 tests/unpack-valid
|
||||
|
||||
Index: gzip-1.8/tests/unpack-valid
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gzip-1.8/tests/unpack-valid
|
||||
@@ -0,0 +1,32 @@
|
||||
+#!/bin/sh
|
||||
+# Test end-of-block check in unpack code
|
||||
+
|
||||
+# Copyright 2017 Free Software Foundation, Inc.
|
||||
+
|
||||
+# 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
|
||||
+# the Free Software Foundation, either version 3 of the License, or
|
||||
+# (at your option) any later version.
|
||||
+
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
+# limit so don't run it by default.
|
||||
+
|
||||
+. "${srcdir=.}/init.sh"; path_prepend_ ..
|
||||
+
|
||||
+printf banana >exp || framework_failure_
|
||||
+printf '\x1f\x1e\x00\x00\x00\x06\x03\x01\x01\x00\x61\x6e\x62\x16\xc8' >test.z \
|
||||
+ || framework_failure_
|
||||
+
|
||||
+fail=0
|
||||
+gzip -dc test.z > out 2> err || fail=1
|
||||
+
|
||||
+compare exp out || fail=1
|
||||
+compare /dev/null err || fail=1
|
||||
+
|
||||
+Exit $fail
|
||||
Index: gzip-1.8/unpack.c
|
||||
===================================================================
|
||||
--- gzip-1.8.orig/unpack.c
|
||||
+++ gzip-1.8/unpack.c
|
||||
@@ -186,6 +186,9 @@ local void build_tree()
|
||||
/* Restore nodes to be parents+leaves: */
|
||||
nodes += leaves[len];
|
||||
}
|
||||
+ if ((nodes >> 1) != 1)
|
||||
+ gzip_error ("too few leaves in Huffman tree");
|
||||
+
|
||||
/* Construct the prefix table, from shortest leaves to longest ones.
|
||||
* The shortest code is all ones, so we start at the end of the table.
|
||||
*/
|
||||
@@ -250,10 +253,8 @@ int unpack(in, out)
|
||||
}
|
||||
}
|
||||
/* At this point, peek is the next complete code, of len bits */
|
||||
- if (peek == eob)
|
||||
+ if (peek == eob && len == max_len)
|
||||
break; /* End of file. */
|
||||
- if (eob < peek)
|
||||
- gzip_error ("invalid compressed data--code out of range");
|
||||
put_ubyte(literal[peek+lit_base[len]]);
|
||||
Tracev((stderr,"%02d %04x %c\n", len, peek,
|
||||
literal[peek+lit_base[len]]));
|
||||
Index: gzip-1.8/tests/Makefile.am
|
||||
===================================================================
|
||||
--- gzip-1.8.orig/tests/Makefile.am
|
||||
+++ gzip-1.8/tests/Makefile.am
|
||||
@@ -27,6 +27,7 @@ TESTS = \
|
||||
stdin \
|
||||
trailing-nul \
|
||||
unpack-invalid \
|
||||
+ unpack-valid \
|
||||
z-suffix \
|
||||
zdiff \
|
||||
zgrep-f \
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ff1767ec444f71e5daf8972f6f8bf68cfcca1d2f76c248eb18e8741fc91dbbd3
|
||||
size 728116
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABCgAGBQJXH9eJAAoJEH/Z/MsAC+7u8koP/3CavyYuGYk7YdxLMQM+kaLy
|
||||
wwZiHBL0wIS9r4XkIl5GLV2Smjjf62A9xctw4G2RrbPRY2aj/+9BQOGLjeRxZr6d
|
||||
qrs1q1cG/1nWpKgKD6MgU5Yh14zKNt/SP3siJXlyEOuK0enc9ttD/jDr11pya2Lt
|
||||
fzNApRNri8O9kUrUR1Xa816w6sYT0Z3uNcHHCTFh7NKqRa8ccvbPEatPlnCL8XKT
|
||||
gxOaOGafOBnfTFP1mxeGVl1gnZgjQTMOYd/FIZgyFKVrFTiEsWbOxSpMKhE7KhWR
|
||||
Gx272mESsYQfAGWqpWhAc49w/OvTMt4VgWnWAmSM4ERPaorrR1vzxxImGGBHCAeM
|
||||
iz+2M7vBES8FCMZgvPzbIyiYo4JAfCN5NVvpLHIdf6bKuLjEwuZJZ4JF8jmc1FKU
|
||||
p6bz1wITh3HgyIstoCsL7Xh1IXvlqWk6EcW0TNK2+UQeovKX3aQuviMrgOOiFhTS
|
||||
1+Co2QNJRGjLiELUSsOXUJ12rU/70zgl1C8PY5qdoA4+ByJoxX5SfqgoY5wyurce
|
||||
o9VOXhDaa1tIl6sMPvYXd5QXHpjAbXxQ59AydCpFZwSeGcR77VGotTZZ7kBX2RHI
|
||||
iByyaLTk71r4Or6EXooWGc4LxxNPwx+lePTQ/8q3Bhg3ZDnDYuhMWtXuffe+E9wk
|
||||
/g33z1ASNLM6Y8/j8b/e
|
||||
=CtHK
|
||||
-----END PGP SIGNATURE-----
|
||||
3
gzip-1.9.tar.xz
Normal file
3
gzip-1.9.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ae506144fc198bd8f81f1f4ad19ce63d5a2d65e42333255977cf1dcf1479089a
|
||||
size 762516
|
||||
16
gzip-1.9.tar.xz.sig
Normal file
16
gzip-1.9.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAlpSoV4ACgkQf9n8ywAL
|
||||
7u5unBAAhCQAYdaARybEQh86R/BSeet6Si7zV3ChNljsEcMOHQhzn9bSI3GN5Ub4
|
||||
r0QBMthi8IIPZZ8eYcmnCNwCqsVMwLYEwcg3ITqihIYcI2uPjxXcBH3ls3RYV/2a
|
||||
nAIKDfE9V5fN8lu95gFyUJZ7XIpraWVzsr4f2YnfxPCJUGJ73CVa8HQ2JDIhAWrT
|
||||
xRgqh+6j7n+BE1poHxAdgtAfNlAG1O1RTf2vVleCgLH6UIO5b60MT49AEY54vtcB
|
||||
12WrAOakBYaPFZ8XYhlGm8iyhTx2FDGIX/7IQ/sph4lLciakbU5sk8cDoz7JfyRi
|
||||
r/F8DA/eLVjqCyhsTFeZTWTxiokN0eM/1JZwfi2ZVwTqyRYnNujgEh1gXSDXdxeC
|
||||
KedowsQcwZ8ASgkzJjo0hY1r4pwoXaHhhJHR+DC9B6pgvY8NxH+KUcFlj/8pBkhQ
|
||||
rsuQJkORAIeGBsoetLIWGtvwvmOUJxHwFenYw/e568EFVc/XyjWgwRJ+8Ewi0iTt
|
||||
BROJisowSaqBzg/hhTHzxbEsUU8wILHZ1WVuqdch9O17fefrVTtghLCr9EhsMdT7
|
||||
lM9NzofrR4sdGccbpmLgYelDxk6FRsj/3RvAOEWUM7AKyZW1oDqQRSLBa7pK5vQZ
|
||||
sIAqYx4KZUBWIq4S7qie4OD5KODCZEbNu81Yi6dfwk7zsgq9BG8=
|
||||
=BLwT
|
||||
-----END PGP SIGNATURE-----
|
||||
13
gzip.changes
13
gzip.changes
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 11 09:29:30 UTC 2018 - kbabioch@suse.com
|
||||
|
||||
- Update to 1.9
|
||||
* Fix suffix handling
|
||||
* Fix bug when handling pack format while decompressing
|
||||
* Fix time handling bug
|
||||
* Improve exit code handling for shell scripts
|
||||
|
||||
- removed gzip-1.8-fix_unpack_EOB_check.patch as it is included upstream now
|
||||
|
||||
- Spec file cleanups
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 2 14:30:50 UTC 2018 - kstreitova@suse.com
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%define _buildshell /bin/bash
|
||||
Name: gzip
|
||||
Version: 1.8
|
||||
Version: 1.9
|
||||
Release: 0
|
||||
Summary: GNU Zip Compression Utilities
|
||||
License: GPL-2.0+
|
||||
@ -34,7 +34,6 @@ Patch6: zdiff.diff
|
||||
# PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files
|
||||
Patch7: xz_lzma.patch
|
||||
Patch8: manpage-no-date.patch
|
||||
Patch9: gzip-1.8-fix_unpack_EOB_check.patch
|
||||
# PATCH-FIX-UPSTREAM kstreitova@suse.com -- remove deprecated 'netstat' command
|
||||
Patch10: gzip-1.8-deprecate_netstat.patch
|
||||
BuildRequires: autoconf
|
||||
@ -43,7 +42,6 @@ BuildRequires: makeinfo
|
||||
BuildRequires: xz
|
||||
Requires(post): %{install_info_prereq}
|
||||
Requires(preun): %{install_info_prereq}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Gzip reduces the size of the named files using Lempel-Ziv coding LZ77.
|
||||
@ -59,7 +57,6 @@ times.
|
||||
%patch6
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
|
||||
%build
|
||||
@ -115,7 +112,6 @@ ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc README AUTHORS ChangeLog TODO NEWS THANKS
|
||||
#UsrMerge
|
||||
/bin/gunzip
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Index: gzip-1.7/doc/gzip.texi
|
||||
Index: gzip-1.9/doc/gzip.texi
|
||||
===================================================================
|
||||
--- gzip-1.7.orig/doc/gzip.texi
|
||||
+++ gzip-1.7/doc/gzip.texi
|
||||
--- gzip-1.9.orig/doc/gzip.texi
|
||||
+++ gzip-1.9/doc/gzip.texi
|
||||
@@ -9,7 +9,7 @@
|
||||
@c %**end of header
|
||||
@copying
|
||||
@ -10,7 +10,7 @@ Index: gzip-1.7/doc/gzip.texi
|
||||
+(version @value{VERSION}),
|
||||
and documents commands for compressing and decompressing data.
|
||||
|
||||
Copyright @copyright{} 1998-1999, 2001-2002, 2006-2007, 2009-2016 Free Software
|
||||
Copyright @copyright{} 1998-1999, 2001-2002, 2006-2007, 2009-2018 Free Software
|
||||
@@ -47,7 +47,6 @@ Free Documentation License''.
|
||||
@title GNU gzip
|
||||
@subtitle The data compression program
|
||||
|
||||
Loading…
Reference in New Issue
Block a user