Accepting request 917691 from home:dspinella:branches:Base:System
- Update to 1.11: * Performance improvements * Added hardware acceleration for IBM Z - Refresh patches: * manpage-no-date.patch * xz_lzma.patch - Remove upstreamed patches: * gzip-1.10-fix-DFLTCC-segfault.patch * gzip-1.10-fix_count_of_lines_to_skIip.patch * gzip-1.10-ibm_dfltcc_support.patch OBS-URL: https://build.opensuse.org/request/show/917691 OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=83
This commit is contained in:
Danilo Spinella
Git OBS Bridge
parent
3b3197d579
commit
2cd2e398ab
@ -1,76 +0,0 @@
|
||||
From be0a534ba2b6e77da289de8da79e70843b1028cc Mon Sep 17 00:00:00 2001
|
||||
From: Ilya Leoshkevich <iii@linux.ibm.com>
|
||||
Date: Thu, 24 Sep 2020 00:08:56 +0200
|
||||
Subject: Fix DFLTCC segfault when compressing or decompressing two files
|
||||
|
||||
The value in total_in global variable from processing the first file
|
||||
affected processing of the second file. Fix by making total_in local.
|
||||
---
|
||||
dfltcc.c | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dfltcc.c b/dfltcc.c
|
||||
index 86aa56e..3a5b92d 100644
|
||||
--- a/dfltcc.c
|
||||
+++ b/dfltcc.c
|
||||
@@ -242,10 +242,8 @@ dfltcc_gdht (struct dfltcc_param_v0 *param)
|
||||
dfltcc (DFLTCC_GDHT, param, NULL, NULL, &next_in, &avail_in, NULL);
|
||||
}
|
||||
|
||||
-static off_t total_in;
|
||||
-
|
||||
static dfltcc_cc
|
||||
-dfltcc_cmpr_xpnd (struct dfltcc_param_v0 *param, int fn)
|
||||
+dfltcc_cmpr_xpnd (struct dfltcc_param_v0 *param, int fn, off_t *total_in)
|
||||
{
|
||||
uch *next_out = outbuf + outcnt;
|
||||
size_t avail_out = OUTBUFSIZ - outcnt;
|
||||
@@ -257,7 +255,7 @@ dfltcc_cmpr_xpnd (struct dfltcc_param_v0 *param, int fn)
|
||||
window);
|
||||
off_t consumed_in = next_in - (inbuf + inptr);
|
||||
inptr += consumed_in;
|
||||
- total_in += consumed_in;
|
||||
+ *total_in += consumed_in;
|
||||
outcnt += ((OUTBUFSIZ - outcnt) - avail_out);
|
||||
return cc;
|
||||
}
|
||||
@@ -349,6 +347,7 @@ dfltcc_deflate (int pack_level)
|
||||
|
||||
union aligned_dfltcc_param_v0 ctx_v0;
|
||||
struct dfltcc_param_v0 *param = init_param (&ctx_v0);
|
||||
+ off_t total_in = 0;
|
||||
|
||||
/* Compress ifd into ofd in a loop. */
|
||||
while (true)
|
||||
@@ -398,7 +397,8 @@ dfltcc_deflate (int pack_level)
|
||||
}
|
||||
|
||||
/* Compress inbuf into outbuf. */
|
||||
- while (dfltcc_cmpr_xpnd (param, DFLTCC_CMPR) == DFLTCC_CC_AGAIN)
|
||||
+ while (dfltcc_cmpr_xpnd (param, DFLTCC_CMPR, &total_in)
|
||||
+ == DFLTCC_CC_AGAIN)
|
||||
;
|
||||
|
||||
/* Unmask the input data. */
|
||||
@@ -427,6 +427,7 @@ dfltcc_inflate (void)
|
||||
|
||||
union aligned_dfltcc_param_v0 ctx_v0;
|
||||
struct dfltcc_param_v0 *param = init_param (&ctx_v0);
|
||||
+ off_t total_in = 0;
|
||||
|
||||
/* Decompress ifd into ofd in a loop. */
|
||||
while (true)
|
||||
@@ -446,7 +447,8 @@ dfltcc_inflate (void)
|
||||
|
||||
/* Decompress inbuf into outbuf. */
|
||||
dfltcc_cc cc;
|
||||
- while ((cc = dfltcc_cmpr_xpnd (param, DFLTCC_XPND)) == DFLTCC_CC_AGAIN)
|
||||
+ while ((cc = dfltcc_cmpr_xpnd (param, DFLTCC_XPND, &total_in))
|
||||
+ == DFLTCC_CC_AGAIN)
|
||||
;
|
||||
if (cc == DFLTCC_CC_OK)
|
||||
{
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 38ae6a4ed36a7c86609a6a595add4298d9c202bc Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 26 Mar 2019 19:44:43 -0700
|
||||
Subject: gzexe: fix count of lines to skip
|
||||
|
||||
Problem reported by Jakub Martisko (Bug#35002).
|
||||
* gzexe.in (skip): Bump from 44 to 49.
|
||||
---
|
||||
gzexe.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gzexe.in b/gzexe.in
|
||||
index 8fca8c8..832cd07 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='
|
||||
--
|
||||
cgit v1.2.1
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
|
||||
size 775144
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAlwoWScACgkQf9n8ywAL
|
||||
7u5k8w/9GZSHRagqimmB5Gh7qu4yEtM8gByvidpTFbJlkxz0+hy/7ETNqmIEy38a
|
||||
89idBNFseW2WlH9A2aw4beP1s288k71AubnWp347OFMACCw/1pUmAdq8UsR3gxMS
|
||||
G0jLEGVOIy8sUcrNTCqramNfQEZSZFFtC8jAPy4t9kYQRRXHqmHBQJKa7FxteA+x
|
||||
3JXtHSV6AYOC3iBXCZffipi44r5eEh4fVSakWK8IzzYlYdwzHZ541CT/tMg+iWgf
|
||||
BPEXV4BF9xwTYzwac8UkG8Cx/OPFnUumSITK8EOLsHa+sorItGmXI84L9UBp9SiC
|
||||
tzJsOvmoXffDcO565sbfnA6kpA9siQCJ0MGWwalUULwvSufRxlxSDlCcyNiyL7Ki
|
||||
S1bXaO594EfmBPetvllsQ0EMvrtPk2WL1Oan+5V0Ljkq8CBTvbIXrVNO/PWlAicK
|
||||
6JzR30LSLSHa3eVtRd3Eiozu+VlJdrbmm5f6+ZCley3nTtAvyQ8WJUMPwHupIfiF
|
||||
Ov1aqD6w+Qn26GrJcPR/Q6+zc2JGpCMTo9u+24l/mQNfJOZxh99YxV58d6gN7TqN
|
||||
iGiJOuN8fnUhhrcOrqpC7WoA1awfz8HSHZTeoXkSBrkEYyxPTQKZTpN9lhtZe7TY
|
||||
Khjj1y00zT75THuhBQQLJGOwGqmc9b5bCCjcC6QT7OSlUVv4W10=
|
||||
=/Dx0
|
||||
-----END PGP SIGNATURE-----
|
||||
3
gzip-1.11.tar.xz
Normal file
3
gzip-1.11.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907
|
||||
size 804096
|
||||
16
gzip-1.11.tar.xz.sig
Normal file
16
gzip-1.11.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmEyM4wACgkQf9n8ywAL
|
||||
7u7YRA//czLU142hi0ayvQ0ms7HlzENvjtKZar2Yegd3Lssn23opBKyU8crSabBS
|
||||
gj+OrTNIQsYW08fsHwWcUNZo+vkEIZTeBqjmZYXEsEL5xLxHb00kMHQ4KSBRuUTQ
|
||||
lgGZmzYULGsxXHX+qJo24o0/MW66Owr6oGmD/mU7FZWRN8qLBKCSBXiki9SlxSSa
|
||||
dOSSR/JJLadxlYRucvyN1dgPTi7DSMxaosLvLykLpV7nvM8/JLbUcsieHWZzz4Mn
|
||||
f1JIW40vjDjtMNhZx+PB8aQ6IOtFs+aRnD9luJSmv1Nko6fQtHzyDwuRL5ZCGffy
|
||||
WDFW/CEyuV84TkQ+kYU03F4502AvPCyMU9Sixx7yEsJNAVkVBBJiL/9bdxQ5Gyej
|
||||
Jvqrt0Ppw83+Pu+EH5mQxGjGZ+ECqOMaLTTcN4Lx8ocFyl0WOOin+HLbcfiq18Tr
|
||||
5DmHWOgaLLQfAOFgjLnnhHptyUM/2vIta5kha2oBbysAhUHTRPP1IRGQyVwoVEk6
|
||||
094NIcIvJLNiA/FrWLdEseylvVkhW9bO6QcwuIuwhc4TdbuDVByWyS3ktgqH1QbG
|
||||
NVCiptm651yvY+sN2rLX8cxAEdtpnFcBahSGj9K9iLaqf5r9tk+45HCZoqXoR9fd
|
||||
HzV3FhP+3hDaGIauOIlAJgkIa3tGMF3YoTXc6Tg32aNwyfka6ck=
|
||||
=JDS7
|
||||
-----END PGP SIGNATURE-----
|
||||
14
gzip.changes
14
gzip.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 9 08:23:45 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
|
||||
|
||||
- Update to 1.11:
|
||||
* Performance improvements
|
||||
* Added hardware acceleration for IBM Z
|
||||
- Refresh patches:
|
||||
* manpage-no-date.patch
|
||||
* xz_lzma.patch
|
||||
- Remove upstreamed patches:
|
||||
* gzip-1.10-fix-DFLTCC-segfault.patch
|
||||
* gzip-1.10-fix_count_of_lines_to_skIip.patch
|
||||
* gzip-1.10-ibm_dfltcc_support.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 23 09:25:09 UTC 2021 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
||||
13
gzip.spec
13
gzip.spec
@ -18,7 +18,7 @@
|
||||
|
||||
%define _buildshell /bin/bash
|
||||
Name: gzip
|
||||
Version: 1.10
|
||||
Version: 1.11
|
||||
Release: 0
|
||||
Summary: GNU Zip Compression Utilities
|
||||
License: GPL-3.0-or-later
|
||||
@ -34,10 +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.10-ibm_dfltcc_support.patch
|
||||
Patch10: gzip-1.10-fix_count_of_lines_to_skip.patch
|
||||
# https://git.savannah.gnu.org/cgit/gzip.git/commit/?id=be0a534ba2b6e77da289de8da79e70843b1028cc
|
||||
Patch11: gzip-1.10-fix-DFLTCC-segfault.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: makeinfo
|
||||
@ -59,13 +55,6 @@ times.
|
||||
%patch6
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%ifarch s390x
|
||||
%patch9 -p1
|
||||
%endif
|
||||
%patch10 -p1
|
||||
%ifarch s390x
|
||||
%patch11 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -fomit-frame-pointer \
|
||||
|
||||
@ -10,7 +10,7 @@ Index: gzip-1.9/doc/gzip.texi
|
||||
+(version @value{VERSION}),
|
||||
and documents commands for compressing and decompressing data.
|
||||
|
||||
Copyright @copyright{} 1998-1999, 2001-2002, 2006-2007, 2009-2018 Free Software
|
||||
Copyright @copyright{} 1998--1999, 2001--2002, 2006--2007, 2009--2021 Free
|
||||
@@ -47,7 +47,6 @@ Free Documentation License''.
|
||||
@title GNU gzip
|
||||
@subtitle The data compression program
|
||||
|
||||
@ -3,13 +3,13 @@ Index: gzip-1.5/zgrep.1
|
||||
--- gzip-1.5.orig/zgrep.1
|
||||
+++ gzip-1.5/zgrep.1
|
||||
@@ -10,7 +10,7 @@ zgrep \- search possibly compressed file
|
||||
.I Zgrep
|
||||
invokes
|
||||
.I grep
|
||||
.B zgrep
|
||||
command invokes
|
||||
.B grep
|
||||
-on compressed or gzipped files.
|
||||
+on compressed, xz'ed, lzma'ed, bzip2'ed or gzipped files.
|
||||
All options specified are passed directly to
|
||||
.IR grep .
|
||||
.BR grep .
|
||||
If no file is specified, then the standard input is decompressed
|
||||
Index: gzip-1.5/zgrep.in
|
||||
===================================================================
|
||||
|
||||
Loading…
Reference in New Issue
Block a user