From 704d1771cdcc278a1716b2e3c62c9714601e6d12 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Tue, 9 Nov 2004 02:51:49 +0000 Subject: [PATCH 01/85] auto-import changelog data from zziplib-0.13.36-1.1.fc2.fr.src.rpm //freshrpms.net/> 0.13.36-1 - Initial RPM release. --- .cvsignore | 1 + sources | 1 + zziplib.spec | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 zziplib.spec diff --git a/.cvsignore b/.cvsignore index e69de29..171c5a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zziplib-0.13.36.tar.bz2 diff --git a/sources b/sources index e69de29..0e32db4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +263f642825b8a9d56f7bfc26404e965d zziplib-0.13.36.tar.bz2 diff --git a/zziplib.spec b/zziplib.spec new file mode 100644 index 0000000..3537163 --- /dev/null +++ b/zziplib.spec @@ -0,0 +1,85 @@ +# $Id: zziplib.spec,v 1.1 2004/11/09 02:51:49 cvsextras Exp $ +# Authority: matthias + +Summary: Lightweight library to easily extract data from zip files +Name: zziplib +Version: 0.13.36 +Release: 1.1.fc2.fr +License: LGPL/MPL +Group: Applications/Archiving +URL: http://zziplib.sourceforge.net/ +Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig + +%description +The zziplib library is intentionally lightweight, it offers the ability to +easily extract data from files archived in a single zip file. Applications +can bundle files into a single zip archive and access them. The implementation +is based only on the (free) subset of compression with the zlib algorithm +which is actually used by the zip/unzip tools. + + +%package devel +Summary: Development files for the zziplib library +Group: Development/Libraries +Requires: %{name} = %{version}, pkgconfig, zlib-devel, SDL-devel + +%description devel +The zziplib library is intentionally lightweight, it offers the ability to +easily extract data from files archived in a single zip file. Applications +can bundle files into a single zip archive and access them. The implementation +is based only on the (free) subset of compression with the zlib algorithm +which is actually used by the zip/unzip tools. + +This package contains files required to build applications that will use the +zziplib library. + + +%prep +%setup + + +%build +%configure --enable-sdl +%{__make} %{?_smp_mflags} + + +%install +%{__rm} -rf %{buildroot} +%makeinstall + + +%clean +%{__rm} -rf %{buildroot} + + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + + +%files +%defattr(-, root, root, 0755) +%doc docs/COPYING* ChangeLog README TODO +%{_bindir}/* +%{_libdir}/*.so.* + +%files devel +%defattr(-, root, root, 0755) +%doc docs/README.SDL docs/*.htm +%{_includedir}/* +%{_libdir}/*.a +%exclude %{_libdir}/*.la +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%{_datadir}/aclocal/*.m4 +%{_datadir}/zziplib/ + + +%changelog +* Tue Jun 8 2004 Matthias Saou 0.13.36-1 +- Initial RPM release. + From 98d0e7c9137c0ebb4b55ccec16b09aa69ecd509d Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 16 Nov 2004 18:50:29 +0000 Subject: [PATCH 02/85] Actually add %changelog entry and remove that unneeded "Authority:". --- zziplib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 3537163..efcbe1d 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,10 +1,9 @@ -# $Id: zziplib.spec,v 1.1 2004/11/09 02:51:49 cvsextras Exp $ -# Authority: matthias +# $Id: zziplib.spec,v 1.2 2004/11/16 18:50:29 thias Exp $ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.36 -Release: 1.1.fc2.fr +Release: 2 License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -80,6 +79,9 @@ zziplib library. %changelog +* Tue Nov 16 2004 Matthias Saou 0.13.36-2 +- Bump release to provide Extras upgrade path. + * Tue Jun 8 2004 Matthias Saou 0.13.36-1 - Initial RPM release. From 5e001b31daad70fb8053595c391d56ca6d4eac9a Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 05:11:45 +0000 Subject: [PATCH 03/85] Fix braindead typo from the original import --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4f41f26..7d6607f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for source rpm: zziplib -# $Id$ +# $Id: Makefile,v 1.1 2004/11/09 02:51:47 cvsextras Exp $ NAME := zziplib SPECFILE = $(firstword $(wildcard *.spec)) @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) From 6bc9d4e616cbe53e7224df60a93c6882c2e9ea5c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 5 Apr 2005 09:04:05 +0000 Subject: [PATCH 04/85] Update to 0.13.38. --- .cvsignore | 2 +- sources | 2 +- zziplib.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 171c5a4..9aeafa4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zziplib-0.13.36.tar.bz2 +zziplib-0.13.38.tar.bz2 diff --git a/sources b/sources index 0e32db4..e208836 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -263f642825b8a9d56f7bfc26404e965d zziplib-0.13.36.tar.bz2 +3eccd9b39c057eb49652e90914abfdf5 zziplib-0.13.38.tar.bz2 diff --git a/zziplib.spec b/zziplib.spec index efcbe1d..2fbd449 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,9 +1,9 @@ -# $Id: zziplib.spec,v 1.2 2004/11/16 18:50:29 thias Exp $ +# $Id: zziplib.spec,v 1.3 2005/04/05 09:04:05 thias Exp $ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.36 -Release: 2 +Version: 0.13.38 +Release: 1 License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -79,6 +79,9 @@ zziplib library. %changelog +* Tue Apr 5 2005 Matthias Saou 0.13.38-1 +- Update to 0.13.38, fixes gcc4 compile issues (Adrian Reber). + * Tue Nov 16 2004 Matthias Saou 0.13.36-2 - Bump release to provide Extras upgrade path. From 78aa953d32cf0247292befeb6c7d61783abf6ecb Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Sun, 22 May 2005 23:13:07 +0000 Subject: [PATCH 05/85] - rebuild on all arches --- zziplib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 2fbd449..0157b1d 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,9 +1,9 @@ -# $Id: zziplib.spec,v 1.3 2005/04/05 09:04:05 thias Exp $ +# $Id: zziplib.spec,v 1.4 2005/05/22 23:13:07 katzj Exp $ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.38 -Release: 1 +Release: 2 License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -79,6 +79,9 @@ zziplib library. %changelog +* Sun May 22 2005 Jeremy Katz - 0.13.38-2 +- rebuild on all arches + * Tue Apr 5 2005 Matthias Saou 0.13.38-1 - Update to 0.13.38, fixes gcc4 compile issues (Adrian Reber). From 18f74b106a2a4ee61f1b04a97b326dc96c92c441 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 9 Feb 2006 19:27:48 +0000 Subject: [PATCH 06/85] Update to 0.13.45. --- .cvsignore | 2 +- sources | 2 +- zziplib.spec | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9aeafa4..b39066d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zziplib-0.13.38.tar.bz2 +zziplib-0.13.45.tar.bz2 diff --git a/sources b/sources index e208836..c5022c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3eccd9b39c057eb49652e90914abfdf5 zziplib-0.13.38.tar.bz2 +687e6e487795680dd1e8ea9c1670e0ab zziplib-0.13.45.tar.bz2 diff --git a/zziplib.spec b/zziplib.spec index 0157b1d..a823140 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,9 +1,7 @@ -# $Id: zziplib.spec,v 1.4 2005/05/22 23:13:07 katzj Exp $ - Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.38 -Release: 2 +Version: 0.13.45 +Release: 1%{?dist} License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -53,11 +51,9 @@ zziplib library. %{__rm} -rf %{buildroot} -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files @@ -70,7 +66,7 @@ zziplib library. %defattr(-, root, root, 0755) %doc docs/README.SDL docs/*.htm %{_includedir}/* -%{_libdir}/*.a +%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -79,6 +75,10 @@ zziplib library. %changelog +* Thu Feb 9 2006 Matthias Saou 0.13.45-1 +- Update to 0.13.45. +- Exclude static library. + * Sun May 22 2005 Jeremy Katz - 0.13.38-2 - rebuild on all arches From de8b00211e4f5e1884289bce1eaf15d18f39da8d Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 6 Mar 2006 14:58:32 +0000 Subject: [PATCH 07/85] FC5 rebuild. --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index a823140..94d0111 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.45 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -75,6 +75,9 @@ zziplib library. %changelog +* Mon Mar 6 2006 Matthias Saou 0.13.45-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.13.45-1 - Update to 0.13.45. - Exclude static library. From fa8fe4c49a0c65bc95d238bb550a3f5f58e459bc Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 24 Jul 2006 14:52:57 +0000 Subject: [PATCH 08/85] Split off -utils sub-package (#199467), and a few other minor changes. --- zziplib.spec | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 94d0111..9e6826b 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,32 +1,47 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.45 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig +BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig, automake %description The zziplib library is intentionally lightweight, it offers the ability to easily extract data from files archived in a single zip file. Applications can bundle files into a single zip archive and access them. The implementation -is based only on the (free) subset of compression with the zlib algorithm +is based only on the (free) subset of compression with the zlib algorithm which is actually used by the zip/unzip tools. +%package utils +Summary: Utilities for the zziplib library +Group: Applications/Archiving +Requires: %{name} = %{version}-%{release} + +%description utils +The zziplib library is intentionally lightweight, it offers the ability to +easily extract data from files archived in a single zip file. Applications +can bundle files into a single zip archive and access them. The implementation +is based only on the (free) subset of compression with the zlib algorithm +which is actually used by the zip/unzip tools. + +This packages contains all the utilities that come with the zziplib library. + + %package devel Summary: Development files for the zziplib library Group: Development/Libraries -Requires: %{name} = %{version}, pkgconfig, zlib-devel, SDL-devel +Requires: %{name} = %{version}-%{release}, pkgconfig, zlib-devel, SDL-devel %description devel The zziplib library is intentionally lightweight, it offers the ability to easily extract data from files archived in a single zip file. Applications can bundle files into a single zip archive and access them. The implementation -is based only on the (free) subset of compression with the zlib algorithm +is based only on the (free) subset of compression with the zlib algorithm which is actually used by the zip/unzip tools. This package contains files required to build applications that will use the @@ -38,7 +53,9 @@ zziplib library. %build -%configure --enable-sdl +%configure \ + --enable-sdl \ + --enable-frame-pointer %{__make} %{?_smp_mflags} @@ -59,9 +76,12 @@ zziplib library. %files %defattr(-, root, root, 0755) %doc docs/COPYING* ChangeLog README TODO -%{_bindir}/* %{_libdir}/*.so.* +%files utils +%defattr(-, root, root, 0755) +%{_bindir}/* + %files devel %defattr(-, root, root, 0755) %doc docs/README.SDL docs/*.htm @@ -75,6 +95,13 @@ zziplib library. %changelog +* Mon Jul 24 2006 Matthias Saou 0.13.45-3 +- FC6 rebuild. +- Split off -utils sub-package (#199467). Could have been plain "zzip"? +- Have sub-packages require exact release too. +- Build require automake to make the aclocal-1.9 check happy. +- Use --enable-frame-pointer otherwise -g gets removed from the CFLAGS. + * Mon Mar 6 2006 Matthias Saou 0.13.45-2 - FC5 rebuild. From b41263ddc3b90428599a93dcbc751f085b57018a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:19:16 +0000 Subject: [PATCH 09/85] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 52d2e9bc05ba665deab3d5e58dfbfa32ca94608a Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 28 Aug 2006 16:35:25 +0000 Subject: [PATCH 10/85] Update to 0.13.47. --- .cvsignore | 2 +- needs.rebuild | 1 - sources | 2 +- zziplib.spec | 9 ++++++--- 4 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 needs.rebuild diff --git a/.cvsignore b/.cvsignore index b39066d..4be2427 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zziplib-0.13.45.tar.bz2 +zziplib-0.13.47.tar.bz2 diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/sources b/sources index c5022c0..68f3029 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -687e6e487795680dd1e8ea9c1670e0ab zziplib-0.13.45.tar.bz2 +ac3bc8da2db2aa6e7751243c1dade296 zziplib-0.13.47.tar.bz2 diff --git a/zziplib.spec b/zziplib.spec index 9e6826b..cb9881d 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.45 -Release: 3%{?dist} +Version: 0.13.47 +Release: 1%{?dist} License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -95,8 +95,11 @@ zziplib library. %changelog -* Mon Jul 24 2006 Matthias Saou 0.13.45-3 +* Mon Aug 28 2006 Matthias Saou 0.13.47-1 +- Update to 0.13.47. - FC6 rebuild. + +* Mon Jul 24 2006 Matthias Saou 0.13.45-3 - Split off -utils sub-package (#199467). Could have been plain "zzip"? - Have sub-packages require exact release too. - Build require automake to make the aclocal-1.9 check happy. From b41823589036bb66098a9d644dceca4120e8f8e0 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 26 Mar 2007 11:16:43 +0000 Subject: [PATCH 11/85] Update to 0.13.49 to fix CVE-2007-1614 (rhbz #233700). --- .cvsignore | 2 +- sources | 2 +- zziplib.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4be2427..1df7658 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zziplib-0.13.47.tar.bz2 +zziplib-0.13.49.tar.bz2 diff --git a/sources b/sources index 68f3029..642f378 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac3bc8da2db2aa6e7751243c1dade296 zziplib-0.13.47.tar.bz2 +5f7b88ebb2bcd7e8044328482d079661 zziplib-0.13.49.tar.bz2 diff --git a/zziplib.spec b/zziplib.spec index cb9881d..48883f2 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,6 +1,6 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.47 +Version: 0.13.49 Release: 1%{?dist} License: LGPL/MPL Group: Applications/Archiving @@ -49,7 +49,7 @@ zziplib library. %prep -%setup +%setup -q %build @@ -74,16 +74,16 @@ zziplib library. %files -%defattr(-, root, root, 0755) +%defattr(-,root,root,-) %doc docs/COPYING* ChangeLog README TODO %{_libdir}/*.so.* %files utils -%defattr(-, root, root, 0755) +%defattr(-,root,root,-) %{_bindir}/* %files devel -%defattr(-, root, root, 0755) +%defattr(-,root,root,-) %doc docs/README.SDL docs/*.htm %{_includedir}/* %exclude %{_libdir}/*.a @@ -92,9 +92,14 @@ zziplib library. %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4 %{_datadir}/zziplib/ +%{_mandir}/man3/* %changelog +* Mon Mar 26 2007 Matthias Saou 0.13.49-1 +- Update to 0.13.49 to fix CVE-2007-1614 (rhbz #233700). +- Include new man3 pages to the devel sub-package. + * Mon Aug 28 2006 Matthias Saou 0.13.47-1 - Update to 0.13.47. - FC6 rebuild. From 4f39fc9e0cdfa134b544e3770123a16ad46ab537 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 19 Jun 2007 18:19:28 +0000 Subject: [PATCH 12/85] Minor cleanups. --- zziplib.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 48883f2..71bfd1d 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.49 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -54,14 +54,18 @@ zziplib library. %build %configure \ + --disable-static \ --enable-sdl \ --enable-frame-pointer +# Remove rpath on 64bit archs +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} install DESTDIR=%{buildroot} %clean @@ -86,7 +90,6 @@ zziplib library. %defattr(-,root,root,-) %doc docs/README.SDL docs/*.htm %{_includedir}/* -%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -96,6 +99,11 @@ zziplib library. %changelog +* Tue Jun 19 2007 Matthias Saou 0.13.49-2 +- Disable static lib build instead of excluding it later. +- Remove rpath on 64bit archs. +- Switch to using DESTDIR install method. + * Mon Mar 26 2007 Matthias Saou 0.13.49-1 - Update to 0.13.49 to fix CVE-2007-1614 (rhbz #233700). - Include new man3 pages to the devel sub-package. From 1e9919416921b504a96a054495427bc3dcc3d41d Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Fri, 3 Aug 2007 15:53:39 +0000 Subject: [PATCH 13/85] Update License field. --- zziplib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 71bfd1d..c574cf5 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,8 +1,8 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.49 -Release: 2%{?dist} -License: LGPL/MPL +Release: 3%{?dist} +License: LGPLv2+ or MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 @@ -99,6 +99,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Fri Aug 3 2007 Matthias Saou 0.13.49-3 +- Update License field. + * Tue Jun 19 2007 Matthias Saou 0.13.49-2 - Disable static lib build instead of excluding it later. - Remove rpath on 64bit archs. From 76602ace11de53d464077d0f35b4a449eba2dc8a Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 23 Aug 2007 09:35:35 +0000 Subject: [PATCH 14/85] Include patch to fix fd.open calls with recent glibc. --- zziplib-0.13.49-open.patch | 45 ++++++++++++++++++++++++++++++++++++++ zziplib.spec | 16 ++++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 zziplib-0.13.49-open.patch diff --git a/zziplib-0.13.49-open.patch b/zziplib-0.13.49-open.patch new file mode 100644 index 0000000..f17379f --- /dev/null +++ b/zziplib-0.13.49-open.patch @@ -0,0 +1,45 @@ +diff -Naupr zziplib-0.13.49.orig/zzip/file.c zziplib-0.13.49/zzip/file.c +--- zziplib-0.13.49.orig/zzip/file.c 2007-03-18 16:20:12.000000000 +0100 ++++ zziplib-0.13.49/zzip/file.c 2007-08-23 11:17:34.000000000 +0200 +@@ -713,7 +713,7 @@ zzip_open_shared_io (ZZIP_FILE* stream, + { + zzip_plugin_io_t os = (o_modes & ZZIP_ALLOWREAL) + ? zzip_get_default_io () : io; +- int fd = os->fd.open(filename, o_flags); /* io->fd.open */ ++ int fd = (os->fd.open)(filename, o_flags); /* io->fd.open */ + if (fd != -1) + { + ZZIP_FILE* fp = calloc (1, sizeof(ZZIP_FILE)); +diff -Naupr zziplib-0.13.49.orig/zzip/write.c zziplib-0.13.49/zzip/write.c +--- zziplib-0.13.49.orig/zzip/write.c 2007-03-18 16:22:11.000000000 +0100 ++++ zziplib-0.13.49/zzip/write.c 2007-08-23 11:17:46.000000000 +0200 +@@ -163,7 +163,7 @@ zzip_dir_creat_ext_io(zzip_char_t* name, + if (! (exx_len = strlen (*exx)) || exx_len >= MAX_EXT_LEN) break; + memcpy (dir->realname+name_len, exx, exx_len); /* append! */ + }____; +- fd = io->fd.open (dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode); ++ fd = (io->fd.open)(dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode); + dir->realname[name_len] = '\0'; /* keep ummodified */ + if (fd != -1) { dir->fd = fd; return dir; } + error: +diff -Naupr zziplib-0.13.49.orig/zzip/zip.c zziplib-0.13.49/zzip/zip.c +--- zziplib-0.13.49.orig/zzip/zip.c 2007-03-18 16:27:49.000000000 +0100 ++++ zziplib-0.13.49/zzip/zip.c 2007-08-23 11:17:22.000000000 +0200 +@@ -688,7 +688,7 @@ __zzip_try_open(zzip_char_t* filename, i + for ( ; *ext ; ++ext) + { + strcpy (file+len, *ext); +- fd = io->fd.open(file, filemode); ++ fd = (io->fd.open)(file, filemode); + if (fd != -1) return fd; + } + return -1; +@@ -718,7 +718,7 @@ zzip_dir_open_ext_io(zzip_char_t* filena + if (! io) io = zzip_get_default_io(); + if (! ext) ext = zzip_get_default_ext(); + +- fd = io->fd.open(filename, O_RDONLY|O_BINARY); ++ fd = (io->fd.open)(filename, O_RDONLY|O_BINARY); + if (fd != -1) { + return zzip_dir_fdopen_ext_io(fd, e, ext, io); + } else diff --git a/zziplib.spec b/zziplib.spec index c574cf5..d5e57f4 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,13 +1,15 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.49 -Release: 3%{?dist} -License: LGPLv2+ or MPL +Release: 4%{?dist} +License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 +Patch0: zziplib-0.13.49-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig, automake +BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig +BuildRequires: autoconf, automake %description The zziplib library is intentionally lightweight, it offers the ability to @@ -50,6 +52,7 @@ zziplib library. %prep %setup -q +%patch0 -p1 %build @@ -60,7 +63,8 @@ zziplib library. # Remove rpath on 64bit archs sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool -%{__make} %{?_smp_mflags} +# Disable _smp_mflags because docs fail to build (as of 0.13.49) +%{__make} %install @@ -99,6 +103,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Wed Aug 8 2007 Matthias Saou 0.13.49-4 +- Include patch to fix fd.open calls with recent glibc. +- Disable _smp_mflags since the docs fail to build. + * Fri Aug 3 2007 Matthias Saou 0.13.49-3 - Update License field. From a7f0e96c6397280ac390965c2bec3053dc253706 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 20 Feb 2008 04:55:51 +0000 Subject: [PATCH 15/85] - Autorebuild for GCC 4.3 --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index d5e57f4..024b276 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.49 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -103,6 +103,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.13.49-5 +- Autorebuild for GCC 4.3 + * Wed Aug 8 2007 Matthias Saou 0.13.49-4 - Include patch to fix fd.open calls with recent glibc. - Disable _smp_mflags since the docs fail to build. From 139b51df96527520cea9cb8c887b69366dca6fdb Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 22 Dec 2008 09:24:20 +0000 Subject: [PATCH 16/85] Patch _config.h to make it identical for 32bit and 64bit archs (#343521). --- zziplib-0.13.49-multilib.patch | 39 ++++++++++++++++++++++++++++++++++ zziplib.spec | 14 ++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 zziplib-0.13.49-multilib.patch diff --git a/zziplib-0.13.49-multilib.patch b/zziplib-0.13.49-multilib.patch new file mode 100644 index 0000000..7020c66 --- /dev/null +++ b/zziplib-0.13.49-multilib.patch @@ -0,0 +1,39 @@ +diff -Naupr zziplib-0.13.49.orig/zzip/_config.h zziplib-0.13.49/zzip/_config.h +--- zziplib-0.13.49.orig/zzip/_config.h 2007-03-18 12:59:51.000000000 +0100 ++++ zziplib-0.13.49/zzip/_config.h 2008-12-22 10:02:32.351372027 +0100 +@@ -130,9 +130,11 @@ + + /* whether the system defaults to 32bit off_t but can do 64bit when requested + */ ++#if __WORDSIZE == 32 + #ifndef ZZIP_LARGEFILE_SENSITIVE + #define ZZIP_LARGEFILE_SENSITIVE 1 + #endif ++#endif + + /* Name of package */ + #ifndef ZZIP_PACKAGE +@@ -171,7 +173,11 @@ + + /* The number of bytes in type long */ + #ifndef ZZIP_SIZEOF_LONG ++#if __WORDSIZE == 32 + #define ZZIP_SIZEOF_LONG 4 ++#elif __WORDSIZE == 64 ++#define ZZIP_SIZEOF_LONG 8 ++#endif + #endif + + /* The number of bytes in type short */ +@@ -194,9 +200,11 @@ + /* #undef WORDS_BIGENDIAN */ + + /* Number of bits in a file offset, on hosts where this is settable. */ ++#if __WORDSIZE == 32 + #ifndef ZZIP__FILE_OFFSET_BITS + #define ZZIP__FILE_OFFSET_BITS 64 + #endif ++#endif + + /* Define for large files, on AIX-style hosts. */ + /* #undef _LARGE_FILES */ diff --git a/zziplib.spec b/zziplib.spec index 024b276..05bf0ac 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,12 +1,13 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.49 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 Patch0: zziplib-0.13.49-open.patch +Patch1: zziplib-0.13.49-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig BuildRequires: autoconf, automake @@ -53,6 +54,9 @@ zziplib library. %prep %setup -q %patch0 -p1 +%patch1 -p1 +# Save the common patched _config.h file to overwrite the generated one +%{__cp} -a zzip/_config.h _config.h %build @@ -70,6 +74,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +# Overwrite the platform specific _config.h with our own modified common one +%{__rm} -f %{buildroot}%{_includedir}/zzip/_config.h +%{__install} -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %clean @@ -103,7 +110,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 0.13.49-5 +* Mon Dec 22 2008 Matthias Saou 0.13.49-6 +- Patch _config.h to make it identical for 32bit and 64bit archs (#343521). + +* Tue Feb 19 2008 Fedora Release Engineering - Autorebuild for GCC 4.3 * Wed Aug 8 2007 Matthias Saou 0.13.49-4 From c8677ff466570a093f82b7c1ada93df70e8db58f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:48:39 +0000 Subject: [PATCH 17/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 05bf0ac..873db87 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.49 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -110,6 +110,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.13.49-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 22 2008 Matthias Saou 0.13.49-6 - Patch _config.h to make it identical for 32bit and 64bit archs (#343521). From 64775cd453bd685cad2a94883ae0ac45a4b32371 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 09:05:49 +0000 Subject: [PATCH 18/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 873db87..7c63008 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.49 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -110,6 +110,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.13.49-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.13.49-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From e15e092c511bf014648b7cb6117de0dd4b729b1b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:21 +0000 Subject: [PATCH 19/85] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7d6607f..35b9002 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zziplib -# $Id: Makefile,v 1.1 2004/11/09 02:51:47 cvsextras Exp $ +# $Id: Makefile,v 1.2 2004/11/24 05:11:45 gafton Exp $ NAME := zziplib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 368ff59d6c34cfbf4e106e7fe42a9b14a27f93b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:33:58 +0000 Subject: [PATCH 20/85] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 35b9002..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zziplib -# $Id: Makefile,v 1.2 2004/11/24 05:11:45 gafton Exp $ -NAME := zziplib -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 1c50ad0b0bbe5e964ad5294bd3b2b2981e994474 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 4 Dec 2010 16:41:22 +0100 Subject: [PATCH 21/85] Update to 0.13.59. --- .gitignore | 1 + sources | 2 +- zziplib-0.13.49-multilib.patch | 39 ----------------------------- zziplib-0.13.49-open.patch | 45 ---------------------------------- zziplib-0.13.59-multilib.patch | 41 +++++++++++++++++++++++++++++++ zziplib.spec | 34 ++++++++++++++++--------- 6 files changed, 66 insertions(+), 96 deletions(-) delete mode 100644 zziplib-0.13.49-multilib.patch delete mode 100644 zziplib-0.13.49-open.patch create mode 100644 zziplib-0.13.59-multilib.patch diff --git a/.gitignore b/.gitignore index 1df7658..20fbc01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ zziplib-0.13.49.tar.bz2 +/zziplib-0.13.59.tar.bz2 diff --git a/sources b/sources index 642f378..f04c36c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f7b88ebb2bcd7e8044328482d079661 zziplib-0.13.49.tar.bz2 +14b5a6fc229afe9916d48358479568d3 zziplib-0.13.59.tar.bz2 diff --git a/zziplib-0.13.49-multilib.patch b/zziplib-0.13.49-multilib.patch deleted file mode 100644 index 7020c66..0000000 --- a/zziplib-0.13.49-multilib.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naupr zziplib-0.13.49.orig/zzip/_config.h zziplib-0.13.49/zzip/_config.h ---- zziplib-0.13.49.orig/zzip/_config.h 2007-03-18 12:59:51.000000000 +0100 -+++ zziplib-0.13.49/zzip/_config.h 2008-12-22 10:02:32.351372027 +0100 -@@ -130,9 +130,11 @@ - - /* whether the system defaults to 32bit off_t but can do 64bit when requested - */ -+#if __WORDSIZE == 32 - #ifndef ZZIP_LARGEFILE_SENSITIVE - #define ZZIP_LARGEFILE_SENSITIVE 1 - #endif -+#endif - - /* Name of package */ - #ifndef ZZIP_PACKAGE -@@ -171,7 +173,11 @@ - - /* The number of bytes in type long */ - #ifndef ZZIP_SIZEOF_LONG -+#if __WORDSIZE == 32 - #define ZZIP_SIZEOF_LONG 4 -+#elif __WORDSIZE == 64 -+#define ZZIP_SIZEOF_LONG 8 -+#endif - #endif - - /* The number of bytes in type short */ -@@ -194,9 +200,11 @@ - /* #undef WORDS_BIGENDIAN */ - - /* Number of bits in a file offset, on hosts where this is settable. */ -+#if __WORDSIZE == 32 - #ifndef ZZIP__FILE_OFFSET_BITS - #define ZZIP__FILE_OFFSET_BITS 64 - #endif -+#endif - - /* Define for large files, on AIX-style hosts. */ - /* #undef _LARGE_FILES */ diff --git a/zziplib-0.13.49-open.patch b/zziplib-0.13.49-open.patch deleted file mode 100644 index f17379f..0000000 --- a/zziplib-0.13.49-open.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naupr zziplib-0.13.49.orig/zzip/file.c zziplib-0.13.49/zzip/file.c ---- zziplib-0.13.49.orig/zzip/file.c 2007-03-18 16:20:12.000000000 +0100 -+++ zziplib-0.13.49/zzip/file.c 2007-08-23 11:17:34.000000000 +0200 -@@ -713,7 +713,7 @@ zzip_open_shared_io (ZZIP_FILE* stream, - { - zzip_plugin_io_t os = (o_modes & ZZIP_ALLOWREAL) - ? zzip_get_default_io () : io; -- int fd = os->fd.open(filename, o_flags); /* io->fd.open */ -+ int fd = (os->fd.open)(filename, o_flags); /* io->fd.open */ - if (fd != -1) - { - ZZIP_FILE* fp = calloc (1, sizeof(ZZIP_FILE)); -diff -Naupr zziplib-0.13.49.orig/zzip/write.c zziplib-0.13.49/zzip/write.c ---- zziplib-0.13.49.orig/zzip/write.c 2007-03-18 16:22:11.000000000 +0100 -+++ zziplib-0.13.49/zzip/write.c 2007-08-23 11:17:46.000000000 +0200 -@@ -163,7 +163,7 @@ zzip_dir_creat_ext_io(zzip_char_t* name, - if (! (exx_len = strlen (*exx)) || exx_len >= MAX_EXT_LEN) break; - memcpy (dir->realname+name_len, exx, exx_len); /* append! */ - }____; -- fd = io->fd.open (dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode); -+ fd = (io->fd.open)(dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode); - dir->realname[name_len] = '\0'; /* keep ummodified */ - if (fd != -1) { dir->fd = fd; return dir; } - error: -diff -Naupr zziplib-0.13.49.orig/zzip/zip.c zziplib-0.13.49/zzip/zip.c ---- zziplib-0.13.49.orig/zzip/zip.c 2007-03-18 16:27:49.000000000 +0100 -+++ zziplib-0.13.49/zzip/zip.c 2007-08-23 11:17:22.000000000 +0200 -@@ -688,7 +688,7 @@ __zzip_try_open(zzip_char_t* filename, i - for ( ; *ext ; ++ext) - { - strcpy (file+len, *ext); -- fd = io->fd.open(file, filemode); -+ fd = (io->fd.open)(file, filemode); - if (fd != -1) return fd; - } - return -1; -@@ -718,7 +718,7 @@ zzip_dir_open_ext_io(zzip_char_t* filena - if (! io) io = zzip_get_default_io(); - if (! ext) ext = zzip_get_default_ext(); - -- fd = io->fd.open(filename, O_RDONLY|O_BINARY); -+ fd = (io->fd.open)(filename, O_RDONLY|O_BINARY); - if (fd != -1) { - return zzip_dir_fdopen_ext_io(fd, e, ext, io); - } else diff --git a/zziplib-0.13.59-multilib.patch b/zziplib-0.13.59-multilib.patch new file mode 100644 index 0000000..0d9ee6f --- /dev/null +++ b/zziplib-0.13.59-multilib.patch @@ -0,0 +1,41 @@ +diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h +--- zziplib-0.13.59.orig/zzip/_config.h 2010-02-14 22:29:34.000000000 +0100 ++++ zziplib-0.13.59/zzip/_config.h 2010-12-04 16:22:19.809534085 +0100 +@@ -133,7 +133,10 @@ + + /* whether the system defaults to 32bit off_t but can do 64bit when requested + */ +-/* #undef LARGEFILE_SENSITIVE */ ++#if __WORDSIZE == 32 ++#ifndef ZZIP_LARGEFILE_SENSITIVE ++#define ZZIP_LARGEFILE_SENSITIVE 1 ++#endif + + /* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +@@ -178,8 +181,12 @@ + + /* The number of bytes in type long */ + #ifndef ZZIP_SIZEOF_LONG ++#if __WORDSIZE == 32 ++#define ZZIP_SIZEOF_LONG 4 ++#elif __WORDSIZE == 64 + #define ZZIP_SIZEOF_LONG 8 + #endif ++#endif + + /* The number of bytes in type short */ + #ifndef ZZIP_SIZEOF_SHORT +@@ -209,7 +216,11 @@ + #endif + + /* Number of bits in a file offset, on hosts where this is settable. */ +-/* #undef _FILE_OFFSET_BITS */ ++#if __WORDSIZE == 32 ++#ifndef ZZIP__FILE_OFFSET_BITS ++#define ZZIP__FILE_OFFSET_BITS 64 ++#endif ++#endif + + /* Define for large files, on AIX-style hosts. */ + /* #undef _LARGE_FILES */ diff --git a/zziplib.spec b/zziplib.spec index 7c63008..f77bb1c 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,16 +1,22 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.49 -Release: 8%{?dist} +Version: 0.13.59 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 -Patch0: zziplib-0.13.49-open.patch -Patch1: zziplib-0.13.49-multilib.patch +Patch0: zziplib-0.13.59-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig -BuildRequires: autoconf, automake +BuildRequires: perl +BuildRequires: python +BuildRequires: zip +BuildRequires: xmlto +BuildRequires: zlib-devel +BuildRequires: SDL-devel +BuildRequires: pkgconfig +#BuildRequires: autoconf +#BuildRequires: automake %description The zziplib library is intentionally lightweight, it offers the ability to @@ -38,7 +44,10 @@ This packages contains all the utilities that come with the zziplib library. %package devel Summary: Development files for the zziplib library Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, pkgconfig, zlib-devel, SDL-devel +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: zlib-devel +Requires: SDL-devel %description devel The zziplib library is intentionally lightweight, it offers the ability to @@ -54,7 +63,6 @@ zziplib library. %prep %setup -q %patch0 -p1 -%patch1 -p1 # Save the common patched _config.h file to overwrite the generated one %{__cp} -a zzip/_config.h _config.h @@ -67,8 +75,7 @@ zziplib library. # Remove rpath on 64bit archs sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool -# Disable _smp_mflags because docs fail to build (as of 0.13.49) -%{__make} +%{__make} %{?_smp_mflags} %install @@ -105,11 +112,16 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4 -%{_datadir}/zziplib/ %{_mandir}/man3/* %changelog +* Sat Dec 4 2010 Matthias Saou 0.13.59-1 +- Update to 0.13.59. +- Remove no longer needed 'open' patch. +- Rebase the multilib patch, still required. +- Re-enable _smp_mflags, build works again with it apparently. + * Mon Jul 27 2009 Fedora Release Engineering - 0.13.49-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From c6bdc4829e07b5d373aca912287cb8dc1cfe3407 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 9 Dec 2010 19:50:27 +0100 Subject: [PATCH 22/85] - Fix broken zzip/_config.h which causes apps using zziplib to fail to compile --- zziplib-0.13.59-multilib.patch | 3 ++- zziplib.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zziplib-0.13.59-multilib.patch b/zziplib-0.13.59-multilib.patch index 0d9ee6f..f4b7a98 100644 --- a/zziplib-0.13.59-multilib.patch +++ b/zziplib-0.13.59-multilib.patch @@ -1,7 +1,7 @@ diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h --- zziplib-0.13.59.orig/zzip/_config.h 2010-02-14 22:29:34.000000000 +0100 +++ zziplib-0.13.59/zzip/_config.h 2010-12-04 16:22:19.809534085 +0100 -@@ -133,7 +133,10 @@ +@@ -133,7 +133,11 @@ /* whether the system defaults to 32bit off_t but can do 64bit when requested */ @@ -9,6 +9,7 @@ diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h +#if __WORDSIZE == 32 +#ifndef ZZIP_LARGEFILE_SENSITIVE +#define ZZIP_LARGEFILE_SENSITIVE 1 ++#endif +#endif /* Define to the sub-directory in which libtool stores uninstalled libraries. diff --git a/zziplib.spec b/zziplib.spec index f77bb1c..01e7aed 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.59 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -116,6 +116,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Thu Dec 9 2010 Hans de Goede 0.13.59-2 +- Fix broken zzip/_config.h which causes apps using zziplib to fail to compile + * Sat Dec 4 2010 Matthias Saou 0.13.59-1 - Update to 0.13.59. - Remove no longer needed 'open' patch. From 642a1306d2daac589852240ce32d2ab47f789083 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 03:21:34 -0600 Subject: [PATCH 23/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 01e7aed..3c1c9b9 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.59 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -116,6 +116,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.13.59-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 9 2010 Hans de Goede 0.13.59-2 - Fix broken zzip/_config.h which causes apps using zziplib to fail to compile From 668fba7833dab648b5c00d81c9a32e82ebce0c5e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:45:49 -0600 Subject: [PATCH 24/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 3c1c9b9..3c344a6 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.59 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -116,6 +116,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.13.59-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0.13.59-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 444eea13abcdd857724720473473a5f84be96625 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 8 Mar 2012 13:48:00 -0500 Subject: [PATCH 25/85] 0.13.60, fix export-dynamic usage --- .gitignore | 1 + sources | 2 +- zziplib-0.13.60-proper-export-dynamic.patch | 12 +++++++ zziplib.spec | 36 +++++++-------------- 4 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 zziplib-0.13.60-proper-export-dynamic.patch diff --git a/.gitignore b/.gitignore index 20fbc01..8cb8655 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ zziplib-0.13.49.tar.bz2 /zziplib-0.13.59.tar.bz2 +/zziplib-0.13.60.tar.bz2 diff --git a/sources b/sources index f04c36c..b8a6481 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14b5a6fc229afe9916d48358479568d3 zziplib-0.13.59.tar.bz2 +54a6aa53262483a4d54f7c59f0a7258b zziplib-0.13.60.tar.bz2 diff --git a/zziplib-0.13.60-proper-export-dynamic.patch b/zziplib-0.13.60-proper-export-dynamic.patch new file mode 100644 index 0000000..411cd34 --- /dev/null +++ b/zziplib-0.13.60-proper-export-dynamic.patch @@ -0,0 +1,12 @@ +diff -up zziplib-0.13.60/configure.fix zziplib-0.13.60/configure +--- zziplib-0.13.60/configure.fix 2012-03-08 13:35:53.989071114 -0500 ++++ zziplib-0.13.60/configure 2012-03-08 13:36:10.900929640 -0500 +@@ -13713,7 +13713,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5 + $as_echo_n "checking link options... " >&6; } + ZZIPLIB_LDFLAGS="" +-test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic" ++test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-Wl,--export-dynamic" + RESOLVES=" # " + case "$host_os" in mingw*) + ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole" diff --git a/zziplib.spec b/zziplib.spec index 3c344a6..4fe1e10 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,13 +1,13 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.59 -Release: 4%{?dist} +Version: 0.13.60 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 Patch0: zziplib-0.13.59-multilib.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Patch1: zziplib-0.13.60-proper-export-dynamic.patch BuildRequires: perl BuildRequires: python BuildRequires: zip @@ -25,11 +25,10 @@ can bundle files into a single zip archive and access them. The implementation is based only on the (free) subset of compression with the zlib algorithm which is actually used by the zip/unzip tools. - %package utils Summary: Utilities for the zziplib library Group: Applications/Archiving -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description utils The zziplib library is intentionally lightweight, it offers the ability to @@ -40,11 +39,10 @@ which is actually used by the zip/unzip tools. This packages contains all the utilities that come with the zziplib library. - %package devel Summary: Development files for the zziplib library Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: zlib-devel Requires: SDL-devel @@ -59,14 +57,13 @@ which is actually used by the zip/unzip tools. This package contains files required to build applications that will use the zziplib library. - %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .fix # Save the common patched _config.h file to overwrite the generated one %{__cp} -a zzip/_config.h _config.h - %build %configure \ --disable-static \ @@ -77,35 +74,24 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtoo sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %{__make} %{?_smp_mflags} - %install -%{__rm} -rf %{buildroot} -%{__make} install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} # Overwrite the platform specific _config.h with our own modified common one -%{__rm} -f %{buildroot}%{_includedir}/zzip/_config.h -%{__install} -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h - - -%clean -%{__rm} -rf %{buildroot} - +rm -f %{buildroot}%{_includedir}/zzip/_config.h +install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%defattr(-,root,root,-) %doc docs/COPYING* ChangeLog README TODO %{_libdir}/*.so.* %files utils -%defattr(-,root,root,-) %{_bindir}/* %files devel -%defattr(-,root,root,-) %doc docs/README.SDL docs/*.htm %{_includedir}/* %exclude %{_libdir}/*.la @@ -114,8 +100,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool %{_datadir}/aclocal/*.m4 %{_mandir}/man3/* - %changelog +* Thu Mar 8 2012 Tom Callaway - 0.13.60-1 +- update to 0.13.60 + * Sat Jan 14 2012 Fedora Release Engineering - 0.13.59-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From e3fa403feb243a99843219534005eef747a63f53 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 03:41:58 -0500 Subject: [PATCH 26/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 4fe1e10..91421d6 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.60 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -101,6 +101,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.13.60-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Mar 8 2012 Tom Callaway - 0.13.60-1 - update to 0.13.60 From b2d9041c9d95ba4813ef429bf390df2c395d7c8e Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 10 Oct 2012 16:59:45 +0200 Subject: [PATCH 27/85] Update to 0.13.62 --- .gitignore | 1 + sources | 2 +- zziplib-0.13.60-proper-export-dynamic.patch | 12 ------------ zziplib.spec | 12 +++++++----- 4 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 zziplib-0.13.60-proper-export-dynamic.patch diff --git a/.gitignore b/.gitignore index 8cb8655..575c8ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ zziplib-0.13.49.tar.bz2 /zziplib-0.13.59.tar.bz2 /zziplib-0.13.60.tar.bz2 +/zziplib-0.13.62.tar.bz2 diff --git a/sources b/sources index b8a6481..77b7c33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54a6aa53262483a4d54f7c59f0a7258b zziplib-0.13.60.tar.bz2 +5fe874946390f939ee8f4abe9624b96c zziplib-0.13.62.tar.bz2 diff --git a/zziplib-0.13.60-proper-export-dynamic.patch b/zziplib-0.13.60-proper-export-dynamic.patch deleted file mode 100644 index 411cd34..0000000 --- a/zziplib-0.13.60-proper-export-dynamic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up zziplib-0.13.60/configure.fix zziplib-0.13.60/configure ---- zziplib-0.13.60/configure.fix 2012-03-08 13:35:53.989071114 -0500 -+++ zziplib-0.13.60/configure 2012-03-08 13:36:10.900929640 -0500 -@@ -13713,7 +13713,7 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5 - $as_echo_n "checking link options... " >&6; } - ZZIPLIB_LDFLAGS="" --test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic" -+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-Wl,--export-dynamic" - RESOLVES=" # " - case "$host_os" in mingw*) - ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole" diff --git a/zziplib.spec b/zziplib.spec index 91421d6..1d59bca 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,13 +1,12 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.60 -Release: 2%{?dist} +Version: 0.13.62 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 Patch0: zziplib-0.13.59-multilib.patch -Patch1: zziplib-0.13.60-proper-export-dynamic.patch BuildRequires: perl BuildRequires: python BuildRequires: zip @@ -60,9 +59,8 @@ zziplib library. %prep %setup -q %patch0 -p1 -%patch1 -p1 -b .fix # Save the common patched _config.h file to overwrite the generated one -%{__cp} -a zzip/_config.h _config.h +cp -a zzip/_config.h _config.h %build %configure \ @@ -101,6 +99,10 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Wed Oct 10 2012 Matthias Saou 0.13.62-1 +- Update to 0.13.62. +- Remove no longer needed -Wl patch. + * Sun Jul 22 2012 Fedora Release Engineering - 0.13.60-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 0622c7741b6295d7a583f3fd10ee990e238bc9c7 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 30 Jan 2013 19:58:05 +0100 Subject: [PATCH 28/85] Rebuild with -fno-strict-aliasing --- zziplib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 1d59bca..34b5d39 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -63,6 +63,7 @@ zziplib library. cp -a zzip/_config.h _config.h %build +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ --disable-static \ --enable-sdl \ @@ -99,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Wed Jan 30 2013 Jindrich Novy 0.13.62-2 +- rebuild with -fno-strict-aliasing + * Wed Oct 10 2012 Matthias Saou 0.13.62-1 - Update to 0.13.62. - Remove no longer needed -Wl patch. From fcc34763374320bd384ce9f678c4dd7c73684ae0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 05:03:25 -0500 Subject: [PATCH 29/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 34b5d39..d7f18bb 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.13.62-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jan 30 2013 Jindrich Novy 0.13.62-2 - rebuild with -fno-strict-aliasing From c419a1426ed11df4531e19db52ef90dbca44fff9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:21:51 -0500 Subject: [PATCH 30/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index d7f18bb..4960992 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.13.62-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.13.62-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 5c9209aa366eb06bd9e48feffe0be4b5f4e4fc9f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:51:57 +0000 Subject: [PATCH 31/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 4960992..987ef29 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.13.62-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.13.62-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f0faa2be7ae5e1da9ac49e47dc0791e6d8d2de6f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:51:42 +0000 Subject: [PATCH 32/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 987ef29..779cbf8 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.13.62-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 0.13.62-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 9dc376125aa802edccfdab920b0bf66271b2454a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:09:52 +0000 Subject: [PATCH 33/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 779cbf8..e3c825c 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.13.62-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.13.62-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 81d5d5c64eab25d8a9e927f286df1f11f43175b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:28:01 +0000 Subject: [PATCH 34/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index e3c825c..c974292 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.13.62-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0.13.62-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0eb12287eb9e73b32b48515ea8f7c2db6570439e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 14:18:19 +0200 Subject: [PATCH 35/85] perl dependency renamed to perl-interpreter --- zziplib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index c974292..e5c545a 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -7,7 +7,7 @@ Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 Patch0: zziplib-0.13.59-multilib.patch -BuildRequires: perl +BuildRequires: perl-interpreter BuildRequires: python BuildRequires: zip BuildRequires: xmlto From 4aff3f39a440a0e61fbd3b7bde60cbd0208a0cda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:47:23 +0000 Subject: [PATCH 36/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index e5c545a..6653e39 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.13.62-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.13.62-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c6a974e94fa6bcf1643c31538e2ed5c793d6a254 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:14:44 +0000 Subject: [PATCH 37/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 6653e39..12fb2ab 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.62 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -100,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.13.62-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.13.62-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b7bf077404d4b843b8dddcb50da26f3879e64ad7 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 1 Feb 2018 22:05:39 +0200 Subject: [PATCH 38/85] Update to 0.13.67 --- zziplib.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 12fb2ab..5bb0f7b 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,11 +1,11 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.62 -Release: 10%{?dist} +Version: 0.13.67 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ -Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2 +Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz Patch0: zziplib-0.13.59-multilib.patch BuildRequires: perl-interpreter BuildRequires: python @@ -100,6 +100,10 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %{_mandir}/man3/* %changelog +* Thu Feb 01 2018 Alexander Bokovoy - 0.13.67-1 +- Update release +- CVE-2018-6381 + * Thu Aug 03 2017 Fedora Release Engineering - 0.13.62-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From e3db5caf0deb1bb1fe0297bf4be411f1ff97cfb9 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 1 Feb 2018 23:04:31 +0200 Subject: [PATCH 39/85] Fix CVE 2018-6381 --- .gitignore | 1 + sources | 2 +- zziplib-0.13.67-CVE-2018-6381.patch | 28 +++++++++++++++++++ ...ib.patch => zziplib-0.13.67-multilib.patch | 10 +++---- zziplib.spec | 13 +++++---- 5 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 zziplib-0.13.67-CVE-2018-6381.patch rename zziplib-0.13.59-multilib.patch => zziplib-0.13.67-multilib.patch (74%) diff --git a/.gitignore b/.gitignore index 575c8ca..e06560b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ zziplib-0.13.49.tar.bz2 /zziplib-0.13.59.tar.bz2 /zziplib-0.13.60.tar.bz2 /zziplib-0.13.62.tar.bz2 +/v0.13.67.tar.gz diff --git a/sources b/sources index 77b7c33..0f2de80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fe874946390f939ee8f4abe9624b96c zziplib-0.13.62.tar.bz2 +SHA512 (v0.13.67.tar.gz) = a34b801a18a2051aa3898a572508ffd327521b69878413af679b10f6a68b37e770651884ae611bf9c01ce14013c6a1e06adeadd3ef6219d4b9278f1b9e7a6459 diff --git a/zziplib-0.13.67-CVE-2018-6381.patch b/zziplib-0.13.67-CVE-2018-6381.patch new file mode 100644 index 0000000..d614558 --- /dev/null +++ b/zziplib-0.13.67-CVE-2018-6381.patch @@ -0,0 +1,28 @@ +From a803559fa9194be895422ba3684cf6309b6bb598 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Thu, 1 Feb 2018 12:27:49 +0100 +Subject: [PATCH] merge CVE-2018-6381.patch from @jmoellers #12 + +--- + zzip/memdisk.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/zzip/memdisk.c b/zzip/memdisk.c +index cab883b..a85dab0 100644 +--- a/zzip/memdisk.c ++++ b/zzip/memdisk.c +@@ -210,6 +210,14 @@ zzip_mem_entry_new(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry) + item->zz_diskstart = zzip_disk_entry_get_diskstart(entry); + item->zz_filetype = zzip_disk_entry_get_filetype(entry); + ++ /* ++ * If the file is uncompressed, zz_csize and zz_usize should be the same ++ * If they are not, we cannot guarantee that either is correct, so ... ++ */ ++ if (item->zz_compr == ZZIP_IS_STORED && item->zz_csize != item->zz_usize) ++ { ++ goto error; ++ } + /* zz_comment and zz_name are empty strings if not present on disk */ + if (! item->zz_comment || ! item->zz_name) + { diff --git a/zziplib-0.13.59-multilib.patch b/zziplib-0.13.67-multilib.patch similarity index 74% rename from zziplib-0.13.59-multilib.patch rename to zziplib-0.13.67-multilib.patch index f4b7a98..169520b 100644 --- a/zziplib-0.13.59-multilib.patch +++ b/zziplib-0.13.67-multilib.patch @@ -1,6 +1,6 @@ -diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h ---- zziplib-0.13.59.orig/zzip/_config.h 2010-02-14 22:29:34.000000000 +0100 -+++ zziplib-0.13.59/zzip/_config.h 2010-12-04 16:22:19.809534085 +0100 +diff -up ./x86_64-redhat-linux-gnu/zzip/_config.h.orig ./x86_64-redhat-linux-gnu/zzip/_config.h +--- ./x86_64-redhat-linux-gnu/zzip/_config.h.orig 2018-02-01 22:13:36.593910695 +0200 ++++ ./x86_64-redhat-linux-gnu/zzip/_config.h 2018-02-01 22:15:40.341476130 +0200 @@ -133,7 +133,11 @@ /* whether the system defaults to 32bit off_t but can do 64bit when requested @@ -14,7 +14,7 @@ diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h /* Define to the sub-directory in which libtool stores uninstalled libraries. */ -@@ -178,8 +181,12 @@ +@@ -183,8 +187,12 @@ /* The number of bytes in type long */ #ifndef ZZIP_SIZEOF_LONG @@ -27,7 +27,7 @@ diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h /* The number of bytes in type short */ #ifndef ZZIP_SIZEOF_SHORT -@@ -209,7 +216,11 @@ +@@ -219,7 +227,11 @@ #endif /* Number of bits in a file offset, on hosts where this is settable. */ diff --git a/zziplib.spec b/zziplib.spec index 5bb0f7b..49f773f 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -6,7 +6,8 @@ License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz -Patch0: zziplib-0.13.59-multilib.patch +Patch0: zziplib-0.13.67-CVE-2018-6381.patch +Patch1: zziplib-0.13.67-multilib.patch BuildRequires: perl-interpreter BuildRequires: python BuildRequires: zip @@ -59,8 +60,6 @@ zziplib library. %prep %setup -q %patch0 -p1 -# Save the common patched _config.h file to overwrite the generated one -cp -a zzip/_config.h _config.h %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -71,13 +70,15 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # Remove rpath on 64bit archs sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool +cd %{_host} +%apply_patch %{PATCH1} -p2 +cd .. + %{__make} %{?_smp_mflags} + %install make install DESTDIR=%{buildroot} -# Overwrite the platform specific _config.h with our own modified common one -rm -f %{buildroot}%{_includedir}/zzip/_config.h -install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h %post -p /sbin/ldconfig From 31bda2e23635ff140b85383401c325af4ecb9749 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 1 Feb 2018 23:14:35 +0200 Subject: [PATCH 40/85] Use predictable builddir --- zziplib.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 49f773f..cac827c 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -66,11 +66,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ --disable-static \ --enable-sdl \ - --enable-frame-pointer + --enable-frame-pointer \ + --enable-builddir=_builddir # Remove rpath on 64bit archs sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool -cd %{_host} +cd _builddir %apply_patch %{PATCH1} -p2 cd .. From cbbc63a862a7ba2a965c76824ab81c7ff1ae8a67 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 1 Feb 2018 23:46:11 +0200 Subject: [PATCH 41/85] Only use patched _config.h on non i686 and armv7hl --- zziplib.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zziplib.spec b/zziplib.spec index cac827c..e0bdcb6 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -71,9 +71,13 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # Remove rpath on 64bit archs sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool +# Only patch generated _config.h on non-i686 and armv7hl +# These platforms have a correct _config.h already +%ifnarch i686 armv7hl cd _builddir %apply_patch %{PATCH1} -p2 cd .. +%endif %{__make} %{?_smp_mflags} From 1ef47efaab46626099b0291d585dad9bcb27e1ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:33:56 +0000 Subject: [PATCH 42/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index e0bdcb6..73b34f1 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.67 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -106,6 +106,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.13.67-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Feb 01 2018 Alexander Bokovoy - 0.13.67-1 - Update release - CVE-2018-6381 From e0dbc893b1516430962d1213611b71beea5e10e1 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 14 Feb 2018 18:36:14 +0200 Subject: [PATCH 43/85] Update to 0.13.68 Fixes #1543942 --- .gitignore | 1 + sources | 1 + zziplib-0.13.67-CVE-2018-6381.patch | 28 ---------------------------- zziplib.spec | 14 ++++++++------ 4 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 zziplib-0.13.67-CVE-2018-6381.patch diff --git a/.gitignore b/.gitignore index e06560b..d01db63 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ zziplib-0.13.49.tar.bz2 /zziplib-0.13.60.tar.bz2 /zziplib-0.13.62.tar.bz2 /v0.13.67.tar.gz +/v0.13.68.tar.gz diff --git a/sources b/sources index 0f2de80..b483c7c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (v0.13.67.tar.gz) = a34b801a18a2051aa3898a572508ffd327521b69878413af679b10f6a68b37e770651884ae611bf9c01ce14013c6a1e06adeadd3ef6219d4b9278f1b9e7a6459 +SHA512 (v0.13.68.tar.gz) = e8a9976242acc04064ec239b9b929228370a946e5bd37092adcc1bda14605710a3850d39795d1937b609d1ab9a9a1998152f8c88b2dccc387ac6ec774d9cfce9 diff --git a/zziplib-0.13.67-CVE-2018-6381.patch b/zziplib-0.13.67-CVE-2018-6381.patch deleted file mode 100644 index d614558..0000000 --- a/zziplib-0.13.67-CVE-2018-6381.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a803559fa9194be895422ba3684cf6309b6bb598 Mon Sep 17 00:00:00 2001 -From: Guido Draheim -Date: Thu, 1 Feb 2018 12:27:49 +0100 -Subject: [PATCH] merge CVE-2018-6381.patch from @jmoellers #12 - ---- - zzip/memdisk.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/zzip/memdisk.c b/zzip/memdisk.c -index cab883b..a85dab0 100644 ---- a/zzip/memdisk.c -+++ b/zzip/memdisk.c -@@ -210,6 +210,14 @@ zzip_mem_entry_new(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry) - item->zz_diskstart = zzip_disk_entry_get_diskstart(entry); - item->zz_filetype = zzip_disk_entry_get_filetype(entry); - -+ /* -+ * If the file is uncompressed, zz_csize and zz_usize should be the same -+ * If they are not, we cannot guarantee that either is correct, so ... -+ */ -+ if (item->zz_compr == ZZIP_IS_STORED && item->zz_csize != item->zz_usize) -+ { -+ goto error; -+ } - /* zz_comment and zz_name are empty strings if not present on disk */ - if (! item->zz_comment || ! item->zz_name) - { diff --git a/zziplib.spec b/zziplib.spec index 73b34f1..dab3b42 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,13 +1,12 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.67 -Release: 2%{?dist} +Version: 0.13.68 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz -Patch0: zziplib-0.13.67-CVE-2018-6381.patch -Patch1: zziplib-0.13.67-multilib.patch +Patch0: zziplib-0.13.67-multilib.patch BuildRequires: perl-interpreter BuildRequires: python BuildRequires: zip @@ -59,7 +58,6 @@ zziplib library. %prep %setup -q -%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -75,7 +73,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool # These platforms have a correct _config.h already %ifnarch i686 armv7hl cd _builddir -%apply_patch %{PATCH1} -p2 +%apply_patch %{PATCH0} -p2 cd .. %endif @@ -106,6 +104,10 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Wed Feb 14 2018 Alexander Bokovoy - 0.13.68-1 +- 0.13.68 +- Fixes: #1543942 (CVE-2018-6484) + * Fri Feb 09 2018 Fedora Release Engineering - 0.13.67-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 722d7637919ae8b240cb019c6f3ed9b983965236 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Sun, 18 Mar 2018 13:53:31 +0100 Subject: [PATCH 44/85] Update Python 2 dependency declarations to new packaging standards --- zziplib.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index dab3b42..c791372 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,14 +1,14 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.68 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz Patch0: zziplib-0.13.67-multilib.patch BuildRequires: perl-interpreter -BuildRequires: python +BuildRequires: python2 BuildRequires: zip BuildRequires: xmlto BuildRequires: zlib-devel @@ -104,6 +104,10 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Sun Mar 18 2018 Iryna Shcherbina - 0.13.68-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 14 2018 Alexander Bokovoy - 0.13.68-1 - 0.13.68 - Fixes: #1543942 (CVE-2018-6484) From 02e349f198dcdfa99e39b93e2ce9a6a82f36c0c3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 45/85] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- zziplib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zziplib.spec b/zziplib.spec index c791372..4e58bd8 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -7,6 +7,7 @@ Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz Patch0: zziplib-0.13.67-multilib.patch +BuildRequires: gcc BuildRequires: perl-interpreter BuildRequires: python2 BuildRequires: zip From 50d3eb122a23e11cba7376f1351d0d4eca1b6014 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:54:27 +0000 Subject: [PATCH 46/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 4e58bd8..d461d6b 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.68 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -105,6 +105,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.13.68-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Mar 18 2018 Iryna Shcherbina - 0.13.68-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 088381c91202c7f59b045a527bad150dc2ce8fdc Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 23 Jul 2018 08:49:26 +0300 Subject: [PATCH 47/85] 0.13.69 release --- .gitignore | 1 + sources | 3 +-- zziplib.spec | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d01db63..a810290 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ zziplib-0.13.49.tar.bz2 /zziplib-0.13.62.tar.bz2 /v0.13.67.tar.gz /v0.13.68.tar.gz +/v0.13.69.tar.gz diff --git a/sources b/sources index b483c7c..4a02881 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (v0.13.67.tar.gz) = a34b801a18a2051aa3898a572508ffd327521b69878413af679b10f6a68b37e770651884ae611bf9c01ce14013c6a1e06adeadd3ef6219d4b9278f1b9e7a6459 -SHA512 (v0.13.68.tar.gz) = e8a9976242acc04064ec239b9b929228370a946e5bd37092adcc1bda14605710a3850d39795d1937b609d1ab9a9a1998152f8c88b2dccc387ac6ec774d9cfce9 +SHA512 (v0.13.69.tar.gz) = ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0 diff --git a/zziplib.spec b/zziplib.spec index d461d6b..6abfea7 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.68 -Release: 3%{?dist} +Version: 0.13.69 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -59,6 +59,8 @@ zziplib library. %prep %setup -q +# Force py2 for the build +find . -name '*.py' | xargs sed -i 's@#! /usr/bin/python@#! %__python2@g;s@#! /usr/bin/env python@#! %__python2@g' %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -105,6 +107,12 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Mon Jul 23 2018 Alexander Bokovoy - 0.13.69-1 +- Update to 0.13.69 release +- Fixes: #1598246 (CVE-2018-6541) +- Fixes: #1554673 (CVE-2018-7727) +- Use versioned python executables everywhere + * Sat Jul 14 2018 Fedora Release Engineering - 0.13.68-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 2a386021d94df83b314c145cb5fb6c5967b1d3ab Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 23 Jul 2018 09:18:42 +0300 Subject: [PATCH 48/85] Rebase multilib patch --- zziplib-0.13.67-multilib.patch | 42 ---------------------------------- zziplib-0.13.69-multilib.patch | 31 +++++++++++++++++++++++++ zziplib.spec | 2 +- 3 files changed, 32 insertions(+), 43 deletions(-) delete mode 100644 zziplib-0.13.67-multilib.patch create mode 100644 zziplib-0.13.69-multilib.patch diff --git a/zziplib-0.13.67-multilib.patch b/zziplib-0.13.67-multilib.patch deleted file mode 100644 index 169520b..0000000 --- a/zziplib-0.13.67-multilib.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up ./x86_64-redhat-linux-gnu/zzip/_config.h.orig ./x86_64-redhat-linux-gnu/zzip/_config.h ---- ./x86_64-redhat-linux-gnu/zzip/_config.h.orig 2018-02-01 22:13:36.593910695 +0200 -+++ ./x86_64-redhat-linux-gnu/zzip/_config.h 2018-02-01 22:15:40.341476130 +0200 -@@ -133,7 +133,11 @@ - - /* whether the system defaults to 32bit off_t but can do 64bit when requested - */ --/* #undef LARGEFILE_SENSITIVE */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP_LARGEFILE_SENSITIVE -+#define ZZIP_LARGEFILE_SENSITIVE 1 -+#endif -+#endif - - /* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -@@ -183,8 +187,12 @@ - - /* The number of bytes in type long */ - #ifndef ZZIP_SIZEOF_LONG -+#if __WORDSIZE == 32 -+#define ZZIP_SIZEOF_LONG 4 -+#elif __WORDSIZE == 64 - #define ZZIP_SIZEOF_LONG 8 - #endif -+#endif - - /* The number of bytes in type short */ - #ifndef ZZIP_SIZEOF_SHORT -@@ -219,7 +227,11 @@ - #endif - - /* Number of bits in a file offset, on hosts where this is settable. */ --/* #undef _FILE_OFFSET_BITS */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP__FILE_OFFSET_BITS -+#define ZZIP__FILE_OFFSET_BITS 64 -+#endif -+#endif - - /* Define for large files, on AIX-style hosts. */ - /* #undef _LARGE_FILES */ diff --git a/zziplib-0.13.69-multilib.patch b/zziplib-0.13.69-multilib.patch new file mode 100644 index 0000000..24cf64b --- /dev/null +++ b/zziplib-0.13.69-multilib.patch @@ -0,0 +1,31 @@ +diff -up ./_builddir/zzip/_config.h.orig ./_builddir/zzip/_config.h +--- ./_builddir/zzip/_config.h.orig 2018-07-23 09:11:59.971840954 +0300 ++++ ./_builddir/zzip/_config.h 2018-07-23 09:12:07.438731527 +0300 +@@ -139,6 +139,11 @@ + /* whether the system defaults to 32bit off_t but can do 64bit when requested + */ + /* #undef LARGEFILE_SENSITIVE */ ++#if __WORDSIZE == 32 ++#ifndef ZZIP_LARGEFILE_SENSITIVE ++#define ZZIP_LARGEFILE_SENSITIVE 1 ++#endif ++#endif + + /* Define to the sub-directory where libtool stores uninstalled libraries. */ + #ifndef ZZIP_LT_OBJDIR +@@ -197,6 +202,15 @@ + /* The number of bytes in type short */ + /* #undef SIZEOF_SHORT */ + ++/* The number of bytes in type long */ ++#ifndef ZZIP_SIZEOF_LONG ++#if __WORDSIZE == 32 ++#define ZZIP_SIZEOF_LONG 4 ++#elif __WORDSIZE == 64 ++#define ZZIP_SIZEOF_LONG 8 ++#endif ++#endif ++ + /* Define to 1 if you have the ANSI C header files. */ + #ifndef ZZIP_STDC_HEADERS + #define ZZIP_STDC_HEADERS 1 diff --git a/zziplib.spec b/zziplib.spec index 6abfea7..ccb4a52 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -6,7 +6,7 @@ License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz -Patch0: zziplib-0.13.67-multilib.patch +Patch0: zziplib-0.13.69-multilib.patch BuildRequires: gcc BuildRequires: perl-interpreter BuildRequires: python2 From 5127c312bef48e277a0660ffaf757bcfdcb3c53b Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 23 Jul 2018 09:27:35 +0300 Subject: [PATCH 49/85] use explicit Python 2 --- zziplib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zziplib.spec b/zziplib.spec index ccb4a52..3490e07 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -64,6 +64,7 @@ find . -name '*.py' | xargs sed -i 's@#! /usr/bin/python@#! %__python2@g;s@#! /u %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export PYTHON=%__python2 %configure \ --disable-static \ --enable-sdl \ From 859b969a38dd96fd445fba7dd32bcc4bcd516e7e Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 23 Jul 2018 09:36:12 +0300 Subject: [PATCH 50/85] BuildRequires: python2-rpm-macros for %__python2 --- zziplib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zziplib.spec b/zziplib.spec index 3490e07..3ad012d 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -10,6 +10,7 @@ Patch0: zziplib-0.13.69-multilib.patch BuildRequires: gcc BuildRequires: perl-interpreter BuildRequires: python2 +BuildRequires: python2-rpm-macros BuildRequires: zip BuildRequires: xmlto BuildRequires: zlib-devel From a45bdf8fabe9ae03a085dcafb743e09ff0ad3cd8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:24 +0100 Subject: [PATCH 51/85] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- zziplib.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 3ad012d..44a72a6 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -88,9 +88,7 @@ cd .. %install make install DESTDIR=%{buildroot} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc docs/COPYING* ChangeLog README TODO From d2c611006e8633461c8caca32cef9921f918cf2c Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 24 Jan 2019 13:52:33 +0100 Subject: [PATCH 52/85] Fix: CVE-2018-17828 Resolves: CVE-2018-17828 Related: #1635890 --- CVE-2018-17828.patch | 341 +++++++++++++++++++++++++++++++++++++++++++ zziplib.spec | 15 +- 2 files changed, 355 insertions(+), 1 deletion(-) create mode 100644 CVE-2018-17828.patch diff --git a/CVE-2018-17828.patch b/CVE-2018-17828.patch new file mode 100644 index 0000000..a340295 --- /dev/null +++ b/CVE-2018-17828.patch @@ -0,0 +1,341 @@ +From 81dfa6b3e08f6934885ba5c98939587d6850d08e Mon Sep 17 00:00:00 2001 +From: Josef Moellers +Date: Thu, 4 Oct 2018 14:21:48 +0200 +Subject: [PATCH] Fix issue #62: Remove any "../" components from pathnames of + extracted files. [CVE-2018-17828] + +--- + bins/unzzipcat-big.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + bins/unzzipcat-mem.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + bins/unzzipcat-mix.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + bins/unzzipcat-zip.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + 4 files changed, 224 insertions(+), 4 deletions(-) + +diff --git a/bins/unzzipcat-big.c b/bins/unzzipcat-big.c +index 982d262..88c4d65 100644 +--- a/bins/unzzipcat-big.c ++++ b/bins/unzzipcat-big.c +@@ -53,6 +53,48 @@ static void unzzip_cat_file(FILE* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -70,6 +112,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -79,7 +131,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + +diff --git a/bins/unzzipcat-mem.c b/bins/unzzipcat-mem.c +index 9bc966b..793bde8 100644 +--- a/bins/unzzipcat-mem.c ++++ b/bins/unzzipcat-mem.c +@@ -58,6 +58,48 @@ static void unzzip_mem_disk_cat_file(ZZIP_MEM_DISK* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -75,6 +117,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -84,7 +136,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + static int unzzip_cat (int argc, char ** argv, int extract) +diff --git a/bins/unzzipcat-mix.c b/bins/unzzipcat-mix.c +index 91c2f00..73b6ed6 100644 +--- a/bins/unzzipcat-mix.c ++++ b/bins/unzzipcat-mix.c +@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -86,6 +128,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + static int unzzip_cat (int argc, char ** argv, int extract) +diff --git a/bins/unzzipcat-zip.c b/bins/unzzipcat-zip.c +index 2810f85..7f7f3fa 100644 +--- a/bins/unzzipcat-zip.c ++++ b/bins/unzzipcat-zip.c +@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -86,6 +128,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + static int unzzip_cat (int argc, char ** argv, int extract) diff --git a/zziplib.spec b/zziplib.spec index 44a72a6..60b9916 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,12 +1,17 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz Patch0: zziplib-0.13.69-multilib.patch + +Patch1: CVE-2018-17828.patch +Patch2: CVE-2018-17828.part2.patch + + BuildRequires: gcc BuildRequires: perl-interpreter BuildRequires: python2 @@ -60,6 +65,10 @@ zziplib library. %prep %setup -q + +%patch1 -p1 +%patch2 -p1 + # Force py2 for the build find . -name '*.py' | xargs sed -i 's@#! /usr/bin/python@#! %__python2@g;s@#! /usr/bin/env python@#! %__python2@g' @@ -107,6 +116,10 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Thu Jan 24 2019 Jakub Martisko - 0.13.69-2 +Related: 1635890 +Resolves: CVE-2018-17828 + * Mon Jul 23 2018 Alexander Bokovoy - 0.13.69-1 - Update to 0.13.69 release - Fixes: #1598246 (CVE-2018-6541) From ff7beb94fb032eb0255f740df96e7a882b9f1051 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 24 Jan 2019 14:14:10 +0100 Subject: [PATCH 53/85] Fix: CVE-2018-16548 Related: #1626202 Resolves: CVE-2018-16548 --- CVE-2018-16548.part1.patch | 71 ++++++++++++++++++++++++++++++++++++++ CVE-2018-16548.part2.patch | 50 +++++++++++++++++++++++++++ CVE-2018-16548.part3.patch | 22 ++++++++++++ zziplib.spec | 13 +++++-- 4 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 CVE-2018-16548.part1.patch create mode 100644 CVE-2018-16548.part2.patch create mode 100644 CVE-2018-16548.part3.patch diff --git a/CVE-2018-16548.part1.patch b/CVE-2018-16548.part1.patch new file mode 100644 index 0000000..25c2b74 --- /dev/null +++ b/CVE-2018-16548.part1.patch @@ -0,0 +1,71 @@ +From 9411bde3e4a70a81ff3ffd256b71927b2d90dcbb Mon Sep 17 00:00:00 2001 +From: jmoellers +Date: Fri, 7 Sep 2018 11:32:04 +0200 +Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). + +--- + test/test.zip | Bin 1361 -> 1361 bytes + zzip/zip.c | 36 ++++++++++++++++++++++++++++++++++-- + 2 files changed, 34 insertions(+), 2 deletions(-) + +diff --git a/zzip/zip.c b/zzip/zip.c +index 88b833b..a685280 100644 +--- a/zzip/zip.c ++++ b/zzip/zip.c +@@ -475,9 +475,15 @@ __zzip_parse_root_directory(int fd, + } else + { + if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0) ++ { ++ free(hdr0); + return ZZIP_DIR_SEEK; ++ } + if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent)) ++ { ++ free(hdr0); + return ZZIP_DIR_READ; ++ } + d = &dirent; + } + +@@ -577,12 +583,38 @@ __zzip_parse_root_directory(int fd, + + if (hdr_return) + *hdr_return = hdr0; ++ else ++ { ++ /* If it is not assigned to *hdr_return, it will never be free()'d */ ++ free(hdr0); ++ /* Make sure we don't free it again in case of error */ ++ hdr0 = NULL; ++ } + } /* else zero (sane) entries */ + # ifndef ZZIP_ALLOW_MODULO_ENTRIES +- return (entries != zz_entries ? ZZIP_CORRUPTED : 0); ++ if (entries != zz_entries) ++ { ++ /* If it was assigned to *hdr_return, undo assignment */ ++ if (p_reclen && hdr_return) ++ *hdr_return = NULL; ++ /* Free it, if it was not already free()'d */ ++ if (hdr0 != NULL) ++ free(hdr0); ++ return ZZIP_CORRUPTED; ++ } + # else +- return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0); ++ if (((entries & (unsigned)0xFFFF) != zz_entries) ++ { ++ /* If it was assigned to *hdr_return, undo assignment */ ++ if (p_reclen && hdr_return) ++ *hdr_return = NULL; ++ /* Free it, if it was not already free()'d */ ++ if (hdr0 != NULL) ++ free(hdr0); ++ return ZZIP_CORRUPTED; ++ } + # endif ++ return 0; + } + + /* ------------------------- high-level interface ------------------------- */ diff --git a/CVE-2018-16548.part2.patch b/CVE-2018-16548.part2.patch new file mode 100644 index 0000000..b9bea26 --- /dev/null +++ b/CVE-2018-16548.part2.patch @@ -0,0 +1,50 @@ +From d2e5d5c53212e54a97ad64b793a4389193fec687 Mon Sep 17 00:00:00 2001 +From: jmoellers +Date: Fri, 7 Sep 2018 11:49:28 +0200 +Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). + +--- + zzip/zip.c | 25 ++----------------------- + 1 file changed, 2 insertions(+), 23 deletions(-) + +diff --git a/zzip/zip.c b/zzip/zip.c +index a685280..51a1a4d 100644 +--- a/zzip/zip.c ++++ b/zzip/zip.c +@@ -587,34 +587,13 @@ __zzip_parse_root_directory(int fd, + { + /* If it is not assigned to *hdr_return, it will never be free()'d */ + free(hdr0); +- /* Make sure we don't free it again in case of error */ +- hdr0 = NULL; + } + } /* else zero (sane) entries */ + # ifndef ZZIP_ALLOW_MODULO_ENTRIES +- if (entries != zz_entries) +- { +- /* If it was assigned to *hdr_return, undo assignment */ +- if (p_reclen && hdr_return) +- *hdr_return = NULL; +- /* Free it, if it was not already free()'d */ +- if (hdr0 != NULL) +- free(hdr0); +- return ZZIP_CORRUPTED; +- } ++ return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; + # else +- if (((entries & (unsigned)0xFFFF) != zz_entries) +- { +- /* If it was assigned to *hdr_return, undo assignment */ +- if (p_reclen && hdr_return) +- *hdr_return = NULL; +- /* Free it, if it was not already free()'d */ +- if (hdr0 != NULL) +- free(hdr0); +- return ZZIP_CORRUPTED; +- } ++ return ((entries & (unsigned)0xFFFF) != zz_entries) ? ZZIP_CORRUPTED : 0; + # endif +- return 0; + } + + /* ------------------------- high-level interface ------------------------- */ diff --git a/CVE-2018-16548.part3.patch b/CVE-2018-16548.part3.patch new file mode 100644 index 0000000..f2f8214 --- /dev/null +++ b/CVE-2018-16548.part3.patch @@ -0,0 +1,22 @@ +From 0e1dadb05c1473b9df2d7b8f298dab801778ef99 Mon Sep 17 00:00:00 2001 +From: jmoellers +Date: Fri, 7 Sep 2018 13:55:35 +0200 +Subject: [PATCH] One more free() to avoid memory leak. + +--- + zzip/zip.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/zzip/zip.c b/zzip/zip.c +index 51a1a4d..bc6c080 100644 +--- a/zzip/zip.c ++++ b/zzip/zip.c +@@ -589,6 +589,8 @@ __zzip_parse_root_directory(int fd, + free(hdr0); + } + } /* else zero (sane) entries */ ++ else ++ free(hdr0); + # ifndef ZZIP_ALLOW_MODULO_ENTRIES + return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; + # else diff --git a/zziplib.spec b/zziplib.spec index 60b9916..2379fa3 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -10,7 +10,9 @@ Patch0: zziplib-0.13.69-multilib.patch Patch1: CVE-2018-17828.patch Patch2: CVE-2018-17828.part2.patch - +Patch3: CVE-2018-16548.part1.patch +Patch4: CVE-2018-16548.part2.patch +Patch5: CVE-2018-16548.part3.patch BuildRequires: gcc BuildRequires: perl-interpreter @@ -68,6 +70,9 @@ zziplib library. %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 # Force py2 for the build find . -name '*.py' | xargs sed -i 's@#! /usr/bin/python@#! %__python2@g;s@#! /usr/bin/env python@#! %__python2@g' @@ -116,6 +121,10 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Thu Jan 24 2019 Jakub Martisko - 0.13.69-3 +Related: #1626202 +Resolves: CVE-2018-16548 + * Thu Jan 24 2019 Jakub Martisko - 0.13.69-2 Related: 1635890 Resolves: CVE-2018-17828 From 779eaf6adc99c825b2b9f4d050d1ac106ad6c3a2 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 24 Jan 2019 16:06:43 +0100 Subject: [PATCH 54/85] Add: the patch which should have been part of the 0.13.69-2 commit --- CVE-2018-17828.part2.patch | 55 ++++++++++++++++++++++++++++++++++++++ zziplib.spec | 14 ++++++---- 2 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 CVE-2018-17828.part2.patch diff --git a/CVE-2018-17828.part2.patch b/CVE-2018-17828.part2.patch new file mode 100644 index 0000000..111167c --- /dev/null +++ b/CVE-2018-17828.part2.patch @@ -0,0 +1,55 @@ +diff --git a/bins/unzip-mem.c b/bins/unzip-mem.c +index c45cb72..ff564a5 100644 +--- a/bins/unzip-mem.c ++++ b/bins/unzip-mem.c +@@ -88,10 +88,49 @@ static void zzip_mem_entry_pipe(ZZIP_MEM_DISK* disk, + } + } + ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void zzip_mem_entry_make(ZZIP_MEM_DISK* disk, + ZZIP_MEM_ENTRY* entry) + { +- FILE* file = fopen (entry->zz_name, "wb"); ++ char name_stripped[PATH_MAX]; ++ FILE* file; ++ ++ strncpy(name_stripped, entry->zz_name, PATH_MAX); ++ remove_dotdotslash(name_stripped); ++ ++ file = fopen (name_stripped, "wb"); + if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); } + perror (entry->zz_name); + if (status < EXIT_WARNINGS) status = EXIT_WARNINGS; diff --git a/zziplib.spec b/zziplib.spec index 2379fa3..9b0a806 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ or MPLv1.1 Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -121,13 +121,17 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Thu Jan 24 2019 Jakub Martisko - 0.13.69-4 +- Add the missing CVE-2018-17828.part2.patch file +- Fix Formating of the previous 2 changelog entries + * Thu Jan 24 2019 Jakub Martisko - 0.13.69-3 -Related: #1626202 -Resolves: CVE-2018-16548 +- Related: #1626202 +- Resolves: CVE-2018-16548 * Thu Jan 24 2019 Jakub Martisko - 0.13.69-2 -Related: 1635890 -Resolves: CVE-2018-17828 +- Related: 1635890 +- Resolves: CVE-2018-17828 * Mon Jul 23 2018 Alexander Bokovoy - 0.13.69-1 - Update to 0.13.69 release From 03fe7364f25d807f21204efbb124066db868b09c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 55/85] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- zziplib.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 9b0a806..2b74deb 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -3,7 +3,6 @@ Name: zziplib Version: 0.13.69 Release: 4%{?dist} License: LGPLv2+ or MPLv1.1 -Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz Patch0: zziplib-0.13.69-multilib.patch @@ -35,7 +34,6 @@ which is actually used by the zip/unzip tools. %package utils Summary: Utilities for the zziplib library -Group: Applications/Archiving Requires: %{name}%{?_isa} = %{version}-%{release} %description utils @@ -49,7 +47,6 @@ This packages contains all the utilities that come with the zziplib library. %package devel Summary: Development files for the zziplib library -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig Requires: zlib-devel From 3353105e7144fdca28a7f47690391fa2423640b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:16:39 +0000 Subject: [PATCH 56/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 2b74deb..94ba2ae 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -118,6 +118,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.13.69-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 24 2019 Jakub Martisko - 0.13.69-4 - Add the missing CVE-2018-17828.part2.patch file - Fix Formating of the previous 2 changelog entries From fe140755ee739bcc5e87277fa16bba7a4c743066 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:06:47 +0000 Subject: [PATCH 57/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 94ba2ae..72806dc 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -118,6 +118,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.13.69-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.13.69-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9442a538453d039ef2867327d3d039dfc5406a3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:25:30 +0000 Subject: [PATCH 58/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 72806dc..0f3b447 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -118,6 +118,9 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.13.69-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.13.69-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1563ca676bc1c81caf39903cc95af956bcd593ef Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 15:13:26 +0000 Subject: [PATCH 59/85] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- zziplib.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 0f3b447..d5c2b20 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -93,11 +93,11 @@ cd _builddir cd .. %endif -%{__make} %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %ldconfig_scriptlets @@ -118,6 +118,10 @@ make install DESTDIR=%{buildroot} %{_mandir}/man3/* %changelog +* Tue Jul 14 2020 Tom Stellard - 0.13.69-8 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Fri Jan 31 2020 Fedora Release Engineering - 0.13.69-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 064e05a582b0706888980a9354ea73e43251ca8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:29:06 +0000 Subject: [PATCH 60/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index d5c2b20..6ff3d16 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.69 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -118,6 +118,9 @@ cd .. %{_mandir}/man3/* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.13.69-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Tom Stellard - 0.13.69-8 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 8ed233c742dd7fe0f12b9993353a1289c62f2f3f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:57:05 +0000 Subject: [PATCH 61/85] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- zziplib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zziplib.spec b/zziplib.spec index 6ff3d16..a065b1c 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -13,6 +13,7 @@ Patch3: CVE-2018-16548.part1.patch Patch4: CVE-2018-16548.part2.patch Patch5: CVE-2018-16548.part3.patch +BuildRequires: make BuildRequires: gcc BuildRequires: perl-interpreter BuildRequires: python2 From 1192b9170b48cf58fa568f4b44d2d5bf6d0818a7 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 21 Jan 2021 11:05:32 +0100 Subject: [PATCH 62/85] Rebase to 0.13.71 Build no longer needs python2 Resolves: 1807565 --- .gitignore | 1 + CVE-2018-16548.part1.patch | 71 -------- CVE-2018-16548.part2.patch | 50 ------ CVE-2018-16548.part3.patch | 22 --- CVE-2018-17828.part2.patch | 55 ------ CVE-2018-17828.patch | 341 ------------------------------------- sources | 2 +- zziplib.spec | 39 ++--- 8 files changed, 16 insertions(+), 565 deletions(-) delete mode 100644 CVE-2018-16548.part1.patch delete mode 100644 CVE-2018-16548.part2.patch delete mode 100644 CVE-2018-16548.part3.patch delete mode 100644 CVE-2018-17828.part2.patch delete mode 100644 CVE-2018-17828.patch diff --git a/.gitignore b/.gitignore index a810290..2b7387c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ zziplib-0.13.49.tar.bz2 /v0.13.67.tar.gz /v0.13.68.tar.gz /v0.13.69.tar.gz +/v0.13.71.tar.gz diff --git a/CVE-2018-16548.part1.patch b/CVE-2018-16548.part1.patch deleted file mode 100644 index 25c2b74..0000000 --- a/CVE-2018-16548.part1.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 9411bde3e4a70a81ff3ffd256b71927b2d90dcbb Mon Sep 17 00:00:00 2001 -From: jmoellers -Date: Fri, 7 Sep 2018 11:32:04 +0200 -Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). - ---- - test/test.zip | Bin 1361 -> 1361 bytes - zzip/zip.c | 36 ++++++++++++++++++++++++++++++++++-- - 2 files changed, 34 insertions(+), 2 deletions(-) - -diff --git a/zzip/zip.c b/zzip/zip.c -index 88b833b..a685280 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -475,9 +475,15 @@ __zzip_parse_root_directory(int fd, - } else - { - if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0) -+ { -+ free(hdr0); - return ZZIP_DIR_SEEK; -+ } - if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent)) -+ { -+ free(hdr0); - return ZZIP_DIR_READ; -+ } - d = &dirent; - } - -@@ -577,12 +583,38 @@ __zzip_parse_root_directory(int fd, - - if (hdr_return) - *hdr_return = hdr0; -+ else -+ { -+ /* If it is not assigned to *hdr_return, it will never be free()'d */ -+ free(hdr0); -+ /* Make sure we don't free it again in case of error */ -+ hdr0 = NULL; -+ } - } /* else zero (sane) entries */ - # ifndef ZZIP_ALLOW_MODULO_ENTRIES -- return (entries != zz_entries ? ZZIP_CORRUPTED : 0); -+ if (entries != zz_entries) -+ { -+ /* If it was assigned to *hdr_return, undo assignment */ -+ if (p_reclen && hdr_return) -+ *hdr_return = NULL; -+ /* Free it, if it was not already free()'d */ -+ if (hdr0 != NULL) -+ free(hdr0); -+ return ZZIP_CORRUPTED; -+ } - # else -- return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0); -+ if (((entries & (unsigned)0xFFFF) != zz_entries) -+ { -+ /* If it was assigned to *hdr_return, undo assignment */ -+ if (p_reclen && hdr_return) -+ *hdr_return = NULL; -+ /* Free it, if it was not already free()'d */ -+ if (hdr0 != NULL) -+ free(hdr0); -+ return ZZIP_CORRUPTED; -+ } - # endif -+ return 0; - } - - /* ------------------------- high-level interface ------------------------- */ diff --git a/CVE-2018-16548.part2.patch b/CVE-2018-16548.part2.patch deleted file mode 100644 index b9bea26..0000000 --- a/CVE-2018-16548.part2.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d2e5d5c53212e54a97ad64b793a4389193fec687 Mon Sep 17 00:00:00 2001 -From: jmoellers -Date: Fri, 7 Sep 2018 11:49:28 +0200 -Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). - ---- - zzip/zip.c | 25 ++----------------------- - 1 file changed, 2 insertions(+), 23 deletions(-) - -diff --git a/zzip/zip.c b/zzip/zip.c -index a685280..51a1a4d 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -587,34 +587,13 @@ __zzip_parse_root_directory(int fd, - { - /* If it is not assigned to *hdr_return, it will never be free()'d */ - free(hdr0); -- /* Make sure we don't free it again in case of error */ -- hdr0 = NULL; - } - } /* else zero (sane) entries */ - # ifndef ZZIP_ALLOW_MODULO_ENTRIES -- if (entries != zz_entries) -- { -- /* If it was assigned to *hdr_return, undo assignment */ -- if (p_reclen && hdr_return) -- *hdr_return = NULL; -- /* Free it, if it was not already free()'d */ -- if (hdr0 != NULL) -- free(hdr0); -- return ZZIP_CORRUPTED; -- } -+ return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; - # else -- if (((entries & (unsigned)0xFFFF) != zz_entries) -- { -- /* If it was assigned to *hdr_return, undo assignment */ -- if (p_reclen && hdr_return) -- *hdr_return = NULL; -- /* Free it, if it was not already free()'d */ -- if (hdr0 != NULL) -- free(hdr0); -- return ZZIP_CORRUPTED; -- } -+ return ((entries & (unsigned)0xFFFF) != zz_entries) ? ZZIP_CORRUPTED : 0; - # endif -- return 0; - } - - /* ------------------------- high-level interface ------------------------- */ diff --git a/CVE-2018-16548.part3.patch b/CVE-2018-16548.part3.patch deleted file mode 100644 index f2f8214..0000000 --- a/CVE-2018-16548.part3.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0e1dadb05c1473b9df2d7b8f298dab801778ef99 Mon Sep 17 00:00:00 2001 -From: jmoellers -Date: Fri, 7 Sep 2018 13:55:35 +0200 -Subject: [PATCH] One more free() to avoid memory leak. - ---- - zzip/zip.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/zzip/zip.c b/zzip/zip.c -index 51a1a4d..bc6c080 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -589,6 +589,8 @@ __zzip_parse_root_directory(int fd, - free(hdr0); - } - } /* else zero (sane) entries */ -+ else -+ free(hdr0); - # ifndef ZZIP_ALLOW_MODULO_ENTRIES - return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; - # else diff --git a/CVE-2018-17828.part2.patch b/CVE-2018-17828.part2.patch deleted file mode 100644 index 111167c..0000000 --- a/CVE-2018-17828.part2.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/bins/unzip-mem.c b/bins/unzip-mem.c -index c45cb72..ff564a5 100644 ---- a/bins/unzip-mem.c -+++ b/bins/unzip-mem.c -@@ -88,10 +88,49 @@ static void zzip_mem_entry_pipe(ZZIP_MEM_DISK* disk, - } - } - -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void zzip_mem_entry_make(ZZIP_MEM_DISK* disk, - ZZIP_MEM_ENTRY* entry) - { -- FILE* file = fopen (entry->zz_name, "wb"); -+ char name_stripped[PATH_MAX]; -+ FILE* file; -+ -+ strncpy(name_stripped, entry->zz_name, PATH_MAX); -+ remove_dotdotslash(name_stripped); -+ -+ file = fopen (name_stripped, "wb"); - if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); } - perror (entry->zz_name); - if (status < EXIT_WARNINGS) status = EXIT_WARNINGS; diff --git a/CVE-2018-17828.patch b/CVE-2018-17828.patch deleted file mode 100644 index a340295..0000000 --- a/CVE-2018-17828.patch +++ /dev/null @@ -1,341 +0,0 @@ -From 81dfa6b3e08f6934885ba5c98939587d6850d08e Mon Sep 17 00:00:00 2001 -From: Josef Moellers -Date: Thu, 4 Oct 2018 14:21:48 +0200 -Subject: [PATCH] Fix issue #62: Remove any "../" components from pathnames of - extracted files. [CVE-2018-17828] - ---- - bins/unzzipcat-big.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - bins/unzzipcat-mem.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - bins/unzzipcat-mix.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - bins/unzzipcat-zip.c | 57 +++++++++++++++++++++++++++++++++++++++++++- - 4 files changed, 224 insertions(+), 4 deletions(-) - -diff --git a/bins/unzzipcat-big.c b/bins/unzzipcat-big.c -index 982d262..88c4d65 100644 ---- a/bins/unzzipcat-big.c -+++ b/bins/unzzipcat-big.c -@@ -53,6 +53,48 @@ static void unzzip_cat_file(FILE* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -70,6 +112,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -79,7 +131,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - -diff --git a/bins/unzzipcat-mem.c b/bins/unzzipcat-mem.c -index 9bc966b..793bde8 100644 ---- a/bins/unzzipcat-mem.c -+++ b/bins/unzzipcat-mem.c -@@ -58,6 +58,48 @@ static void unzzip_mem_disk_cat_file(ZZIP_MEM_DISK* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -75,6 +117,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -84,7 +136,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - static int unzzip_cat (int argc, char ** argv, int extract) -diff --git a/bins/unzzipcat-mix.c b/bins/unzzipcat-mix.c -index 91c2f00..73b6ed6 100644 ---- a/bins/unzzipcat-mix.c -+++ b/bins/unzzipcat-mix.c -@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -86,6 +128,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - static int unzzip_cat (int argc, char ** argv, int extract) -diff --git a/bins/unzzipcat-zip.c b/bins/unzzipcat-zip.c -index 2810f85..7f7f3fa 100644 ---- a/bins/unzzipcat-zip.c -+++ b/bins/unzzipcat-zip.c -@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) - } - } - -+/* -+ * NAME: remove_dotdotslash -+ * PURPOSE: To remove any "../" components from the given pathname -+ * ARGUMENTS: path: path name with maybe "../" components -+ * RETURNS: Nothing, "path" is modified in-place -+ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! -+ * Also, "path" is not used after creating it. -+ * So modifying "path" in-place is safe to do. -+ */ -+static inline void -+remove_dotdotslash(char *path) -+{ -+ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ -+ char *dotdotslash; -+ int warned = 0; -+ -+ dotdotslash = path; -+ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) -+ { -+ /* -+ * Remove only if at the beginning of the pathname ("../path/name") -+ * or when preceded by a slash ("path/../name"), -+ * otherwise not ("path../name..")! -+ */ -+ if (dotdotslash == path || dotdotslash[-1] == '/') -+ { -+ char *src, *dst; -+ if (!warned) -+ { -+ /* Note: the first time through the pathname is still intact */ -+ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); -+ warned = 1; -+ } -+ /* We cannot use strcpy(), as there "The strings may not overlap" */ -+ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) -+ ; -+ } -+ else -+ dotdotslash +=3; /* skip this instance to prevent infinite loop */ -+ } -+} -+ - static void makedirs(const char* name) - { - char* p = strrchr(name, '/'); -@@ -86,6 +128,16 @@ static void makedirs(const char* name) - - static FILE* create_fopen(char* name, char* mode, int subdirs) - { -+ char *name_stripped; -+ FILE *fp; -+ int mustfree = 0; -+ -+ if ((name_stripped = strdup(name)) != NULL) -+ { -+ remove_dotdotslash(name_stripped); -+ name = name_stripped; -+ mustfree = 1; -+ } - if (subdirs) - { - char* p = strrchr(name, '/'); -@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) - free (dir_name); - } - } -- return fopen(name, mode); -+ fp = fopen(name, mode); -+ if (mustfree) -+ free(name_stripped); -+ return fp; - } - - static int unzzip_cat (int argc, char ** argv, int extract) diff --git a/sources b/sources index 4a02881..562f581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.13.69.tar.gz) = ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0 +SHA512 (v0.13.71.tar.gz) = e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5 diff --git a/zziplib.spec b/zziplib.spec index a065b1c..a379384 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,23 +1,17 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.69 -Release: 9%{?dist} +Version: 0.13.71 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz Patch0: zziplib-0.13.69-multilib.patch -Patch1: CVE-2018-17828.patch -Patch2: CVE-2018-17828.part2.patch -Patch3: CVE-2018-16548.part1.patch -Patch4: CVE-2018-16548.part2.patch -Patch5: CVE-2018-16548.part3.patch - BuildRequires: make BuildRequires: gcc BuildRequires: perl-interpreter -BuildRequires: python2 -BuildRequires: python2-rpm-macros +BuildRequires: python +BuildRequires: python-rpm-macros BuildRequires: zip BuildRequires: xmlto BuildRequires: zlib-devel @@ -66,32 +60,21 @@ zziplib library. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 - -# Force py2 for the build -find . -name '*.py' | xargs sed -i 's@#! /usr/bin/python@#! %__python2@g;s@#! /usr/bin/env python@#! %__python2@g' %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export PYTHON=%__python2 %configure \ --disable-static \ --enable-sdl \ - --enable-frame-pointer \ - --enable-builddir=_builddir + --enable-frame-pointer # Remove rpath on 64bit archs -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' */libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Only patch generated _config.h on non-i686 and armv7hl # These platforms have a correct _config.h already + %ifnarch i686 armv7hl -cd _builddir %apply_patch %{PATCH0} -p2 -cd .. %endif %make_build @@ -119,6 +102,12 @@ cd .. %{_mandir}/man3/* %changelog +* Thu Jan 21 2021 Jakub Martisko - 0.13.71-1 +- Rebase to 0.13.71 +- Drop the CVE patches, they are now part of the upstream package +- Build no longer requires python2 +- Resolves: 1807565 + * Wed Jul 29 2020 Fedora Release Engineering - 0.13.69-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7b961e1f4cf8a43d67fceff49e54b436fdcba793 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:47:23 +0000 Subject: [PATCH 63/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index a379384..bd53e15 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -102,6 +102,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_mandir}/man3/* %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.13.71-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 21 2021 Jakub Martisko - 0.13.71-1 - Rebase to 0.13.71 - Drop the CVE patches, they are now part of the upstream package From f438f94aec8a9a7e6a447b2432fe95a7a275a6f4 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Mon, 1 Feb 2021 15:41:03 +0100 Subject: [PATCH 64/85] Use versioned python3 as buildrequires --- zziplib.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index bd53e15..a6ea96e 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -10,8 +10,8 @@ Patch0: zziplib-0.13.69-multilib.patch BuildRequires: make BuildRequires: gcc BuildRequires: perl-interpreter -BuildRequires: python -BuildRequires: python-rpm-macros +BuildRequires: python3 +BuildRequires: python3-rpm-macros BuildRequires: zip BuildRequires: xmlto BuildRequires: zlib-devel @@ -102,6 +102,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_mandir}/man3/* %changelog +* Mon Feb 01 2021 Jakub Martisko - 0.13.71-3 +- Use python3 (versioned) as buildrequires + * Thu Jan 28 2021 Fedora Release Engineering - 0.13.71-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bdb7772234f4886afee4f8d86712853e9432f450 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:24:26 +0000 Subject: [PATCH 65/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index a6ea96e..2fc3e42 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -102,6 +102,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_mandir}/man3/* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.13.71-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 01 2021 Jakub Martisko - 0.13.71-3 - Use python3 (versioned) as buildrequires From dcff9c0002e4a4bbd78d738d684e4c1866c8ad5b Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 1 Sep 2021 18:19:41 +0200 Subject: [PATCH 66/85] Sync the multilib patches with rhel Resolves: rhbz#1988061 Related: rhbz#1915747 --- multilib-32.patch | 29 +++++++++++++++++++++++++++++ multilib-64.patch | 29 +++++++++++++++++++++++++++++ zziplib-0.13.69-multilib.patch | 31 ------------------------------- 3 files changed, 58 insertions(+), 31 deletions(-) create mode 100644 multilib-32.patch create mode 100644 multilib-64.patch delete mode 100644 zziplib-0.13.69-multilib.patch diff --git a/multilib-32.patch b/multilib-32.patch new file mode 100644 index 0000000..ae99a59 --- /dev/null +++ b/multilib-32.patch @@ -0,0 +1,29 @@ +--- ./a/zzip/_config.h 2021-07-21 14:18:09.000000000 +0200 ++++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200 +@@ -138,9 +138,12 @@ + + /* whether the system defaults to 32bit off_t but can do 64bit when requested + */ ++#if __WORDSIZE == 32 + #ifndef ZZIP_LARGEFILE_SENSITIVE + #define ZZIP_LARGEFILE_SENSITIVE 1 + #endif ++#endif ++/* #undef LARGEFILE_SENSITIVE */ + + /* Define to the sub-directory where libtool stores uninstalled libraries. */ + #ifndef ZZIP_LT_OBJDIR +@@ -227,9 +230,13 @@ + #endif + + /* Number of bits in a file offset, on hosts where this is settable. */ ++#if __WORDSIZE == 32 + #ifndef ZZIP__FILE_OFFSET_BITS + #define ZZIP__FILE_OFFSET_BITS 64 + #endif ++#endif ++/* #undef _FILE_OFFSET_BITS */ ++ + + /* Define for large files, on AIX-style hosts. */ + /* #undef _LARGE_FILES */ diff --git a/multilib-64.patch b/multilib-64.patch new file mode 100644 index 0000000..5285e3a --- /dev/null +++ b/multilib-64.patch @@ -0,0 +1,29 @@ +--- ./a/zzip/_config.h 2021-07-21 14:18:14.000000000 +0200 ++++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200 +@@ -138,6 +138,11 @@ + + /* whether the system defaults to 32bit off_t but can do 64bit when requested + */ ++#if __WORDSIZE == 32 ++#ifndef ZZIP_LARGEFILE_SENSITIVE ++#define ZZIP_LARGEFILE_SENSITIVE 1 ++#endif ++#endif + /* #undef LARGEFILE_SENSITIVE */ + + /* Define to the sub-directory where libtool stores uninstalled libraries. */ +@@ -225,8 +230,14 @@ + #endif + + /* Number of bits in a file offset, on hosts where this is settable. */ ++#if __WORDSIZE == 32 ++#ifndef ZZIP__FILE_OFFSET_BITS ++#define ZZIP__FILE_OFFSET_BITS 64 ++#endif ++#endif + /* #undef _FILE_OFFSET_BITS */ + ++ + /* Define for large files, on AIX-style hosts. */ + /* #undef _LARGE_FILES */ + diff --git a/zziplib-0.13.69-multilib.patch b/zziplib-0.13.69-multilib.patch deleted file mode 100644 index 24cf64b..0000000 --- a/zziplib-0.13.69-multilib.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up ./_builddir/zzip/_config.h.orig ./_builddir/zzip/_config.h ---- ./_builddir/zzip/_config.h.orig 2018-07-23 09:11:59.971840954 +0300 -+++ ./_builddir/zzip/_config.h 2018-07-23 09:12:07.438731527 +0300 -@@ -139,6 +139,11 @@ - /* whether the system defaults to 32bit off_t but can do 64bit when requested - */ - /* #undef LARGEFILE_SENSITIVE */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP_LARGEFILE_SENSITIVE -+#define ZZIP_LARGEFILE_SENSITIVE 1 -+#endif -+#endif - - /* Define to the sub-directory where libtool stores uninstalled libraries. */ - #ifndef ZZIP_LT_OBJDIR -@@ -197,6 +202,15 @@ - /* The number of bytes in type short */ - /* #undef SIZEOF_SHORT */ - -+/* The number of bytes in type long */ -+#ifndef ZZIP_SIZEOF_LONG -+#if __WORDSIZE == 32 -+#define ZZIP_SIZEOF_LONG 4 -+#elif __WORDSIZE == 64 -+#define ZZIP_SIZEOF_LONG 8 -+#endif -+#endif -+ - /* Define to 1 if you have the ANSI C header files. */ - #ifndef ZZIP_STDC_HEADERS - #define ZZIP_STDC_HEADERS 1 From 2dbdeda26793fda1a05002dfe3bfea4c226e8b73 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 1 Sep 2021 18:23:46 +0200 Subject: [PATCH 67/85] Forgot to add specfile to the last commit --- zziplib.spec | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 2fc3e42..59447ce 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,11 +1,14 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz -Patch0: zziplib-0.13.69-multilib.patch + + +Patch100: multilib-32.patch +Patch101: multilib-64.patch BuildRequires: make BuildRequires: gcc @@ -73,9 +76,16 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Only patch generated _config.h on non-i686 and armv7hl # These platforms have a correct _config.h already -%ifnarch i686 armv7hl -%apply_patch %{PATCH0} -p2 + +pushd %{_builddir}/zziplib-%{version} +%ifarch i686 armv7hl + patch -p2 < %{PATCH100} %endif +%ifnarch i686 armv7hl + patch -p2 < %{PATCH101} +%endif +popd + %make_build @@ -102,6 +112,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_mandir}/man3/* %changelog +* Wed Sep 01 2021 Jakub Martisko - 0.13.71-5 +- Use the multilib patches from RHEL +- Resolves ftbfs +Resolves: rhbz#1988061 +Related: rhbz#1915747 + * Fri Jul 23 2021 Fedora Release Engineering - 0.13.71-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8f2206a997bc54f56e101a93303af4b9f1484e2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:58:26 +0000 Subject: [PATCH 68/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 59447ce..0a16d4e 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -112,6 +112,9 @@ popd %{_mandir}/man3/* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.13.71-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Sep 01 2021 Jakub Martisko - 0.13.71-5 - Use the multilib patches from RHEL - Resolves ftbfs From 4a515dd0a9d67178360cc703aed05db4dce9fe0e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 5 Feb 2022 23:49:35 +0000 Subject: [PATCH 69/85] Fix pkgconfig files --- remove_ldflags_pkconfig_files.patch | 11 +++++++++++ zziplib.spec | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 remove_ldflags_pkconfig_files.patch diff --git a/remove_ldflags_pkconfig_files.patch b/remove_ldflags_pkconfig_files.patch new file mode 100644 index 0000000..65af4e5 --- /dev/null +++ b/remove_ldflags_pkconfig_files.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -19143,7 +19143,7 @@ Name: @PACKAGE_NAME@ + Description: @PACKAGE_DESCRIPTION@ + Version: @PACKAGE_VERSION@ + Requires: @PACKAGE_REQUIRES@ +-Libs: -L\${libdir} @LDFLAGS@ @LIBS@ ++Libs: -L\${libdir} @LIBS@ + Cflags: -I\${includedir} @CPPFLAGS@ + AXEOF + fi # DONE generate $pkgconfig_generate.in diff --git a/zziplib.spec b/zziplib.spec index 0a16d4e..0742089 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,17 +1,17 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz - +Patch1: remove_ldflags_pkconfig_files.patch Patch100: multilib-32.patch Patch101: multilib-64.patch BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: perl-interpreter BuildRequires: python3 BuildRequires: python3-rpm-macros @@ -62,7 +62,7 @@ zziplib library. %prep %setup -q - +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -80,8 +80,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool pushd %{_builddir}/zziplib-%{version} %ifarch i686 armv7hl patch -p2 < %{PATCH100} -%endif -%ifnarch i686 armv7hl +%else patch -p2 < %{PATCH101} %endif popd @@ -112,6 +111,9 @@ popd %{_mandir}/man3/* %changelog +* Sat Feb 05 2022 Leigh Scott - 0.13.71-7 +- Fix pkgconfig files + * Sat Jan 22 2022 Fedora Release Engineering - 0.13.71-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 79ad2633a3dd8c5bfb7d554c46244ec7e33b1e65 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 9 Feb 2022 19:04:27 +0200 Subject: [PATCH 70/85] Package 0.13.72 - Fixes CVE-2020-18442 - Resolves: rhbz#1973831 - Switch build to CMake, drop 32-bit patches as checks integrated in CMake already Signed-off-by: Alexander Bokovoy --- .gitignore | 1 + multilib-32.patch | 29 ------------------- multilib-64.patch | 29 ------------------- remove_ldflags_pkconfig_files.patch | 11 -------- sources | 2 +- zziplib.spec | 44 ++++++++--------------------- 6 files changed, 14 insertions(+), 102 deletions(-) delete mode 100644 multilib-32.patch delete mode 100644 multilib-64.patch delete mode 100644 remove_ldflags_pkconfig_files.patch diff --git a/.gitignore b/.gitignore index 2b7387c..061bb6d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ zziplib-0.13.49.tar.bz2 /v0.13.68.tar.gz /v0.13.69.tar.gz /v0.13.71.tar.gz +/v0.13.72.tar.gz diff --git a/multilib-32.patch b/multilib-32.patch deleted file mode 100644 index ae99a59..0000000 --- a/multilib-32.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ./a/zzip/_config.h 2021-07-21 14:18:09.000000000 +0200 -+++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200 -@@ -138,9 +138,12 @@ - - /* whether the system defaults to 32bit off_t but can do 64bit when requested - */ -+#if __WORDSIZE == 32 - #ifndef ZZIP_LARGEFILE_SENSITIVE - #define ZZIP_LARGEFILE_SENSITIVE 1 - #endif -+#endif -+/* #undef LARGEFILE_SENSITIVE */ - - /* Define to the sub-directory where libtool stores uninstalled libraries. */ - #ifndef ZZIP_LT_OBJDIR -@@ -227,9 +230,13 @@ - #endif - - /* Number of bits in a file offset, on hosts where this is settable. */ -+#if __WORDSIZE == 32 - #ifndef ZZIP__FILE_OFFSET_BITS - #define ZZIP__FILE_OFFSET_BITS 64 - #endif -+#endif -+/* #undef _FILE_OFFSET_BITS */ -+ - - /* Define for large files, on AIX-style hosts. */ - /* #undef _LARGE_FILES */ diff --git a/multilib-64.patch b/multilib-64.patch deleted file mode 100644 index 5285e3a..0000000 --- a/multilib-64.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ./a/zzip/_config.h 2021-07-21 14:18:14.000000000 +0200 -+++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200 -@@ -138,6 +138,11 @@ - - /* whether the system defaults to 32bit off_t but can do 64bit when requested - */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP_LARGEFILE_SENSITIVE -+#define ZZIP_LARGEFILE_SENSITIVE 1 -+#endif -+#endif - /* #undef LARGEFILE_SENSITIVE */ - - /* Define to the sub-directory where libtool stores uninstalled libraries. */ -@@ -225,8 +230,14 @@ - #endif - - /* Number of bits in a file offset, on hosts where this is settable. */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP__FILE_OFFSET_BITS -+#define ZZIP__FILE_OFFSET_BITS 64 -+#endif -+#endif - /* #undef _FILE_OFFSET_BITS */ - -+ - /* Define for large files, on AIX-style hosts. */ - /* #undef _LARGE_FILES */ - diff --git a/remove_ldflags_pkconfig_files.patch b/remove_ldflags_pkconfig_files.patch deleted file mode 100644 index 65af4e5..0000000 --- a/remove_ldflags_pkconfig_files.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -19143,7 +19143,7 @@ Name: @PACKAGE_NAME@ - Description: @PACKAGE_DESCRIPTION@ - Version: @PACKAGE_VERSION@ - Requires: @PACKAGE_REQUIRES@ --Libs: -L\${libdir} @LDFLAGS@ @LIBS@ -+Libs: -L\${libdir} @LIBS@ - Cflags: -I\${includedir} @CPPFLAGS@ - AXEOF - fi # DONE generate $pkgconfig_generate.in diff --git a/sources b/sources index 562f581..daf2dbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.13.71.tar.gz) = e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5 +SHA512 (v0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 diff --git a/zziplib.spec b/zziplib.spec index 0742089..a2f59f1 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,15 +1,11 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.71 -Release: 7%{?dist} +Version: 0.13.72 +Release: 1%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz -Patch1: remove_ldflags_pkconfig_files.patch -Patch100: multilib-32.patch -Patch101: multilib-64.patch - BuildRequires: make BuildRequires: gcc BuildRequires: perl-interpreter @@ -20,8 +16,7 @@ BuildRequires: xmlto BuildRequires: zlib-devel BuildRequires: SDL-devel BuildRequires: pkgconfig -#BuildRequires: autoconf -#BuildRequires: automake +BuildRequires: cmake %description The zziplib library is intentionally lightweight, it offers the ability to @@ -62,35 +57,14 @@ zziplib library. %prep %setup -q -%patch1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure \ - --disable-static \ - --enable-sdl \ - --enable-frame-pointer -# Remove rpath on 64bit archs -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -# Only patch generated _config.h on non-i686 and armv7hl -# These platforms have a correct _config.h already - - -pushd %{_builddir}/zziplib-%{version} -%ifarch i686 armv7hl - patch -p2 < %{PATCH100} -%else - patch -p2 < %{PATCH101} -%endif -popd - - -%make_build +%cmake -B "%{_vpath_builddir}" +%make_build -C "%{_vpath_builddir}" %install -%make_install +%make_install -C "%{_vpath_builddir}" %ldconfig_scriptlets @@ -111,6 +85,12 @@ popd %{_mandir}/man3/* %changelog +* Wed Feb 09 2022 Alexander Bokovoy - 0.13.72-1 +- 0.13.72 +- Fixes CVE-2020-18442 +- Resolves: rhbz#1973831 +- Switch build to CMake, drop 32-bit patches as checks integrated in CMake already + * Sat Feb 05 2022 Leigh Scott - 0.13.71-7 - Fix pkgconfig files From 07b676070aebaa34a23425f02b16dae8c33bb33d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 14:02:32 +0000 Subject: [PATCH 71/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index a2f59f1..a918f74 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.72 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -85,6 +85,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.13.72-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Feb 09 2022 Alexander Bokovoy - 0.13.72-1 - 0.13.72 - Fixes CVE-2020-18442 From 41f2bfec6353f952f48bf7711ee73df6115cfe5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:23:04 +0000 Subject: [PATCH 72/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index a918f74..c28dd31 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.72 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -85,6 +85,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.13.72-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.13.72-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6b1fb9e7a1c115bc73ed876e8a66881d73042e14 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 17 May 2023 11:51:15 -0400 Subject: [PATCH 73/85] Update License tag to SPDX identifiers Examined the source code and updated the License tag to an SPDX expression representing this project. The author offers the source under either LGPL-2.0-or-later or MPL-1.1. Signed-off-by: David Cantrell --- zziplib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index c28dd31..b468800 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,8 +1,8 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.72 -Release: 3%{?dist} -License: LGPLv2+ or MPLv1.1 +Release: 4%{?dist} +License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -85,6 +85,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Wed May 17 2023 David Cantrell - 0.13.72-4 +- Update License tag to SPDX identifiers + * Sat Jan 21 2023 Fedora Release Engineering - 0.13.72-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 820f1b5c11d7caf913352021b0f6ba2cffc1dcb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:49:34 +0000 Subject: [PATCH 74/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index b468800..7181a2f 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.72 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -85,6 +85,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.13.72-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 17 2023 David Cantrell - 0.13.72-4 - Update License tag to SPDX identifiers From 40e2e7cd84ade4cbf61eb619909c711dbc153978 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:22:03 +0000 Subject: [PATCH 75/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 7181a2f..e3b879d 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.72 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -85,6 +85,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.13.72-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.13.72-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5e3e24b6fbbb6461e5b0fcae2f554ff86eeb927a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 11 Feb 2024 15:27:01 -0500 Subject: [PATCH 76/85] Workaround GCC 14 strictness Discussion is ongoing upstream on how to fix various incompatible types issues, but no fix has been agreed upon yet: https://bugzilla.redhat.com/show_bug.cgi?id=2256917 --- zziplib.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zziplib.spec b/zziplib.spec index e3b879d..9c107a2 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,3 +1,7 @@ +# FTBFS with GCC 14, reported upstream, no fix yet +# https://bugzilla.redhat.com/show_bug.cgi?id=2256917 +%global build_type_safety_c 1 + Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.72 From 9766ac2cc147c93cf6560642462f42329dfcd449 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Thu, 4 Apr 2024 12:10:39 +0200 Subject: [PATCH 77/85] Rebase to 0.13.74 --- .gitignore | 1 + sources | 2 +- zziplib.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 061bb6d..6ab02a9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ zziplib-0.13.49.tar.bz2 /v0.13.69.tar.gz /v0.13.71.tar.gz /v0.13.72.tar.gz +/v0.13.74.tar.gz diff --git a/sources b/sources index daf2dbb..c4d587b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 +SHA512 (v0.13.74.tar.gz) = 7dd27247cbc475e2c6beb3a96c620f9938ade0dff6f4e088f9c28432fc4cc01df9d6771ec3d5e07baabe27033f4764d60e31c4c54588559de64e894d0557c94f diff --git a/zziplib.spec b/zziplib.spec index 9c107a2..6148d85 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,11 +1,10 @@ # FTBFS with GCC 14, reported upstream, no fix yet # https://bugzilla.redhat.com/show_bug.cgi?id=2256917 -%global build_type_safety_c 1 Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.72 -Release: 6%{?dist} +Version: 0.13.74 +Release: 1%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -75,6 +74,7 @@ zziplib library. %files %doc docs/COPYING* ChangeLog README TODO %{_libdir}/*.so.* +%exclude %{_datadir}/zziplib/*.cmake %files utils %{_bindir}/* @@ -89,6 +89,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Thu Apr 04 2024 Jakub Martisko - 0.13.74-1 +- Rebase to 0.13.74 + * Sat Jan 27 2024 Fedora Release Engineering - 0.13.72-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8f12ede02eb0bd4daf61a4bf7756b6b292e9568c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:59:48 +0000 Subject: [PATCH 78/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 6148d85..90c5bd9 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -4,7 +4,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.74 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -89,6 +89,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.13.74-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Apr 04 2024 Jakub Martisko - 0.13.74-1 - Rebase to 0.13.74 From 5452bf6e704403ddc7f2fb4e9def18c98bb1fd0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:55:40 +0000 Subject: [PATCH 79/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 90c5bd9..9f3829f 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -4,7 +4,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.74 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -89,6 +89,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.13.74-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.13.74-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d0bf72c8e4887de708edbb11feac75eb0616978b Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 22 Jan 2025 15:30:16 +0100 Subject: [PATCH 80/85] Rebase to zziplib-0.13.78 --- .gitignore | 2 ++ sources | 2 +- zziplib.spec | 8 ++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ab02a9..d246baf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ zziplib-0.13.49.tar.bz2 /v0.13.71.tar.gz /v0.13.72.tar.gz /v0.13.74.tar.gz +/zziplib-0.13.78.tar.gz +/v0.13.78.tar.gz diff --git a/sources b/sources index c4d587b..4f1e5be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.13.74.tar.gz) = 7dd27247cbc475e2c6beb3a96c620f9938ade0dff6f4e088f9c28432fc4cc01df9d6771ec3d5e07baabe27033f4764d60e31c4c54588559de64e894d0557c94f +SHA512 (v0.13.78.tar.gz) = e96771c310a1a9eb227027e8c2a495409c01dd273b483b3a04119d6a273cce7c88ba77c192fcde5e85d0a37c847a0df8e521f460d00920e62153400f0743ea78 diff --git a/zziplib.spec b/zziplib.spec index 9f3829f..ad8e677 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -3,8 +3,8 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib -Version: 0.13.74 -Release: 3%{?dist} +Version: 0.13.78 +Release: 1%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -75,6 +75,7 @@ zziplib library. %doc docs/COPYING* ChangeLog README TODO %{_libdir}/*.so.* %exclude %{_datadir}/zziplib/*.cmake +%exclude %{_libdir}/cmake/zziplib/*.cmake %files utils %{_bindir}/* @@ -89,6 +90,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Wed Jan 22 2025 Jakub Martisko - 0.13.78-1 +- Rebase to 0.13.78 + * Sun Jan 19 2025 Fedora Release Engineering - 0.13.74-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 796ae21d860467945603fa23a9f239c232132c68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:22:27 +0000 Subject: [PATCH 81/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index ad8e677..34d701e 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -4,7 +4,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.78 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -90,6 +90,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.13.78-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jan 22 2025 Jakub Martisko - 0.13.78-1 - Rebase to 0.13.78 From 95093d8460ff06ef5bc47e5dedf7a23a636a252a Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 11 Nov 2025 14:40:29 +0100 Subject: [PATCH 82/85] Allow to build with CMake 4.0 (rhbz#2381654) --- zziplib.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index 34d701e..de92d19 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -4,7 +4,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.78 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -62,6 +62,8 @@ zziplib library. %setup -q %build +# TODO: Please submit an issue to upstream (rhbz#2381654) +export CMAKE_POLICY_VERSION_MINIMUM=3.5 %cmake -B "%{_vpath_builddir}" %make_build -C "%{_vpath_builddir}" @@ -90,6 +92,9 @@ zziplib library. %{_mandir}/man3/* %changelog +* Tue Nov 11 2025 Cristian Le - 0.13.78-3 +- Allow to build with CMake 4.0 (rhbz#2381654) + * Fri Jul 25 2025 Fedora Release Engineering - 0.13.78-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d03f4d156aaa2eb0596796c71641b9414f5a6581 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:12:32 +0000 Subject: [PATCH 83/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index de92d19..f4d5ae4 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -4,7 +4,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.78 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -92,6 +92,9 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 %{_mandir}/man3/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.13.78-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Nov 11 2025 Cristian Le - 0.13.78-3 - Allow to build with CMake 4.0 (rhbz#2381654) From 19ff1f90e5b0f7f85ee40f4a1de36805868ad79e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:45:13 +0000 Subject: [PATCH 84/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zziplib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zziplib.spec b/zziplib.spec index f4d5ae4..6a37379 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -4,7 +4,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.78 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -92,6 +92,9 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 %{_mandir}/man3/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.13.78-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0.13.78-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From a9eea40832e32b53cb0132c935bfb11b9df5957d Mon Sep 17 00:00:00 2001 From: Jakub Sencak Date: Tue, 21 Jul 2026 17:38:30 +0200 Subject: [PATCH 85/85] Replaced make macros with cmake macros - the %cmake macro defaults to ninja generator instead of make - removed obsolete files. - added CMake files to devel. Assisted-by: Sonnet 4.5 --- zziplib.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/zziplib.spec b/zziplib.spec index 6a37379..5f64f51 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -4,7 +4,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.78 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.0-or-later OR MPL-1.1 URL: http://zziplib.sourceforge.net/ Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -64,20 +64,18 @@ zziplib library. %build # TODO: Please submit an issue to upstream (rhbz#2381654) export CMAKE_POLICY_VERSION_MINIMUM=3.5 -%cmake -B "%{_vpath_builddir}" +%cmake -%make_build -C "%{_vpath_builddir}" +%cmake_build %install -%make_install -C "%{_vpath_builddir}" +%cmake_install %ldconfig_scriptlets %files %doc docs/COPYING* ChangeLog README TODO %{_libdir}/*.so.* -%exclude %{_datadir}/zziplib/*.cmake -%exclude %{_libdir}/cmake/zziplib/*.cmake %files utils %{_bindir}/* @@ -85,13 +83,18 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 %files devel %doc docs/README.SDL docs/*.htm %{_includedir}/* -%exclude %{_libdir}/*.la +%{_libdir}/cmake/zziplib/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4 %{_mandir}/man3/* %changelog +* Tue Jul 22 2026 Jakub Sencak - 0.13.78-6 +- Replaced make macros with cmake macros; the cmake macro defaults to ninja generator instead of make +- Removed obsolete files +- Ship CMake config files in -devel package + * Fri Jul 17 2026 Fedora Release Engineering - 0.13.78-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild