From bb3ec339f704b1fff06abcc5f5ed67b2a6045350 Mon Sep 17 00:00:00 2001 From: Serhii Turivny Date: Thu, 12 Oct 2017 12:23:49 +0300 Subject: [PATCH 01/40] Add CI tests using the standard test interface --- tests/.gitignore | 2 ++ tests/test-simple | 11 +++++++++++ tests/test_simple.yml | 32 ++++++++++++++++++++++++++++++++ tests/tests.yml | 1 + 4 files changed, 46 insertions(+) create mode 100644 tests/.gitignore create mode 100644 tests/test-simple create mode 100644 tests/test_simple.yml create mode 100644 tests/tests.yml diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..8793994 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,2 @@ +*.swp +*.retry diff --git a/tests/test-simple b/tests/test-simple new file mode 100644 index 0000000..278d622 --- /dev/null +++ b/tests/test-simple @@ -0,0 +1,11 @@ +#!/bin/sh +set -ex + +# exercise installed gzip/gunzip programs +echo "Bla" > bla.file +cp bla.file bla.file.orig +gzip bla.file +gunzip bla.file.gz +cmp bla.file bla.file.orig +echo "hi" +rm bla.file bla.file.orig diff --git a/tests/test_simple.yml b/tests/test_simple.yml new file mode 100644 index 0000000..37fdd70 --- /dev/null +++ b/tests/test_simple.yml @@ -0,0 +1,32 @@ +--- +- hosts: localhost + vars: + - artifacts: ./artifacts + tags: + - atomic + - classic + - container + remote_user: root + tasks: + - name: Create the folder where we will store the tests + action: file state=directory path={{ item }} + owner=root group=root + with_items: + - /usr/local/bin + + - name: Install the test files + copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} + mode=0755 + with_items: + - {file: test-simple, dest: test-simple } + + - block: + - name: Execute the tests + shell: exec > /tmp/test.log && /usr/local/bin/test-simple 2>&1 + + - always: + - name: Pull out the logs + fetch: + dest: "{{ artifacts }}/" + src: "/tmp/test.log" + flat: yes diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..8a6aab3 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1 @@ +- include: test_simple.yml From 71f9de92625688b1c1743274f4c671cbce2ceaa9 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 10 Jan 2018 09:41:50 +0100 Subject: [PATCH 02/40] rebase to v1.9 --- .gitignore | 1 + gzip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b7935ef..2a02271 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ gzip-1.4.tar.xz /gzip-1.6.tar.xz /gzip-1.7.tar.xz /gzip-1.8.tar.xz +/gzip-1.9.tar.xz diff --git a/gzip.spec b/gzip.spec index 1cd052b..9febcaa 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip -Version: 1.8 -Release: 4%{?dist} +Version: 1.9 +Release: 1%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -91,6 +91,9 @@ fi %{profiledir}/* %changelog +* Wed Jan 10 2018 Jakub Martisko - 1.9-1 +- rebase to v1.9 + * Wed Aug 02 2017 Fedora Release Engineering - 1.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index b5f412d..7c9c006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7caabb65cddc1a4165b398009bd05b9 gzip-1.8.tar.xz +SHA512 (gzip-1.9.tar.xz) = c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad From 7420aefa1402627c89fe95a0302924b7f55105b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 16:00:02 +0000 Subject: [PATCH 03/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 9febcaa..412f240 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -91,6 +91,9 @@ fi %{profiledir}/* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 10 2018 Jakub Martisko - 1.9-1 - rebase to v1.9 From 23076eb064be47db12b80ee2fc83be188c425a73 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:40 +0100 Subject: [PATCH 04/40] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- gzip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gzip.spec b/gzip.spec index 412f240..3e46383 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 2%{?dist} +Release: 3%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -91,6 +91,9 @@ fi %{profiledir}/* %changelog +* Fri Feb 09 2018 Igor Gnatenko - 1.9-3 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -136,7 +139,7 @@ fi * Tue Aug 26 2014 Petr Stodulka - 1.6-6 - changed spec file - build section - obey compiler macros %__cc, %__cpp, %__cxx (#667144) + obey compiler macros %%__cc, %%__cpp, %%__cxx (#667144) - zgrep inherits color setup from grep (#1034839) * Sat Aug 16 2014 Fedora Release Engineering - 1.6-5 From 811c85b4dbed33e141690f449e6402f66d73b3d0 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 1 Mar 2018 10:31:09 +0100 Subject: [PATCH 05/40] gzip.spec: add gcc to buildrequires --- gzip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gzip.spec b/gzip.spec index 3e46383..9f2d14f 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 3%{?dist} +Release: 4%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -19,7 +19,7 @@ URL: http://www.gzip.org/ # zless) of another tools, because gzip "extends" the tools by its # wrappers much more than it "requires" them. Requires: /sbin/install-info -Requires: coreutils +Requires: coreutils, gcc BuildRequires: texinfo Conflicts: filesystem < 3 Provides: /bin/gunzip @@ -91,6 +91,9 @@ fi %{profiledir}/* %changelog +* Thu Mar 01 2018 Jakub Martisko - 1.9-4 +- Add gcc to buildrequires + * Fri Feb 09 2018 Igor Gnatenko - 1.9-3 - Escape macros in %%changelog From cacf5cd73e2071a75af31f2fef5564b62641db3b Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 1 Mar 2018 10:52:43 +0100 Subject: [PATCH 06/40] gzip.spec: add gcc to buildrequires, previous commit was wrong --- gzip.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gzip.spec b/gzip.spec index 9f2d14f..118ea10 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 4%{?dist} +Release: 5%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -19,8 +19,8 @@ URL: http://www.gzip.org/ # zless) of another tools, because gzip "extends" the tools by its # wrappers much more than it "requires" them. Requires: /sbin/install-info -Requires: coreutils, gcc -BuildRequires: texinfo +Requires: coreutils +BuildRequires: texinfo, gcc Conflicts: filesystem < 3 Provides: /bin/gunzip Provides: /bin/gzip @@ -91,6 +91,9 @@ fi %{profiledir}/* %changelog +* Thu Mar 01 2018 Jakub Martisko - 1.9-5 +- Fix previous commit (gcc was added to requires instead of buildrequires) + * Thu Mar 01 2018 Jakub Martisko - 1.9-4 - Add gcc to buildrequires From e11479c9e4c58f8fbc77b8d653ab9cb391ce1e93 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:19:33 -0500 Subject: [PATCH 07/40] Remove needless use of %defattr --- gzip.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 118ea10..5ab8d38 100644 --- a/gzip.spec +++ b/gzip.spec @@ -81,7 +81,6 @@ if [ $1 = 0 ]; then fi %files -%defattr(-,root,root) %doc NEWS README AUTHORS ChangeLog THANKS TODO %{!?_licensedir:%global license %%doc} %license COPYING fdl-1.3.txt From 07bb539b12567f6fc9da68ad8451a5d624927307 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jul 2018 10:45:40 +0200 Subject: [PATCH 08/40] remove unneeded scriptlets install-info is handled by filetriggers nowadays. Signed-off-by: Igor Gnatenko --- gzip.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gzip.spec b/gzip.spec index 5ab8d38..eb7f868 100644 --- a/gzip.spec +++ b/gzip.spec @@ -18,7 +18,6 @@ URL: http://www.gzip.org/ # Requires should not be added for gzip wrappers (eg. zdiff, zgrep, # zless) of another tools, because gzip "extends" the tools by its # wrappers much more than it "requires" them. -Requires: /sbin/install-info Requires: coreutils BuildRequires: texinfo, gcc Conflicts: filesystem < 3 @@ -68,18 +67,6 @@ mkdir -p %{buildroot}%{profiledir} install -p -m 644 %{SOURCE100} %{buildroot}%{profiledir} install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} -%post -if [ -f %{_infodir}/gzip.info* ]; then - /sbin/install-info %{_infodir}/gzip.info.gz %{_infodir}/dir || : -fi - -%preun -if [ $1 = 0 ]; then - if [ -f %{_infodir}/gzip.info* ]; then - /sbin/install-info --delete %{_infodir}/gzip.info.gz %{_infodir}/dir || : - fi -fi - %files %doc NEWS README AUTHORS ChangeLog THANKS TODO %{!?_licensedir:%global license %%doc} From b8d6e421bcf8ca72fff0f608472e41a211b6c0e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 04:50:21 +0000 Subject: [PATCH 09/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index eb7f868..3c3d799 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 5%{?dist} +Release: 6%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -77,6 +77,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 01 2018 Jakub Martisko - 1.9-5 - Fix previous commit (gcc was added to requires instead of buildrequires) From 42f71479a44d69e0eab526672cdc6c2a9e7e7b4f Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 26 Jul 2018 10:21:15 +0200 Subject: [PATCH 10/40] Fix FTBFS bug (caused by gnulib) Resolves: 1604303 --- gnulib.patch | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++ gzip.spec | 11 ++- 2 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 gnulib.patch diff --git a/gnulib.patch b/gnulib.patch new file mode 100644 index 0000000..68e8d51 --- /dev/null +++ b/gnulib.patch @@ -0,0 +1,189 @@ +From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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. +--- + ChangeLog | 23 +++++++++++++++++++++++ + lib/fbufmode.c | 2 +- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadable.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c | 2 +- + lib/fwritable.c | 2 +- + lib/fwriting.c | 2 +- + lib/stdio-impl.h | 6 ++++++ + 15 files changed, 45 insertions(+), 16 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 667f91663..beb835670 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,26 @@ ++2018-03-05 Paul Eggert ++ ++ 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. ++ + 2018-01-07 Jim Meyering + + version 1.9 + * NEWS: Record release date. +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0ff..a6edfa105 100644 +--- a/lib/fflush.c ++++ b/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); + +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c7a..3aedcc373 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , 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. */ +diff --git a/lib/freading.c b/lib/freading.c +index 73c28acdd..c24d0c88a 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , 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)); +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0101ab55f..193f4e8ce 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #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 whence) + 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__ +diff --git a/lib/fseterr.c b/lib/fseterr.c +index 82649c3ac..adb637256 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , 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 */ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/lib/stdio-impl.h ++++ b/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. */ + +-- +2.14.3 + diff --git a/gzip.spec b/gzip.spec index 3c3d799..84210f5 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 6%{?dist} +Release: 7%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -12,6 +12,8 @@ Source1: https://www.gnu.org/licenses/fdl-1.3.txt Source100: colorzgrep.csh Source101: colorzgrep.sh +Patch1: gnulib.patch + # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 URL: http://www.gzip.org/ @@ -37,6 +39,7 @@ very commonly used data compression program. %prep %setup -q +%patch1 -p1 -b .gnulib cp %{SOURCE1} . %build @@ -46,7 +49,6 @@ export CC="%{__cc}" export CPP="%{__cpp}" export CXX="%{__cxx}" %configure - make #make gzip.info @@ -77,6 +79,11 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 26 2018 Jakub Martisko - 1.9-7 +- Fix FTBFS bug (gnulib problems) +- more details: https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html + Resolves 1604303 + * Fri Jul 13 2018 Fedora Release Engineering - 1.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a0288acc0f45428bda3811c68ffb20ee2a6e46bd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:47 +0100 Subject: [PATCH 11/40] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- gzip.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 84210f5..e707166 100644 --- a/gzip.spec +++ b/gzip.spec @@ -4,7 +4,6 @@ Version: 1.9 Release: 7%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL -Group: Applications/File Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz Source1: https://www.gnu.org/licenses/fdl-1.3.txt From f1591ea411c7edd2afdad8af6a443ea1caf0fd57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 02:03:50 +0000 Subject: [PATCH 12/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index e707166..b65ffb4 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 7%{?dist} +Release: 8%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -78,6 +78,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 26 2018 Jakub Martisko - 1.9-7 - Fix FTBFS bug (gnulib problems) - more details: https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html From 0cf888ad485ef8c4dd0b3ff3e1f06520bd496169 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 27 Mar 2019 09:55:57 +0100 Subject: [PATCH 13/40] Fix: wrong skip value in gzexe; enable make check Related: 1690825 --- gzexe.patch | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ gzip.spec | 14 ++++++++-- 2 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 gzexe.patch diff --git a/gzexe.patch b/gzexe.patch new file mode 100644 index 0000000..e48fa2d --- /dev/null +++ b/gzexe.patch @@ -0,0 +1,75 @@ +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]) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index ebdce5b..4dfbccf 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -15,6 +15,7 @@ + # along with this program. If not, see . + + TESTS = \ ++ gzexe \ + gzip-env \ + helin-segv \ + help-version \ +diff --git a/tests/gzexe b/tests/gzexe +new file mode 100755 +index 0000000..45f71c7 +--- /dev/null ++++ b/tests/gzexe +@@ -0,0 +1,20 @@ ++#!/bin/sh ++#Try running simple shell script compressed by gzexe ++ ++. "${srcdir=.}/init.sh"; path_prepend_ .. ++ ++cat < foo || framework_failure_ ++#!/bin/sh ++echo "Hello World!" ++EOF ++ ++echo "Hello World!" > exp || framework_failure_ ++ ++fail=0 ++gzexe foo || fail=1 ++/bin/sh foo > out 2> err || fail=1 ++ ++compare exp out || fail=1 ++test -s err && fail=1 ++ ++Exit $fail +-- +2.21.0 + diff --git a/gzip.spec b/gzip.spec index b65ffb4..99d5d7c 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 8%{?dist} +Release: 9%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -12,6 +12,7 @@ Source100: colorzgrep.csh Source101: colorzgrep.sh Patch1: gnulib.patch +Patch2: gzexe.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 @@ -20,7 +21,7 @@ URL: http://www.gzip.org/ # zless) of another tools, because gzip "extends" the tools by its # wrappers much more than it "requires" them. Requires: coreutils -BuildRequires: texinfo, gcc +BuildRequires: texinfo, gcc, autoconf, automake, less Conflicts: filesystem < 3 Provides: /bin/gunzip Provides: /bin/gzip @@ -39,7 +40,9 @@ very commonly used data compression program. %prep %setup -q %patch1 -p1 -b .gnulib +%patch2 -p1 -b .gzexe cp %{SOURCE1} . +autoreconf %build export DEFS="NO_ASM" @@ -49,6 +52,7 @@ export CPP="%{__cpp}" export CXX="%{__cxx}" %configure make +make check #make gzip.info %install @@ -78,6 +82,12 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Tue Mar 26 2019 Jakub Martisko - 1.9-9 +- Fix wrong skip size in gzexe +- Add new test dealing with the ^^ (needs autoreconf) +- Enable make check (needs less) + Related: 1690825 + * Fri Feb 01 2019 Fedora Release Engineering - 1.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From be911d929ef568fe592b18dc555b67db10a4a6f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 08:14:40 +0000 Subject: [PATCH 14/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 99d5d7c..9e0e27c 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.9 -Release: 9%{?dist} +Release: 10%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -82,6 +82,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Mar 26 2019 Jakub Martisko - 1.9-9 - Fix wrong skip size in gzexe - Add new test dealing with the ^^ (needs autoreconf) From 7b5215a96d9507a51a5d3bc61ae4d9e617418cab Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Fri, 9 Aug 2019 09:06:54 +0200 Subject: [PATCH 15/40] Rebase to gzip-1.10 --- .gitignore | 1 + gzip.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2a02271..634ee42 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ gzip-1.4.tar.xz /gzip-1.7.tar.xz /gzip-1.8.tar.xz /gzip-1.9.tar.xz +/gzip-1.10.tar.xz diff --git a/gzip.spec b/gzip.spec index 9e0e27c..5cd48a4 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip -Version: 1.9 -Release: 10%{?dist} +Version: 1.10 +Release: 1%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -39,7 +39,7 @@ very commonly used data compression program. %prep %setup -q -%patch1 -p1 -b .gnulib +#%patch1 -p1 -b .gnulib %patch2 -p1 -b .gzexe cp %{SOURCE1} . autoreconf @@ -82,6 +82,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Fri Aug 09 2019 Jakub Martisko - 1.10-1 +- Rebase to 1.10 + * Thu Jul 25 2019 Fedora Release Engineering - 1.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7c9c006..3b27769 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.9.tar.xz) = c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad +SHA512 (gzip-1.10.tar.xz) = e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299 From 67c4b9aa8aeccc7bd41ae386a0d597db11348d19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 04:05:19 +0000 Subject: [PATCH 16/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 5cd48a4..ad32c3b 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.10 -Release: 1%{?dist} +Release: 2%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -82,6 +82,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 09 2019 Jakub Martisko - 1.10-1 - Rebase to 1.10 From acd220d425adb9f626284cb2e893c1bc9047a439 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 00:44:26 +0000 Subject: [PATCH 17/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index ad32c3b..eb02821 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.10 -Release: 2%{?dist} +Release: 3%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -82,6 +82,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4b26f44dad23a10b408d00f34e33ea8f71cbc672 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:21:04 +0000 Subject: [PATCH 18/40] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- gzip.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gzip.spec b/gzip.spec index eb02821..963dd72 100644 --- a/gzip.spec +++ b/gzip.spec @@ -22,6 +22,7 @@ URL: http://www.gzip.org/ # wrappers much more than it "requires" them. Requires: coreutils BuildRequires: texinfo, gcc, autoconf, automake, less +BuildRequires: make Conflicts: filesystem < 3 Provides: /bin/gunzip Provides: /bin/gzip From 88ae7a2a118a1a3c5efa59857a4100533444c25a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Jan 2021 00:58:41 +0000 Subject: [PATCH 19/40] Spec file cleanup --- gzip.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gzip.spec b/gzip.spec index 963dd72..98dde7f 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,10 +1,10 @@ -Summary: The GNU data compression program +Summary: GNU data compression program Name: gzip Version: 1.10 Release: 3%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL -Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz +Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz Source1: https://www.gnu.org/licenses/fdl-1.3.txt # downstream solution for coloured z*grep (#1034839) @@ -16,7 +16,7 @@ Patch2: gzexe.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 -URL: http://www.gzip.org/ +URL: https://www.gzip.org/ # Requires should not be added for gzip wrappers (eg. zdiff, zgrep, # zless) of another tools, because gzip "extends" the tools by its # wrappers much more than it "requires" them. @@ -57,7 +57,6 @@ make check #make gzip.info %install -rm -rf ${RPM_BUILD_ROOT} %makeinstall gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info* @@ -65,7 +64,7 @@ gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info* # we don't ship it, so let's remove it from ${RPM_BUILD_ROOT} rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # uncompress is a part of ncompress package -rm -f ${RPM_BUILD_ROOT}/%{_bindir}/uncompress +rm -f ${RPM_BUILD_ROOT}%{_bindir}/uncompress # coloured z*grep (#1034839) %global profiledir %{_sysconfdir}/profile.d @@ -75,7 +74,6 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %files %doc NEWS README AUTHORS ChangeLog THANKS TODO -%{!?_licensedir:%global license %%doc} %license COPYING fdl-1.3.txt %{_bindir}/* %{_mandir}/*/* From 05a19f65cc2f012e5865c716397eca5d777df034 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 13:19:44 +0000 Subject: [PATCH 20/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 963dd72..c632740 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.10 -Release: 3%{?dist} +Release: 4%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -83,6 +83,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From de64edeca287ec7cb972a42eeb56313e6b824fbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 07:28:07 +0000 Subject: [PATCH 21/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 91a7c28..e2669ab 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.10 -Release: 4%{?dist} +Release: 5%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -81,6 +81,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3ed6b7def3d3dff36e5ba9b520f4a7ecc9daf105 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 21 Oct 2021 16:49:45 +0200 Subject: [PATCH 22/40] Rebase to gzip 1.11 Resolves: rhbz#2001025 --- .gitignore | 1 + gzexe.patch | 75 ----------------------------------------------------- gzip.spec | 12 ++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 80 deletions(-) delete mode 100644 gzexe.patch diff --git a/.gitignore b/.gitignore index 634ee42..8545301 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ gzip-1.4.tar.xz /gzip-1.8.tar.xz /gzip-1.9.tar.xz /gzip-1.10.tar.xz +/gzip-1.11.tar.xz diff --git a/gzexe.patch b/gzexe.patch deleted file mode 100644 index e48fa2d..0000000 --- a/gzexe.patch +++ /dev/null @@ -1,75 +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]) -diff --git a/tests/Makefile.am b/tests/Makefile.am -index ebdce5b..4dfbccf 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -15,6 +15,7 @@ - # along with this program. If not, see . - - TESTS = \ -+ gzexe \ - gzip-env \ - helin-segv \ - help-version \ -diff --git a/tests/gzexe b/tests/gzexe -new file mode 100755 -index 0000000..45f71c7 ---- /dev/null -+++ b/tests/gzexe -@@ -0,0 +1,20 @@ -+#!/bin/sh -+#Try running simple shell script compressed by gzexe -+ -+. "${srcdir=.}/init.sh"; path_prepend_ .. -+ -+cat < foo || framework_failure_ -+#!/bin/sh -+echo "Hello World!" -+EOF -+ -+echo "Hello World!" > exp || framework_failure_ -+ -+fail=0 -+gzexe foo || fail=1 -+/bin/sh foo > out 2> err || fail=1 -+ -+compare exp out || fail=1 -+test -s err && fail=1 -+ -+Exit $fail --- -2.21.0 - diff --git a/gzip.spec b/gzip.spec index e2669ab..361006c 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip -Version: 1.10 -Release: 5%{?dist} +Version: 1.11 +Release: 1%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -12,7 +12,6 @@ Source100: colorzgrep.csh Source101: colorzgrep.sh Patch1: gnulib.patch -Patch2: gzexe.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 @@ -41,7 +40,6 @@ very commonly used data compression program. %prep %setup -q #%patch1 -p1 -b .gnulib -%patch2 -p1 -b .gzexe cp %{SOURCE1} . autoreconf @@ -53,6 +51,7 @@ export CPP="%{__cpp}" export CXX="%{__cxx}" %configure make +%check make check #make gzip.info @@ -81,6 +80,11 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Oct 21 2021 Jakub Martisko - 1.11-1 +- Rebase to gzip 1.11 +- Run the tests in the check section instead of the build section +Resolve: rhbz#2001025 + * Thu Jul 22 2021 Fedora Release Engineering - 1.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 3b27769..824ab64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.10.tar.xz) = e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299 +SHA512 (gzip-1.11.tar.xz) = af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3 From e8954127bb9853df6a6b5a73579794991e48b7c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 12:10:32 +0000 Subject: [PATCH 23/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 361006c..31d2864 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.11 -Release: 1%{?dist} +Release: 2%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Oct 21 2021 Jakub Martisko - 1.11-1 - Rebase to gzip 1.11 - Run the tests in the check section instead of the build section From 2f8bac725fc509abff5300c27215f9521f098c2a Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Mon, 11 Apr 2022 15:13:21 +0200 Subject: [PATCH 24/40] Rebase to gzip 1.12 --- .gitignore | 1 + gzip.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8545301..653a7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ gzip-1.4.tar.xz /gzip-1.9.tar.xz /gzip-1.10.tar.xz /gzip-1.11.tar.xz +/gzip-1.12.tar.xz diff --git a/gzip.spec b/gzip.spec index 31d2864..0c22ab4 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip -Version: 1.11 -Release: 2%{?dist} +Version: 1.12 +Release: 1%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -80,6 +80,11 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Mon Apr 11 2022 Jakub Martisko - 1.12-1 +- Rebase to gzip 1.12 +Resolves: rhbz#2073133 +Resolves: CVE-2022-1271 + * Thu Jan 20 2022 Fedora Release Engineering - 1.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 824ab64..3aad54d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.11.tar.xz) = af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3 +SHA512 (gzip-1.12.tar.xz) = 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24 From dc86972464e08aa2a8be10122dac999053487dc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 13:27:31 +0000 Subject: [PATCH 25/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 0c22ab4..64131fa 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.12 -Release: 1%{?dist} +Release: 2%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Apr 11 2022 Jakub Martisko - 1.12-1 - Rebase to gzip 1.12 Resolves: rhbz#2073133 From 65fabc4c3c60416842e926618b4e9244d1d280fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 11:57:50 +0000 Subject: [PATCH 26/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 64131fa..9ebd657 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.12 -Release: 2%{?dist} +Release: 3%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 06a2222faa84b8a13bd4b9541dad440b198c607d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 13 Apr 2023 14:36:38 +0200 Subject: [PATCH 27/40] migrate to SPDX license format --- gzip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gzip.spec b/gzip.spec index 9ebd657..3c5c566 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,9 +1,9 @@ Summary: GNU data compression program Name: gzip Version: 1.12 -Release: 3%{?dist} +Release: 4%{?dist} # info pages are under GFDL license -License: GPLv3+ and GFDL +License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz Source1: https://www.gnu.org/licenses/fdl-1.3.txt @@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Apr 13 2023 Lukáš Zaoral - 1.12-4 +- migrate to SPDX license format + * Thu Jan 19 2023 Fedora Release Engineering - 1.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1b5c09a0f2742df8330da02feb9d575ac8b35739 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Tue, 27 Jun 2023 17:15:15 +0200 Subject: [PATCH 28/40] initialize testsuite from /tests/gzip --- .fmf/version | 1 + plans/all.fmf | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/all.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 0000000..d5b1643 --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,6 @@ +summary: Basic smoke test +discover: + how: fmf + url: https://src.fedoraproject.org/tests/gzip.git +execute: + how: tmt From 9a8ea3ff146926fda8e971e72aa681aefad83544 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 28 Jun 2023 09:33:10 +0200 Subject: [PATCH 29/40] Remove the tests folder Using the test suite from rhel instead --- tests/.gitignore | 2 -- tests/test-simple | 11 ----------- tests/test_simple.yml | 32 -------------------------------- tests/tests.yml | 1 - 4 files changed, 46 deletions(-) delete mode 100644 tests/.gitignore delete mode 100644 tests/test-simple delete mode 100644 tests/test_simple.yml delete mode 100644 tests/tests.yml diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 8793994..0000000 --- a/tests/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.swp -*.retry diff --git a/tests/test-simple b/tests/test-simple deleted file mode 100644 index 278d622..0000000 --- a/tests/test-simple +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -ex - -# exercise installed gzip/gunzip programs -echo "Bla" > bla.file -cp bla.file bla.file.orig -gzip bla.file -gunzip bla.file.gz -cmp bla.file bla.file.orig -echo "hi" -rm bla.file bla.file.orig diff --git a/tests/test_simple.yml b/tests/test_simple.yml deleted file mode 100644 index 37fdd70..0000000 --- a/tests/test_simple.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- hosts: localhost - vars: - - artifacts: ./artifacts - tags: - - atomic - - classic - - container - remote_user: root - tasks: - - name: Create the folder where we will store the tests - action: file state=directory path={{ item }} - owner=root group=root - with_items: - - /usr/local/bin - - - name: Install the test files - copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} - mode=0755 - with_items: - - {file: test-simple, dest: test-simple } - - - block: - - name: Execute the tests - shell: exec > /tmp/test.log && /usr/local/bin/test-simple 2>&1 - - - always: - - name: Pull out the logs - fetch: - dest: "{{ artifacts }}/" - src: "/tmp/test.log" - flat: yes diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 8a6aab3..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- include: test_simple.yml From f90cc164955f6de92b6d8884c64cc5311bf8393e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 06:04:56 +0000 Subject: [PATCH 30/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 3c5c566..66ab5b7 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.12 -Release: 4%{?dist} +Release: 5%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Apr 13 2023 Lukáš Zaoral - 1.12-4 - migrate to SPDX license format From 6aab49deb09b9f279624f26693b20bb63d804258 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 2 Aug 2023 10:23:56 +0200 Subject: [PATCH 31/40] Enable the s390x optimizations Resolves: rhbz#2175699 --- gzip.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 66ab5b7..1066029 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.12 -Release: 5%{?dist} +Release: 6%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -49,7 +49,12 @@ export CPPFLAGS="-DHAVE_LSTAT" export CC="%{__cc}" export CPP="%{__cpp}" export CXX="%{__cxx}" +%ifarch s390x +export CFLAGS="$RPM_OPT_FLAGS -DDFLTCC_LEVEL_MASK=0x7e" +%configure --enable-dfltcc +%else %configure +%endif make %check make check @@ -80,6 +85,10 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Wed Aug 02 2023 Jakub Martisko - 1.12-6 +- Enbale the s390x optimizations +Resolves: rhbz#2175699 + * Thu Jul 20 2023 Fedora Release Engineering - 1.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 893709343d1dbbb340277fd917c872f3a7c76c3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 21:55:09 +0000 Subject: [PATCH 32/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 1066029..e9c83c5 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.12 -Release: 6%{?dist} +Release: 7%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -85,6 +85,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 1.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Aug 02 2023 Jakub Martisko - 1.12-6 - Enbale the s390x optimizations Resolves: rhbz#2175699 From d37308f13235ab9db544257740db8e0a0cb9bd34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 21:28:45 +0000 Subject: [PATCH 33/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index e9c83c5..df7212b 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.12 -Release: 7%{?dist} +Release: 8%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -85,6 +85,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 1.12-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3407b65673d7248b71716005159a3b84051d8544 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 1 Feb 2024 11:17:39 +0100 Subject: [PATCH 34/40] Update to gzip-1.13 --- .gitignore | 1 + gzip.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 653a7cc..d53c255 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gzip-1.4.tar.xz /gzip-1.10.tar.xz /gzip-1.11.tar.xz /gzip-1.12.tar.xz +/gzip-1.13.tar.xz diff --git a/gzip.spec b/gzip.spec index df7212b..0573681 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip -Version: 1.12 -Release: 8%{?dist} +Version: 1.13 +Release: 1%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -50,7 +50,8 @@ export CC="%{__cc}" export CPP="%{__cpp}" export CXX="%{__cxx}" %ifarch s390x -export CFLAGS="$RPM_OPT_FLAGS -DDFLTCC_LEVEL_MASK=0x7e" +export CFLAGS="$RPM_OPT_FLAGS -Dalignas=_Alignas -DDFLTCC_LEVEL_MASK=0x7e" +#use this in the next realease after gzip 1.13 export CFLAGS="$RPM_OPT_FLAGS -DDFLTCC_LEVEL_MASK=0x7e" %configure --enable-dfltcc %else %configure @@ -85,6 +86,12 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Feb 01 2024 Jakub Martisko - 1.13-1 +- Rebase to gzip 1.13 +- There's a bug on s390x: https://lists.gnu.org/archive/html/bug-gzip/2023-10/msg00000.html +- Revert the s390x build options in the next release +Resolves: rhbz#2232890 + * Wed Jan 24 2024 Fedora Release Engineering - 1.12-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 3aad54d..5d79e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.12.tar.xz) = 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24 +SHA512 (gzip-1.13.tar.xz) = e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c From 25143454f9cdaf927fd52b442605e966c8976c4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:03:01 +0000 Subject: [PATCH 35/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 0573681..1d55de7 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.13 -Release: 1%{?dist} +Release: 2%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -86,6 +86,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Feb 01 2024 Jakub Martisko - 1.13-1 - Rebase to gzip 1.13 - There's a bug on s390x: https://lists.gnu.org/archive/html/bug-gzip/2023-10/msg00000.html From 4285f8ea22845a13f46c845a064bf4aaaa72d85e Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Mon, 2 Dec 2024 15:55:27 +0100 Subject: [PATCH 36/40] Spec: minor cleanup (unused patch) --- gzip.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/gzip.spec b/gzip.spec index 1d55de7..7239246 100644 --- a/gzip.spec +++ b/gzip.spec @@ -11,7 +11,6 @@ Source1: https://www.gnu.org/licenses/fdl-1.3.txt Source100: colorzgrep.csh Source101: colorzgrep.sh -Patch1: gnulib.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 @@ -39,7 +38,6 @@ very commonly used data compression program. %prep %setup -q -#%patch1 -p1 -b .gnulib cp %{SOURCE1} . autoreconf From 04e0cd154d08617070c7de1f7b07ae2d4c3794b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 05:42:45 +0000 Subject: [PATCH 37/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index 7239246..aad6147 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.13 -Release: 2%{?dist} +Release: 3%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -84,6 +84,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5ba0f55bf5a1b664353550b5590f751837bc1011 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:52:47 +0000 Subject: [PATCH 38/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gzip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gzip.spec b/gzip.spec index aad6147..26b18ca 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip Version: 1.13 -Release: 3%{?dist} +Release: 4%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -84,6 +84,9 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 61b4e3dd1e0a36d9e0f7ad477ac62752b6e454f6 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 14 Aug 2025 16:31:51 +0200 Subject: [PATCH 39/40] Rebase to gzip 1.14 - There are some issues when the s390x optimizations are turned on - the hufts test fails - This will need some further investigation, for the time, I've disabled the optimizations --- gzip.spec | 20 ++++++++++++++++---- s390_errno.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 s390_errno.patch diff --git a/gzip.spec b/gzip.spec index 26b18ca..3247385 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,7 +1,7 @@ Summary: GNU data compression program Name: gzip -Version: 1.13 -Release: 4%{?dist} +Version: 1.14 +Release: 1%{?dist} # info pages are under GFDL license License: GPL-3.0-or-later AND GFDL-1.3-only Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz @@ -11,6 +11,7 @@ Source1: https://www.gnu.org/licenses/fdl-1.3.txt Source100: colorzgrep.csh Source101: colorzgrep.sh +Patch1: s390_errno.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 @@ -38,6 +39,8 @@ very commonly used data compression program. %prep %setup -q +%patch 1 -p1 + cp %{SOURCE1} . autoreconf @@ -48,9 +51,13 @@ export CC="%{__cc}" export CPP="%{__cpp}" export CXX="%{__cxx}" %ifarch s390x -export CFLAGS="$RPM_OPT_FLAGS -Dalignas=_Alignas -DDFLTCC_LEVEL_MASK=0x7e" + +#When the otpimizations are enabled, the huft test fails as of F44/gzip1.14 +#export CFLAGS="$RPM_OPT_FLAGS -Dalignas=_Alignas -DDFLTCC_LEVEL_MASK=0x7e" #use this in the next realease after gzip 1.13 export CFLAGS="$RPM_OPT_FLAGS -DDFLTCC_LEVEL_MASK=0x7e" -%configure --enable-dfltcc +#%configure --enable-dfltcc + +%configure %else %configure %endif @@ -84,6 +91,11 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %{profiledir}/* %changelog +* Thu Aug 14 2025 Jakub Martisko - 1.14-1 +- Rebase to gzip 1.14 +- There are some issues when the s390x optimizations are turned on - the hufts test fails +- This will need some further investigation, for the time, I've disabled the optimizations + * Thu Jul 24 2025 Fedora Release Engineering - 1.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/s390_errno.patch b/s390_errno.patch new file mode 100644 index 0000000..73ba47f --- /dev/null +++ b/s390_errno.patch @@ -0,0 +1,26 @@ +From c76affb4551630ff661ac1c1ee99353a17eb16e1 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 30 May 2025 12:31:04 -0700 +Subject: gzip: fix s390x build failure + +Problem reported by Jakub Martisko . +* dfltcc.c: Include errno.h. +--- + dfltcc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dfltcc.c b/dfltcc.c +index 9f86581..8307a97 100644 +--- a/dfltcc.c ++++ b/dfltcc.c +@@ -17,6 +17,7 @@ + + #include + ++#include + #include + + #ifdef HAVE_SYS_SDT_H +-- +cgit v1.2.3 + From 176a9b412f80c1d19b07f24133d044231645b5b2 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 14 Aug 2025 16:53:00 +0200 Subject: [PATCH 40/40] updated sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d53c255..ad68e32 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ gzip-1.4.tar.xz /gzip-1.11.tar.xz /gzip-1.12.tar.xz /gzip-1.13.tar.xz +/gzip-1.14.tar.xz diff --git a/sources b/sources index 5d79e70..6561239 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.13.tar.xz) = e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c +SHA512 (gzip-1.14.tar.xz) = 82aef53188b3e69b51b7ddab5b8c44a11a5b73c0039b22a315a0c7d244694feab0146748add4265901eb1b4c0cee8a9eb69594995f098830d964091af97079c5