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)

.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

sources

@@ -1 +1 @@
-SHA512 (v0.13.71.tar.gz) = e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
+SHA512 (v0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8

zziplib-0.13.69-multilib.patch

@@ -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 

zziplib.spec

@@ -1,14 +1,13 @@
 Summary: Lightweight library to easily extract data from zip files
 Name: zziplib
-Version: 0.13.71
-Release: 4%{?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
-Patch0: zziplib-0.13.69-multilib.patch
 
 BuildRequires: make
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: perl-interpreter
 BuildRequires: python3
 BuildRequires: python3-rpm-macros
@@ -17,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
@@ -60,28 +58,13 @@ zziplib library.
 %prep
 %setup -q
 
-
 %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
-
-%ifnarch i686 armv7hl
-%apply_patch %{PATCH0} -p2
-%endif
-
-%make_build
+%cmake -B "%{_vpath_builddir}"
 
+%make_build -C "%{_vpath_builddir}"
 
 %install
-%make_install
+%make_install -C "%{_vpath_builddir}"
 
 %ldconfig_scriptlets
 
@@ -102,6 +85,18 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{_mandir}/man3/*
 
 %changelog
+* 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
+
+* 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