Compare commits
No commits in common. "c9" and "c8s" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/zip30.tar.gz
|
/zip30.tar.gz
|
||||||
|
@ -1 +0,0 @@
|
|||||||
c9f4099ecf2772b53c2dd4a8e508064ce015d182 SOURCES/zip30.tar.gz
|
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-8
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
|||||||
|
SHA512 (zip30.tar.gz) = c1c3d62bf1426476c0f9919b568013d6d7b03514912035f09ee283226d94c978791ad2af5310021e96c4c2bf320bfc9d0b8f4045c48e4667e034d98197e1a9b3
|
24
zip-3.0-covscan1.patch
Normal file
24
zip-3.0-covscan1.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From b0b6660d474738a23e6ef84afadd4f87793e3ad0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
Date: Tue, 13 Nov 2018 12:57:13 +0100
|
||||||
|
Subject: [PATCH] XXX
|
||||||
|
|
||||||
|
---
|
||||||
|
zip.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/zip.h b/zip.h
|
||||||
|
index ba03160..d62de9a 100644
|
||||||
|
--- a/zip.h
|
||||||
|
+++ b/zip.h
|
||||||
|
@@ -609,7 +609,7 @@ extern int bflag;
|
||||||
|
void zipmessage_nl OF((ZCONST char *, int));
|
||||||
|
void zipmessage OF((ZCONST char *, ZCONST char *));
|
||||||
|
void zipwarn OF((ZCONST char *, ZCONST char *));
|
||||||
|
-void ziperr OF((int, ZCONST char *));
|
||||||
|
+void ziperr OF((int, ZCONST char *)) __attribute__ ((noreturn));
|
||||||
|
#ifdef UTIL
|
||||||
|
# define error(msg) ziperr(ZE_LOGIC, msg)
|
||||||
|
#else
|
||||||
|
--
|
||||||
|
2.17.2
|
@ -1,8 +1,9 @@
|
|||||||
Summary: A file compression and packaging utility compatible with PKZIP
|
Summary: A file compression and packaging utility compatible with PKZIP
|
||||||
Name: zip
|
Name: zip
|
||||||
Version: 3.0
|
Version: 3.0
|
||||||
Release: 35%{?dist}
|
Release: 23%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
|
Group: Applications/Archiving
|
||||||
Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
|
Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
|
||||||
URL: http://www.info-zip.org/Zip.html
|
URL: http://www.info-zip.org/Zip.html
|
||||||
|
|
||||||
@ -17,10 +18,12 @@ Patch4: man.patch
|
|||||||
Patch5: zip-3.0-format-security.patch
|
Patch5: zip-3.0-format-security.patch
|
||||||
Patch6: zipnote.patch
|
Patch6: zipnote.patch
|
||||||
Patch7: zip-3.0-configure.patch
|
Patch7: zip-3.0-configure.patch
|
||||||
BuildRequires: make
|
Patch8: zip-3.0-covscan1.patch
|
||||||
BuildRequires: bzip2-devel, gcc
|
BuildRequires: bzip2-devel
|
||||||
Requires: unzip
|
Requires: unzip
|
||||||
|
|
||||||
|
%global _hardened_build 1
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The zip program is a compression and file packaging utility. Zip is
|
The zip program is a compression and file packaging utility. Zip is
|
||||||
analogous to a combination of the UNIX tar and compress commands and
|
analogous to a combination of the UNIX tar and compress commands and
|
||||||
@ -38,15 +41,11 @@ program.
|
|||||||
%patch4 -p1 -b .man
|
%patch4 -p1 -b .man
|
||||||
%patch5 -p1 -b .format-security
|
%patch5 -p1 -b .format-security
|
||||||
%patch6 -p1 -b .zipnote
|
%patch6 -p1 -b .zipnote
|
||||||
%patch7 -p1
|
%patch7 -p1 -b .zipconfigure
|
||||||
|
%patch8 -p1 -b .covscan1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#Remove assembly file to force the c implementation of the crc functions
|
make -f unix/Makefile generic_gcc refix=%{_prefix} LFLAGS2="$RPM_LD_FLAGS" CFLAGS_NOOPT="-I. -DUNIX $RPM_OPT_FLAGS" %{?_smp_mflags}
|
||||||
#Related to 3.0-33 and 3.0-34
|
|
||||||
rm crc_i386.S
|
|
||||||
rm match.S
|
|
||||||
|
|
||||||
make -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX -DNO_ASM $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}" generic_gcc %{?_smp_mflags}
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||||
@ -69,55 +68,16 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
|
|||||||
%{_mandir}/man1/zipsplit.1*
|
%{_mandir}/man1/zipsplit.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Feb 14 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-35
|
* Tue Nov 13 2018 Jakub Martisko <jamartis@redhat.com> - 3.0-23
|
||||||
- Fix the annocheck issus from 3-0-33 without reintroducing the regression from 3.0-34
|
- Set the ziperr function as noreturn
|
||||||
Related: rhbz#2162688
|
- Fix email in the previous chnagelog entry
|
||||||
|
- Related: #1602741
|
||||||
|
|
||||||
* Tue Jan 31 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-34
|
* Fri Oct 19 2018 Jakub Martisko <jamartis@redhat.com> - 3.0-22
|
||||||
- Fix the regression introduced in 3.0-33 that caused some of the zip build flags to be dropped
|
- Add missing linker flags
|
||||||
Resolves: rhbz#2162688
|
- Port the configure patch from unzip that allows linker flags configuration
|
||||||
|
from the spec file
|
||||||
* Tue Feb 15 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-33
|
- Related: #1624188
|
||||||
- Disable the asm implementation of some functions and use the C instead
|
|
||||||
- This should fix some of the annocheck issues
|
|
||||||
Related: rhbz#2044902
|
|
||||||
|
|
||||||
* Thu Feb 03 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-32
|
|
||||||
- Enable gating tests
|
|
||||||
Related: rhbz#2049738
|
|
||||||
|
|
||||||
* Wed Feb 02 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-31
|
|
||||||
- Add the missing linker flags
|
|
||||||
- Add the patch that allows to configure the linker flags from the spec file
|
|
||||||
Resolves: rhbz #2044902
|
|
||||||
|
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-30
|
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-29
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-28
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-27
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-26
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-25
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-24
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-23
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Mar 01 2018 Jakub Martisko <jamartis@redhat.com> - 3.0-22
|
|
||||||
- Add gcc to buildrequires
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-21
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-21
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
Loading…
Reference in New Issue
Block a user