From 79ad2633a3dd8c5bfb7d554c46244ec7e33b1e65 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 9 Feb 2022 19:04:27 +0200 Subject: [PATCH 01/17] 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 f647de5dc42ae747de853bd4b8d7da66462e82cf Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 9 Feb 2022 19:04:27 +0200 Subject: [PATCH 02/17] 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 (cherry picked from commit 79ad2633a3dd8c5bfb7d554c46244ec7e33b1e65) --- .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 03/17] 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 04/17] 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 05/17] 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 06/17] 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 07/17] 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 08/17] 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 09/17] 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 10/17] 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 11/17] 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 12/17] 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 13/17] 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 14/17] 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 15/17] 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 16/17] 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 17/17] 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