From e7ad41198fa85fc438b24aa15d90f0beae3fc019 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 20 Jul 2021 15:25:37 +0000 Subject: [PATCH] import zip-3.0-23.el8 --- .gitignore | 1 + .zip.metadata | 1 + SOURCES/man.patch | 40 ++++ SOURCES/zip-3.0-configure.patch | 12 ++ SOURCES/zip-3.0-covscan1.patch | 24 +++ SOURCES/zip-3.0-currdir.patch | 12 ++ SOURCES/zip-3.0-exec-shield.patch | 20 ++ SOURCES/zip-3.0-format-security.patch | 20 ++ SOURCES/zip-3.0-time.patch | 11 + SOURCES/zipnote.patch | 13 ++ SPECS/zip.spec | 293 ++++++++++++++++++++++++++ 11 files changed, 447 insertions(+) create mode 100644 .gitignore create mode 100644 .zip.metadata create mode 100644 SOURCES/man.patch create mode 100644 SOURCES/zip-3.0-configure.patch create mode 100644 SOURCES/zip-3.0-covscan1.patch create mode 100644 SOURCES/zip-3.0-currdir.patch create mode 100644 SOURCES/zip-3.0-exec-shield.patch create mode 100644 SOURCES/zip-3.0-format-security.patch create mode 100644 SOURCES/zip-3.0-time.patch create mode 100644 SOURCES/zipnote.patch create mode 100644 SPECS/zip.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d0ccde --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/zip30.tar.gz diff --git a/.zip.metadata b/.zip.metadata new file mode 100644 index 0000000..b116c97 --- /dev/null +++ b/.zip.metadata @@ -0,0 +1 @@ +c9f4099ecf2772b53c2dd4a8e508064ce015d182 SOURCES/zip30.tar.gz diff --git a/SOURCES/man.patch b/SOURCES/man.patch new file mode 100644 index 0000000..9ba44c8 --- /dev/null +++ b/SOURCES/man.patch @@ -0,0 +1,40 @@ +--- ./man/zipsplit.1 2008-05-08 10:17:48.000000000 +0200 ++++ ./man/zipsplit.1 2013-04-26 18:33:12.492008280 +0200 +@@ -12,6 +12,7 @@ + .RB [ \-r\ room ] + .RB [ \-b\ path ] + .RB [ \-h ] ++.RB [ \-q ] + .RB [ \-v ] + .RB [ \-L ] + zipfile +@@ -47,6 +48,9 @@ + .BI \-h + Show a short help. + .TP ++.BI \-q ++Suppress some informational messages. ++.TP + .BI \-v + Show version information. + .TP +--- ./man/zipnote.1 2013-04-26 18:40:32.145018756 +0200 ++++ ./man/zipnote.1 2013-04-26 18:40:18.943018442 +0200 +@@ -7,6 +7,7 @@ + .RB [ \-w ] + .RB [ \-b\ path ] + .RB [ \-h ] ++.RB [ \-q ] + .RB [ \-v ] + .RB [ \-L ] + zipfile +@@ -27,6 +28,9 @@ + .BI \-h + Show a short help. + .TP ++.BI \-q ++Suppress some informational messages. ++.TP + .BI \-v + Show version information. + .TP diff --git a/SOURCES/zip-3.0-configure.patch b/SOURCES/zip-3.0-configure.patch new file mode 100644 index 0000000..f2bdf86 --- /dev/null +++ b/SOURCES/zip-3.0-configure.patch @@ -0,0 +1,12 @@ +diff -up zip30/unix/configure.nostrip zip30/unix/configure +--- zip30/unix/configure.nostrip 2009-11-30 10:18:09.000000000 +0100 ++++ zip30/unix/configure 2009-11-30 10:21:08.354264213 +0100 +@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS} + CC=${1-cc} + CFLAGS=${2-"-I. -DUNIX"} + LFLAGS1='' +-LFLAGS2='' ++LFLAGS2="${LFLAGS2}" + LN="ln -s" + + CFLAGS_OPT='' diff --git a/SOURCES/zip-3.0-covscan1.patch b/SOURCES/zip-3.0-covscan1.patch new file mode 100644 index 0000000..30c5847 --- /dev/null +++ b/SOURCES/zip-3.0-covscan1.patch @@ -0,0 +1,24 @@ +From b0b6660d474738a23e6ef84afadd4f87793e3ad0 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +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 \ No newline at end of file diff --git a/SOURCES/zip-3.0-currdir.patch b/SOURCES/zip-3.0-currdir.patch new file mode 100644 index 0000000..40da32e --- /dev/null +++ b/SOURCES/zip-3.0-currdir.patch @@ -0,0 +1,12 @@ +diff -up zip30/util.c.currdir zip30/util.c +--- zip30/util.c.currdir 2009-11-16 12:42:17.783961701 +0100 ++++ zip30/util.c 2009-11-16 12:42:58.185960707 +0100 +@@ -493,6 +493,8 @@ int cs; /* force case-se + /* Compare the sh pattern p with the string s and return true if they match, + false if they don't or if there is a syntax error in the pattern. */ + { ++ while (s[0] == '.' && s[1] == '/') ++ s += 2; /* strip redundant leading "./" sections */ + return recmatch(p, s, cs) == 1; + } + diff --git a/SOURCES/zip-3.0-exec-shield.patch b/SOURCES/zip-3.0-exec-shield.patch new file mode 100644 index 0000000..05c1a6c --- /dev/null +++ b/SOURCES/zip-3.0-exec-shield.patch @@ -0,0 +1,20 @@ +diff -up zip30/crc_i386.S.exec_shield zip30/crc_i386.S +--- zip30/crc_i386.S.exec_shield 2009-11-13 18:37:45.000000000 +0100 ++++ zip30/crc_i386.S 2009-11-13 18:39:54.435390166 +0100 +@@ -302,3 +302,6 @@ _crc32: /* ulg c + #endif /* i386 || _i386 || _I386 || __i386 */ + + #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */ ++ ++.section .note.GNU-stack, "", @progbits ++.previous +diff -up zip30/match.S.exec_shield zip30/match.S +--- zip30/match.S.exec_shield 2005-01-28 10:40:14.000000000 +0100 ++++ zip30/match.S 2009-11-13 18:39:48.570389058 +0100 +@@ -405,3 +405,6 @@ L__return: + #endif /* i386 || _I386 || _i386 || __i386 */ + + #endif /* !USE_ZLIB */ ++ ++.section .note.GNU-stack, "", @progbits ++.previous diff --git a/SOURCES/zip-3.0-format-security.patch b/SOURCES/zip-3.0-format-security.patch new file mode 100644 index 0000000..54ce2e6 --- /dev/null +++ b/SOURCES/zip-3.0-format-security.patch @@ -0,0 +1,20 @@ +--- a/zip.c ++++ a/zip.c +@@ -1028,7 +1028,7 @@ local void help_extended() + + for (i = 0; i < sizeof(text)/sizeof(char *); i++) + { +- printf(text[i]); ++ printf("%s", text[i]); + putchar('\n'); + } + #ifdef DOS +@@ -1225,7 +1225,7 @@ local void version_info() + CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE); + for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++) + { +- printf(cryptnote[i]); ++ printf("%s", cryptnote[i]); + putchar('\n'); + } + ++i; /* crypt support means there IS at least one compilation option */ diff --git a/SOURCES/zip-3.0-time.patch b/SOURCES/zip-3.0-time.patch new file mode 100644 index 0000000..f72fd16 --- /dev/null +++ b/SOURCES/zip-3.0-time.patch @@ -0,0 +1,11 @@ +--- zip-2.31/unix/Makefile.time 2007-02-07 09:36:30.000000000 +0100 ++++ zip-2.31/unix/Makefile 2007-02-07 09:38:42.000000000 +0100 +@@ -24,7 +24,7 @@ + E = + + # probably can change this to 'install' if you have it +-INSTALL_PROGRAM = cp ++INSTALL_PROGRAM = cp -p + # probably can change this to 'install -d' if you have it + # XXX NextStep 3.3 and Openstep 4.x don't know about -p ! + INSTALL_D = mkdir -p diff --git a/SOURCES/zipnote.patch b/SOURCES/zipnote.patch new file mode 100644 index 0000000..4177a7d --- /dev/null +++ b/SOURCES/zipnote.patch @@ -0,0 +1,13 @@ +diff --git a/zipnote.c b/zipnote.c +index 5e02cb6..996f012 100644 +--- a/zipnote.c ++++ b/zipnote.c +@@ -661,7 +661,7 @@ char **argv; /* command line tokens */ + if ((r = zipcopy(z)) != ZE_OK) + ziperr(r, "was copying an entry"); + } +- fclose(x); ++ fclose(in_file); + + /* Write central directory and end of central directory with new comments */ + if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */ diff --git a/SPECS/zip.spec b/SPECS/zip.spec new file mode 100644 index 0000000..b483b33 --- /dev/null +++ b/SPECS/zip.spec @@ -0,0 +1,293 @@ +Summary: A file compression and packaging utility compatible with PKZIP +Name: zip +Version: 3.0 +Release: 23%{?dist} +License: BSD +Group: Applications/Archiving +Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz +URL: http://www.info-zip.org/Zip.html + +# This patch will probably be merged to zip 3.1 +# http://www.info-zip.org/board/board.pl?m-1249408491/ +Patch1: zip-3.0-exec-shield.patch +# Not upstreamed. +Patch2: zip-3.0-currdir.patch +# Not upstreamed. +Patch3: zip-3.0-time.patch +Patch4: man.patch +Patch5: zip-3.0-format-security.patch +Patch6: zipnote.patch +Patch7: zip-3.0-configure.patch +Patch8: zip-3.0-covscan1.patch +BuildRequires: bzip2-devel +Requires: unzip + +%global _hardened_build 1 + +%description +The zip program is a compression and file packaging utility. Zip is +analogous to a combination of the UNIX tar and compress commands and +is compatible with PKZIP (a compression and file packaging utility for +MS-DOS systems). + +Install the zip package if you need to compress files using the zip +program. + +%prep +%setup -q -n zip30 +%patch1 -p1 -b .exec-shield +%patch2 -p1 -b .currdir +%patch3 -p1 -b .time +%patch4 -p1 -b .man +%patch5 -p1 -b .format-security +%patch6 -p1 -b .zipnote +%patch7 -p1 -b .zipconfigure +%patch8 -p1 -b .covscan1 + +%build +make -f unix/Makefile generic_gcc refix=%{_prefix} LFLAGS2="$RPM_LD_FLAGS" CFLAGS_NOOPT="-I. -DUNIX $RPM_OPT_FLAGS" %{?_smp_mflags} + +%install +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 + +make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \ + MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install + +%files +%license LICENSE +%doc README CHANGES TODO WHATSNEW WHERE README.CR +%doc proginfo/algorith.txt +%{_bindir}/zipnote +%{_bindir}/zipsplit +%{_bindir}/zip +%{_bindir}/zipcloak +%{_mandir}/man1/zip.1* +%{_mandir}/man1/zipcloak.1* +%{_mandir}/man1/zipnote.1* +%{_mandir}/man1/zipsplit.1* + +%changelog +* Tue Nov 13 2018 Jakub Martisko - 3.0-23 +- Set the ziperr function as noreturn +- Fix email in the previous chnagelog entry +- Related: #1602741 + +* Fri Oct 19 2018 Jakub Martisko - 3.0-22 +- Add missing linker flags +- Port the configure patch from unzip that allows linker flags configuration + from the spec file +- Related: #1624188 + +* Fri Feb 09 2018 Fedora Release Engineering - 3.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Stephen Gallagher - 3.0-17 +- Add missing %%license macro + +* Fri Feb 05 2016 Fedora Release Engineering - 3.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 26 2015 Petr Stodulka - 3.0-15 +- Added requirement for unzip (#1235956) + +* Fri Jun 19 2015 Fedora Release Engineering - 3.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jan 28 2015 Petr Stodulka - 3.0-13 +- fix crashing zipnote when editing .zip files (#1179420) + +* Mon Aug 18 2014 Fedora Release Engineering - 3.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Apr 1 2014 Peter Robinson 3.0-10 +- Add patch to fix format-security FTBFS (RHBZ 1037412) + +* Sun Aug 04 2013 Fedora Release Engineering - 3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 26 2013 Michal Luscon - 3.0-8 +- Fix missing -q option in zipsplit and zipnote man pages + +* Sat Feb 23 2013 Ville Skyttä - 3.0-7 +- Enable bzip2 support. +- Fix bogus date in %%changelog. + +* Fri Feb 15 2013 Fedora Release Engineering - 3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon May 24 2010 Karel Klic - 3.0-2 +- Removed BuildRoot tag +- Removed %%clean section +- Removed trailing whitespaces in the spec file + +* Fri Nov 13 2009 Karel Klic - 3.0-1 +- New upstream version +- Removed zip23.patch, because ZMEM is not used anyway +- Removed zip-2.31-install.patch, problem solved in upstream +- Removed zip23-umask.patch, upstream uses mkstemp which solves the problem +- Removed zip-2.31-near-4GB.patch, because upstream version + handles large files well +- Removed zip-2.31-configure.patch, configure is better in the current version +- Removed zip-2.3-sf.patch, the error message doesn't exist in upstream anymore +- Removed zip-2.31-umask_mode.patch, which fixes also removed near-4GB patch +- Updated zip-2.31-time.patch for zip 3.0 +- Updated exec-shield.patch for zip 3.0 +- Updated zip-2.3-currdir.patch for zip 3.0 + +* Mon Jul 27 2009 Fedora Release Engineering - 2.31-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.31-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 20 2008 Fedora Release Engineering - 2.31-6 +- Autorebuild for GCC 4.3 + +* Wed Nov 14 2007 Ivana Varekova - 2.31-5 +- add S_IWOTH option + +* Mon Nov 5 2007 Ivana Varekova - 2.31-4 +- fix "zip does not honor umask setting when creating archives" +- fix "zip segfaults by attempt to archive big file" +- spec file cleanup + +* Wed Feb 7 2007 Ivana Varekova - 2.31-3 +- incorporate the next peckage review comment + +* Tue Feb 6 2007 Ivana Varekova - 2.31-2 +- incorporate the package review + +* Wed Jul 12 2006 Jesse Keating - 2.31-1.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 2.31-1.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.31-1.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Nov 10 2005 Ivana Varekova 2.31-1 +- update to 2.31 + +* Mon Mar 7 2005 Ivana Varekova 2.3-30 +- rebuilt + +* Mon Jan 17 2005 Ivana Varekova 2.3-29 +- Fix bug #142237 - problem with -d and ./files containing archives + +* Mon Jun 21 2004 Lon Hohberger 2.3-24 +- Extend max file/archive size to 2^32-8193 (4294959103) bytes +- Include better debugging output for configure script + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Lon Hohberger 2.3-22 +- Fix typos + +* Tue Feb 17 2004 Lon Hohberger 2.3-21 +- Include LICENSE file per bugzilla #116004 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Dec 22 2003 Lon Hohberger 2.3-19 +- Make temp file have umask 0066 mode (#112516) + +* Fri Oct 24 2003 Lon Hohberger 2.3-18 +- Incorporate Arjan's exec-shield patch for i386 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 19 2002 Tim Powers +- bump and rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 2 2002 Trond Eivind Glomsrød +- Don't strip explicitly + +* Wed Mar 13 2002 Trond Eivind Glomsrød 2.3-11 +- Add URL + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Aug 25 2000 Bill Nottingham +- add encryption code (#16878) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 11 2000 Bill Nottingham +- rebuild in new environment + +* Mon Mar 13 2000 Bill Nottingham +- spec file cleanups (#10143) + +* Mon Feb 7 2000 Bill Nottingham +- fix some perms + +* Wed Feb 02 2000 Cristian Gafton +- fix description +- man pages are compressed + +* Tue Jan 11 2000 Bill Nottingham +- update to 2.3 + +* Fri Jul 30 1999 Bill Nottingham +- update to 2.2 + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 8) + +* Thu Mar 18 1999 Cristian Gafton +- updated text in the spec file + +* Fri Jan 15 1999 Cristian Gafton +- patch top build on the arm + +* Mon Dec 21 1998 Michael Maher +- built package for 6.0 + +* Mon Aug 10 1998 Jeff Johnson +- build root + +* Fri May 08 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Jul 10 1997 Erik Troan +- built against glibc