update to upstream version
Signed-off-by: Toshaan Bharvani <toshaan@powerel.org>master
Toshaan Bharvani
parent
13ed555df5
commit
bfbee06d7f
|
|
@ -1,23 +1,13 @@
|
|||
# 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.71
|
||||
Release: 11%{?dist}
|
||||
License: LGPLv2+ or MPLv1.1
|
||||
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
|
||||
|
||||
#Using the pruned version of the upstream archive. The archive does not contain the Source1 and Source2 files. Their github version is used instead (the original ones had licensing issues)
|
||||
#rhbz#1982241
|
||||
Source0: v%{version}-pruned.tar.gz
|
||||
#https://raw.githubusercontent.com/gdraheim/zziplib/465450c86c930026664329876e5350d21a7527db/docs/zzipdoc/match.py
|
||||
Source1: match.py
|
||||
#https://raw.githubusercontent.com/gdraheim/zziplib/465450c86c930026664329876e5350d21a7527db/docs/zzipdoc/options.py
|
||||
Source2: options.py
|
||||
|
||||
Patch1: CVE-2020-18442.patch
|
||||
Patch2: CVE-2020-18770.patch
|
||||
Patch100: multilib-32.patch
|
||||
Patch101: multilib-64.patch
|
||||
Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
|
|
@ -29,8 +19,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
|
||||
|
|
@ -71,45 +60,22 @@ zziplib library.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
cp %{SOURCE1} docs/zzipdoc/
|
||||
cp %{SOURCE2} docs/zzipdoc/
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -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}
|
||||
%endif
|
||||
%ifnarch i686 armv7hl
|
||||
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
|
||||
|
||||
%files
|
||||
%doc docs/COPYING* ChangeLog README TODO
|
||||
%{_libdir}/*.so.*
|
||||
%exclude %{_datadir}/zziplib/*.cmake
|
||||
%exclude %{_libdir}/cmake/zziplib/*.cmake
|
||||
|
||||
%files utils
|
||||
%{_bindir}/*
|
||||
|
|
@ -124,41 +90,53 @@ popd
|
|||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Wed Feb 28 2024 Jakub Martisko <jamartis@redhat.com> - 0.13.71-11
|
||||
- Fix CVE-2020-18770
|
||||
Previous patch was causing segfault
|
||||
Resolves: RHEL-14967
|
||||
* Wed Jan 22 2025 Jakub Martisko <jamartis@redhat.com> - 0.13.78-1
|
||||
- Rebase to 0.13.78
|
||||
|
||||
* Wed Jan 24 2024 Jakub Martisko <jamartis@redhat.com> - 0.13.71-10
|
||||
- Fix CVE-2020-18770
|
||||
Resolves: RHEL-14967
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.74-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.13.71-9
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.74-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jul 27 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-8
|
||||
- Add gating tests
|
||||
Resolves: rhbz#1986332
|
||||
* Thu Apr 04 2024 Jakub Martisko <jamartis@redhat.com> - 0.13.74-1
|
||||
- Rebase to 0.13.74
|
||||
|
||||
* Fri Jul 23 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-7
|
||||
- Remove the doc/zzipdoc/{options,match}.py scritps from the original tar
|
||||
- Replace them with a current github version
|
||||
- The original version of the files contains autogenerated header with incompatible license
|
||||
- This build thus uses modified tar archive
|
||||
Resolves: rhbz#1982241
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-6
|
||||
- Fix CVE-2020-18442
|
||||
Resolves: CVE-2020-18442
|
||||
Resolves: 1977964
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-5
|
||||
- Refresh the multilib patch
|
||||
Resolves: rhbz#1915747
|
||||
* Wed May 17 2023 David Cantrell <dcantrell@redhat.com> - 0.13.72-4
|
||||
- Update License tag to SPDX identifiers
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.13.71-4
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
* 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue