diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index ad68e32..b7935ef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,3 @@ 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 -/gzip-1.10.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/gnulib.patch b/gnulib.patch deleted file mode 100644 index 68e8d51..0000000 --- a/gnulib.patch +++ /dev/null @@ -1,189 +0,0 @@ -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 3247385..1cd052b 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,27 +1,26 @@ -Summary: GNU data compression program +Summary: The GNU data compression program Name: gzip -Version: 1.14 -Release: 1%{?dist} +Version: 1.8 +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 +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 # downstream solution for coloured z*grep (#1034839) Source100: colorzgrep.csh Source101: colorzgrep.sh -Patch1: s390_errno.patch - # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 -URL: https://www.gzip.org/ +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: coreutils -BuildRequires: texinfo, gcc, autoconf, automake, less -BuildRequires: make +Requires: /sbin/install-info +Requires: coreutils +BuildRequires: texinfo Conflicts: filesystem < 3 Provides: /bin/gunzip Provides: /bin/gzip @@ -39,10 +38,7 @@ very commonly used data compression program. %prep %setup -q -%patch 1 -p1 - cp %{SOURCE1} . -autoreconf %build export DEFS="NO_ASM" @@ -50,23 +46,13 @@ export CPPFLAGS="-DHAVE_LSTAT" export CC="%{__cc}" export CPP="%{__cpp}" export CXX="%{__cxx}" -%ifarch s390x - -#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 -%else -%configure -%endif + make -%check -make check #make gzip.info %install +rm -rf ${RPM_BUILD_ROOT} %makeinstall gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info* @@ -74,7 +60,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 @@ -82,8 +68,22 @@ 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 +%defattr(-,root,root) %doc NEWS README AUTHORS ChangeLog THANKS TODO +%{!?_licensedir:%global license %%doc} %license COPYING fdl-1.3.txt %{_bindir}/* %{_mandir}/*/* @@ -91,111 +91,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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) -- 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 - -* 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 - -* 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 - -* 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 - -* 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 @@ -235,7 +130,7 @@ Resolve: rhbz#2001025 * 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 diff --git a/plans/all.fmf b/plans/all.fmf deleted file mode 100644 index d5b1643..0000000 --- a/plans/all.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf - url: https://src.fedoraproject.org/tests/gzip.git -execute: - how: tmt diff --git a/s390_errno.patch b/s390_errno.patch deleted file mode 100644 index 73ba47f..0000000 --- a/s390_errno.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - diff --git a/sources b/sources index 6561239..b5f412d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gzip-1.14.tar.xz) = 82aef53188b3e69b51b7ddab5b8c44a11a5b73c0039b22a315a0c7d244694feab0146748add4265901eb1b4c0cee8a9eb69594995f098830d964091af97079c5 +f7caabb65cddc1a4165b398009bd05b9 gzip-1.8.tar.xz