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 <abokovoy@redhat.com> (cherry picked from commit 79ad2633a3) (cherry picked from commit 361f0fd1c4)
2022-02-09 19:37:03 +02:00
4 changed files with 39 additions and 75 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,3 @@ 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
-/zziplib-0.13.78.tar.gz
-/v0.13.78.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (v0.13.78.tar.gz) = e96771c310a1a9eb227027e8c2a495409c01dd273b483b3a04119d6a273cce7c88ba77c192fcde5e85d0a37c847a0df8e521f460d00920e62153400f0743ea78
+SHA512 (v0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
--- a/zziplib-0.13.69-multilib.patch
+++ 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 
--- a/zziplib.spec
+++ b/zziplib.spec
@ -1,11 +1,8 @@
-# FTBFS with GCC 14, reported upstream, no fix yet
-# https://bugzilla.redhat.com/show_bug.cgi?id=2256917
-
 Summary: Lightweight library to easily extract data from zip files
 Name: zziplib
-Version: 0.13.78
-Release: 6%{?dist}
-License: LGPL-2.0-or-later OR MPL-1.1
+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

@ -62,14 +59,12 @@ zziplib library.
 %setup -q

 %build
-# TODO: Please submit an issue to upstream (rhbz#2381654)
-export CMAKE_POLICY_VERSION_MINIMUM=3.5
-%cmake
+%cmake -B "%{_vpath_builddir}"

-%cmake_build
+%make_build -C "%{_vpath_builddir}"

 %install
-%cmake_install
+%make_install -C "%{_vpath_builddir}"

 %ldconfig_scriptlets

@ -83,78 +78,19 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5
 %files devel
 %doc docs/README.SDL docs/*.htm
 %{_includedir}/*
-%{_libdir}/cmake/zziplib/
+%exclude %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*.m4
 %{_mandir}/man3/*

 %changelog
-* Tue Jul 22 2026 Jakub Sencak <jsencak@redhat.com> - 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 <releng@fedoraproject.org> - 0.13.78-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.78-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Tue Nov 11 2025 Cristian Le <git@lecris.dev> - 0.13.78-3
- Allow to build with CMake 4.0 (rhbz#2381654)
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.78-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Jan 22 2025 Jakub Martisko <jamartis@redhat.com> - 0.13.78-1
- Rebase to 0.13.78
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.74-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.74-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Apr 04 2024 Jakub Martisko <jamartis@redhat.com> - 0.13.74-1
- Rebase to 0.13.74
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed May 17 2023 David Cantrell <dcantrell@redhat.com> - 0.13.72-4
- Update License tag to SPDX identifiers
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Wed Feb 09 2022 Alexander Bokovoy <abokovoy@redhat.com> - 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 <leigh123linux@gmail.com> - 0.13.71-7
- Fix pkgconfig files
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.71-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Sep 01 2021 Jakub Martisko <jamartis@redhat.com> - 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 <releng@fedoraproject.org> - 0.13.71-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Mon Feb 01 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-3
 - Use python3 (versioned) as buildrequires