Compare commits

...
Sign in to create a new pull request.

31 commits

Author SHA1 Message Date
Jakub Martisko
176a9b412f updated sources 2025-08-14 16:53:00 +02:00
Jakub Martisko
61b4e3dd1e 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
2025-08-14 16:31:51 +02:00
Fedora Release Engineering
5ba0f55bf5 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 16:52:47 +00:00
Fedora Release Engineering
04e0cd154d Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 05:42:45 +00:00
Jakub Martisko
4285f8ea22 Spec: minor cleanup (unused patch) 2024-12-02 15:55:27 +01:00
Fedora Release Engineering
25143454f9 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 09:03:01 +00:00
Jakub Martisko
3407b65673 Update to gzip-1.13 2024-02-01 11:53:54 +01:00
Fedora Release Engineering
d37308f132 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 21:28:45 +00:00
Fedora Release Engineering
893709343d Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-20 21:55:09 +00:00
Jakub Martisko
6aab49deb0 Enable the s390x optimizations
Resolves: rhbz#2175699
2023-08-02 14:22:59 +02:00
Fedora Release Engineering
f90cc16495 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 06:04:56 +00:00
Jakub Martisko
9a8ea3ff14 Remove the tests folder
Using the test suite from rhel instead
2023-06-28 09:33:10 +02:00
Jakub Martisko
1b5c09a0f2 initialize testsuite from /tests/gzip 2023-06-27 17:15:15 +02:00
Lukáš Zaoral
06a2222faa
migrate to SPDX license format 2023-04-13 14:36:38 +02:00
Fedora Release Engineering
65fabc4c3c Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 11:57:50 +00:00
Fedora Release Engineering
dc86972464 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 13:27:31 +00:00
Jakub Martisko
2f8bac725f Rebase to gzip 1.12 2022-04-11 15:13:21 +02:00
Fedora Release Engineering
e8954127bb - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 12:10:32 +00:00
Jakub Martisko
3ed6b7def3 Rebase to gzip 1.11
Resolves: rhbz#2001025
2021-10-21 16:49:45 +02:00
Fedora Release Engineering
de64edeca2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 07:28:07 +00:00
Jakub Martiško
c23527ad75 Merge #3 Spec file cleanup 2021-03-04 13:01:52 +00:00
Fedora Release Engineering
05a19f65cc - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 13:19:44 +00:00
Robert Scheck
88ae7a2a11 Spec file cleanup 2021-01-18 00:58:41 +00:00
Tom Stellard
4b26f44dad Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-19 00:21:04 +00:00
Fedora Release Engineering
acd220d425 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 00:44:26 +00:00
Fedora Release Engineering
67c4b9aa8a - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 04:05:19 +00:00
Jakub Martisko
7b5215a96d Rebase to gzip-1.10 2019-08-09 09:06:54 +02:00
Fedora Release Engineering
be911d929e - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 08:14:40 +00:00
Jakub Martisko
0cf888ad48 Fix: wrong skip value in gzexe; enable make check
Related: 1690825
2019-03-27 09:55:57 +01:00
Fedora Release Engineering
f1591ea411 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 02:03:50 +00:00
Igor Gnatenko
a0288acc0f Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:07 +01:00
10 changed files with 146 additions and 60 deletions

1
.fmf/version Normal file
View file

@ -0,0 +1 @@
1

5
.gitignore vendored
View file

@ -4,3 +4,8 @@ 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
/gzip-1.11.tar.xz
/gzip-1.12.tar.xz
/gzip-1.13.tar.xz
/gzip-1.14.tar.xz

120
gzip.spec
View file

@ -1,27 +1,27 @@
Summary: The GNU data compression program
Summary: GNU data compression program
Name: gzip
Version: 1.9
Release: 7%{?dist}
Version: 1.14
Release: 1%{?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
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
# downstream solution for coloured z*grep (#1034839)
Source100: colorzgrep.csh
Source101: colorzgrep.sh
Patch1: gnulib.patch
Patch1: s390_errno.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.
Requires: coreutils
BuildRequires: texinfo, gcc
BuildRequires: texinfo, gcc, autoconf, automake, less
BuildRequires: make
Conflicts: filesystem < 3
Provides: /bin/gunzip
Provides: /bin/gzip
@ -39,8 +39,10 @@ very commonly used data compression program.
%prep
%setup -q
%patch1 -p1 -b .gnulib
%patch 1 -p1
cp %{SOURCE1} .
autoreconf
%build
export DEFS="NO_ASM"
@ -48,12 +50,23 @@ 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*
@ -61,7 +74,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
@ -71,7 +84,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}/*/*
@ -79,6 +91,88 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir}
%{profiledir}/*
%changelog
* Thu Aug 14 2025 Jakub Martisko <jamartis@redhat.com> - 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 <releng@fedoraproject.org> - 1.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_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
* Wed Aug 02 2023 Jakub Martisko <jamartis@redhat.com> - 1.12-6
- Enbale the s390x optimizations
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
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Oct 21 2021 Jakub Martisko <jamartis@redhat.com> - 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 <releng@fedoraproject.org> - 1.10-5
- 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
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Aug 09 2019 Jakub Martisko <jamartis@redhat.com> - 1.10-1
- Rebase to 1.10
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Mar 26 2019 Jakub Martisko <jamartis@redhat.com> - 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 <releng@fedoraproject.org> - 1.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 26 2018 Jakub Martisko <jamartis@redhat.com> - 1.9-7
- Fix FTBFS bug (gnulib problems)
- more details: https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html

6
plans/all.fmf Normal file
View file

@ -0,0 +1,6 @@
summary: Basic smoke test
discover:
how: fmf
url: https://src.fedoraproject.org/tests/gzip.git
execute:
how: tmt

26
s390_errno.patch Normal file
View file

@ -0,0 +1,26 @@
From c76affb4551630ff661ac1c1ee99353a17eb16e1 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 30 May 2025 12:31:04 -0700
Subject: gzip: fix s390x build failure
Problem reported by Jakub Martisko <https://bugs.gnu.org/78618>.
* 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 <config.h>
+#include <errno.h>
#include <stdlib.h>
#ifdef HAVE_SYS_SDT_H
--
cgit v1.2.3

View file

@ -1 +1 @@
SHA512 (gzip-1.9.tar.xz) = c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
SHA512 (gzip-1.14.tar.xz) = 82aef53188b3e69b51b7ddab5b8c44a11a5b73c0039b22a315a0c7d244694feab0146748add4265901eb1b4c0cee8a9eb69594995f098830d964091af97079c5

2
tests/.gitignore vendored
View file

@ -1,2 +0,0 @@
*.swp
*.retry

View file

@ -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

View file

@ -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

View file

@ -1 +0,0 @@
- include: test_simple.yml