Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Alexander Bokovoy
40d990732f 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
3 changed files with 15 additions and 25 deletions

1
.gitignore vendored
View file

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

View file

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

View file

@ -1,14 +1,13 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.71
Release: 3%{?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,12 @@ 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
* Mon Feb 01 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-3
- Use python3 (versioned) as buildrequires