.gitignore

@@ -1 +1 @@
-SOURCES/gzip-1.12.tar.xz
+SOURCES/gzip-1.13.tar.xz

.gzip.metadata

@@ -1 +1 @@
-318107297587818c8f1e1fbb55962f4b2897bc0b SOURCES/gzip-1.12.tar.xz
+a793e107a54769576adc16703f97c39ee7afdd4e SOURCES/gzip-1.13.tar.xz

SOURCES/gzexe.patch

@@ -1,66 +0,0 @@
-From 21cd963565a43dabd59516bd4cca5c76a614f255 Mon Sep 17 00:00:00 2001
-From: Jakub Martisko <jamartis@redhat.com>
-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
-@@ -201,7 +201,7 @@ EOF
- 
-   else
-     # decompression
--    skip=44
-+    skip=49
-     skip_line=`LC_ALL=C 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 <https://www.gnu.org/licenses/>.
- 
- 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 <<EOF > 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
-

SPECS/gzip.spec

@@ -1,10 +1,10 @@
-Summary: The GNU data compression program
+Summary: GNU data compression program
 Name: gzip
-Version: 1.12
+Version: 1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 # info pages are under GFDL license
-License: GPLv3+ and GFDL
+License: GPL-3.0-or-later AND GFDL-1.3-only
-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)
@@ -12,11 +12,10 @@ 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
-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.
@@ -41,7 +40,6 @@ very commonly used data compression program.
 %prep
 %setup -q
 #%patch1 -p1 -b .gnulib
-%patch2 -p1 -b .gzexe
 cp %{SOURCE1} .
 autoreconf
 
@@ -51,20 +49,19 @@ export CPPFLAGS="-DHAVE_LSTAT"
 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
 %endif
-
 make
+%check
 make check
 #make gzip.info
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
 
 gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info*
@@ -72,7 +69,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,7 +79,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}/*/*
@@ -90,26 +86,55 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir}
 %{profiledir}/*
 
 %changelog
-* Fri Apr 22 2022 Jakub Martisko <jamartis@redhat.com> - 1.12-1
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.13-2
-- Rebase to gzip 1.12
+- Rebuilt for MSVSphere 10
-- Resolves an arbitrary-file-write vulnerability in zgrep
+
-  Resolves: rhbz#2073343
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.13-2
-  Resolves: rhbz#1870675
+- Bump release for June 2024 mass rebuild
+
+* Thu Feb 01 2024 Jakub Martisko <jamartis@redhat.com> - 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 <releng@fedoraproject.org> - 1.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10-8
+* Wed Aug 02 2023 Jakub Martisko <jamartis@redhat.com> - 1.12-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Enbale the s390x optimizations
-  Related: rhbz#1991688
+Resolves: rhbz#2175699
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Apr 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 1.12-4
+- migrate to SPDX license format
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Apr 11 2022 Jakub Martisko <jamartis@redhat.com> - 1.12-1
+- Rebase to gzip 1.12
+Resolves: rhbz#2073133
+Resolves: CVE-2022-1271
 
-* Fri Jul 30 2021 Jakub Martisko <jamartis@redhat.com> - 1.10-7
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-2
-- Add the ibm patches dealing with s390x optimizations
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-Resolves: rhbz#1986357
 
-* Fri Jul 30 2021 Jakub Martisko <jamartis@redhat.com> - 1.10-6
+* Thu Oct 21 2021 Jakub Martisko <jamartis@redhat.com> - 1.11-1
-- Add gating tests
+- Rebase to gzip 1.11
-Resolves: rhbz#1986357
+- Run the tests in the check section instead of the build section
+Resolve: rhbz#2001025
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10-5
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild