pool/gzip
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 662443 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/662443
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzip?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2019-01-08 11:15:23 +00:00 committed by Git OBS Bridge
commit 2e1f17fa3d
8 changed files with 50 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
gnulib-libio.patch
View File

@ -1,132 +0,0 @@
2018-03-05 Paul Eggert <eggert@cs.ucla.edu>
fflush: adjust to glibc 2.28 libio.h removal
Problem reported by Daniel P. Berrangé in:
https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
* lib/fbufmode.c (fbufmode):
* lib/fflush.c (clear_ungetc_buffer_preserving_position)
(disable_seek_optimization, rpl_fflush):
* lib/fpending.c (__fpending):
* lib/fpurge.c (fpurge):
* lib/freadable.c (freadable):
* lib/freadahead.c (freadahead):
* lib/freading.c (freading):
* lib/freadptr.c (freadptr):
* lib/freadseek.c (freadptrinc):
* lib/fseeko.c (fseeko):
* lib/fseterr.c (fseterr):
* lib/fwritable.c (fwritable):
* lib/fwriting.c (fwriting):
Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
Define if not already defined.
Index: gzip-1.9/lib/fflush.c
===================================================================
--- gzip-1.9.orig/lib/fflush.c
+++ gzip-1.9/lib/fflush.c
@@ -33,7 +33,7 @@
#undef fflush
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
static void
@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
#endif
-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
if (stream == NULL || ! freading (stream))
return fflush (stream);
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
clear_ungetc_buffer_preserving_position (stream);
Index: gzip-1.9/lib/fpurge.c
===================================================================
--- gzip-1.9.orig/lib/fpurge.c
+++ gzip-1.9/lib/fpurge.c
@@ -62,7 +62,7 @@ fpurge (FILE *fp)
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_end = fp->_IO_read_ptr;
fp->_IO_write_ptr = fp->_IO_write_base;
/* Avoid memory leak when there is an active ungetc buffer. */
Index: gzip-1.9/lib/freading.c
===================================================================
--- gzip-1.9.orig/lib/freading.c
+++ gzip-1.9/lib/freading.c
@@ -31,7 +31,7 @@ freading (FILE *fp)
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
return ((fp->_flags & _IO_NO_WRITES) != 0
|| ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
&& fp->_IO_read_base != NULL));
Index: gzip-1.9/lib/fseeko.c
===================================================================
--- gzip-1.9.orig/lib/fseeko.c
+++ gzip-1.9/lib/fseeko.c
@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
Index: gzip-1.9/lib/fseterr.c
===================================================================
--- gzip-1.9.orig/lib/fseterr.c
+++ gzip-1.9/lib/fseterr.c
@@ -29,7 +29,7 @@ fseterr (FILE *fp)
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
Index: gzip-1.9/lib/stdio-impl.h
===================================================================
--- gzip-1.9.orig/lib/stdio-impl.h
+++ gzip-1.9/lib/stdio-impl.h
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ problem by defining it ourselves. FIXME: Do not rely on glibc
+ internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */

3
gzip-1.10.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
size 775144

16
gzip-1.10.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----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-----

13
gzip-1.8-deprecate_netstat.patch
View File

@ -1,13 +0,0 @@
Index: gzip-1.8/tests/init.sh
===================================================================
--- gzip-1.8.orig/tests/init.sh
+++ gzip-1.8/tests/init.sh
@@ -525,7 +525,7 @@ rand_bytes_ ()
fi
n_plus_50_=`expr $n_ + 50`
- cmds_='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n'
+ cmds_='date; date +%N; free; who -a; w; ps auxww; ps -ef'
data_=` (eval "$cmds_") 2>&1 | gzip `
# Ensure that $data_ has length at least 50+$n_

3
gzip-1.9.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae506144fc198bd8f81f1f4ad19ce63d5a2d65e42333255977cf1dcf1479089a
size 762516

16
gzip-1.9.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----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-----

16
gzip.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sun Dec 30 11:34:12 UTC 2018 - astieger@suse.com
- gzip 1.10:
* Compressed gzip output no longer contains the current time as
a timestamp when the input is not a regular file. Instead, the
output contains a null (zero) timestamp. This makes gzip's
behavior more reproducible when used as part of a pipeline.
* A use of uninitialized memory on some malformed inputs has been
fixed.
* A few theoretical race conditions in signal handers have been
fixed.
- drop upstreamed patches:
* gnulib-libio.patch
* gzip-1.8-deprecate_netstat.patch
-------------------------------------------------------------------
Wed Aug 1 14:03:39 UTC 2018 - schwab@suse.de

40
gzip.spec
View File

@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define _buildshell /bin/bash
Name: gzip
Version: 1.9
Version: 1.10
Release: 0
Summary: GNU Zip Compression Utilities
License: GPL-3.0-or-later
Group: Productivity/Archiving/Compression
Url: http://www.gnu.org/software/gzip/
URL: http://www.gnu.org/software/gzip/
Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
Source3: %{name}.keyring
@ -34,12 +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
# PATCH-FIX-UPSTREAM kstreitova@suse.com -- remove deprecated 'netstat' command
Patch10: gzip-1.8-deprecate_netstat.patch
# PATCH-FIX-UPSTREAM Update gnulib for libio.h removal
Patch11: gnulib-libio.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: makeinfo
BuildRequires: xz
Requires(post): %{install_info_prereq}
@ -59,15 +53,11 @@ times.
%patch6
%patch7 -p1
%patch8 -p1
%patch10 -p1
%patch11 -p1
%build
export CFLAGS="%{optflags} -fomit-frame-pointer \
-W -Wall -Wno-unused-parameter -Wstrict-prototypes -Wpointer-arith -fPIE"
export LDFLAGS="-pie"
# add autoreconf because of gzip-1.8-fix_unpack_EOB_check.patch
autoreconf -fi
%configure --disable-silent-rules \
gl_cv_func_printf_directive_n=yes \
gl_cv_func_printf_infinite_long_double=yes
@ -136,17 +126,17 @@ ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1
%{_bindir}/zless
%{_bindir}/zmore
%{_bindir}/znew
%{_infodir}/gzip.info%{ext_info}
%{_mandir}/man1/gunzip.1%{ext_man}
%{_mandir}/man1/gzexe.1%{ext_man}
%{_mandir}/man1/gzip.1%{ext_man}
%{_mandir}/man1/zcat.1%{ext_man}
%{_mandir}/man1/zcmp.1%{ext_man}
%{_mandir}/man1/zdiff.1%{ext_man}
%{_mandir}/man1/zforce.1%{ext_man}
%{_mandir}/man1/zgrep.1%{ext_man}
%{_mandir}/man1/zless.1%{ext_man}
%{_mandir}/man1/zmore.1%{ext_man}
%{_mandir}/man1/znew.1%{ext_man}
%{_infodir}/gzip.info%{?ext_info}
%{_mandir}/man1/gunzip.1%{?ext_man}
%{_mandir}/man1/gzexe.1%{?ext_man}
%{_mandir}/man1/gzip.1%{?ext_man}
%{_mandir}/man1/zcat.1%{?ext_man}
%{_mandir}/man1/zcmp.1%{?ext_man}
%{_mandir}/man1/zdiff.1%{?ext_man}
%{_mandir}/man1/zforce.1%{?ext_man}
%{_mandir}/man1/zgrep.1%{?ext_man}
%{_mandir}/man1/zless.1%{?ext_man}
%{_mandir}/man1/zmore.1%{?ext_man}
%{_mandir}/man1/znew.1%{?ext_man}
%changelog