bump to 3.7.18, separate python2/3 modules, fix build for epel, fix CVE-2018-8050 bug #1554427
Merge remote-tracking branch 'origin/master' into epel7
This commit is contained in:
Michal Ambroz
commit
f7c556bb7c
1 changed files with 96 additions and 2 deletions
98
afflib.spec
98
afflib.spec
|
|
@ -1,8 +1,14 @@
|
|||
Name: afflib
|
||||
Version: 3.7.18
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Library to support the Advanced Forensic Format
|
||||
|
||||
# Build also the python2 package
|
||||
%global with_python2 1
|
||||
# Build also the python3 package
|
||||
%global with_python3 1
|
||||
|
||||
|
||||
License: BSD with advertising
|
||||
URL: https://github.com/sshock/AFFLIBv3
|
||||
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
|
@ -25,10 +31,26 @@ BuildRequires: python2-devel
|
|||
#BuildRequires: libedit-devel - good replacement for readline - not supported for now
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
%if 0%{?with_python2}
|
||||
BuildRequires: python2
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
%endif # if with_python2
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python%{python3_pkgversion}
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
%endif # if with_python3
|
||||
|
||||
|
||||
|
||||
# Afflib format uses lzma-SDK 443
|
||||
Provides: bundled(lzma) = 443
|
||||
|
||||
|
||||
|
||||
%description
|
||||
AFF® is an open and extensible file format designed to store disk images and
|
||||
associated metadata.
|
||||
|
|
@ -52,6 +74,37 @@ Requires: pkgconfig
|
|||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
#====================================================================
|
||||
%if 0%{?with_python2}
|
||||
%package -n python2-pyaff
|
||||
Summary: Python2 binding for the AFFLIB
|
||||
Group: Development/Libraries
|
||||
%{?python_provide:%python_provide python2-pyaff}
|
||||
|
||||
%description -n python2-pyaff
|
||||
Python2 bindings for AFFLIB.
|
||||
These bindings currently support a read-only file-like interface to AFFLIB and
|
||||
basic metadata accessor functions. The binding is not currently complete.
|
||||
%endif # with_python2
|
||||
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python%{python3_pkgversion}-pyaff
|
||||
Summary: Python3 binding for the AFFLIB
|
||||
Group: Development/Libraries
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
|
||||
|
||||
|
||||
|
||||
%description -n python%{python3_pkgversion}-pyaff
|
||||
Python3 bindings for AFFLIB.
|
||||
These bindings currently support a read-only file-like interface to AFFLIB and
|
||||
basic metadata accessor functions. The binding is not currently complete.
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n AFFLIBv3-%{version}
|
||||
|
|
@ -67,7 +120,7 @@ chmod 0644 lib/base64.{h,cpp}
|
|||
%build
|
||||
%configure --enable-shared \
|
||||
--disable-static \
|
||||
--enable-python=yes \
|
||||
--enable-python=no \
|
||||
--enable-s3=yes
|
||||
|
||||
# Remove rpath from libtool
|
||||
|
|
@ -78,12 +131,30 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|||
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
||||
|
||||
%make_build
|
||||
cd pyaff
|
||||
%global py_setup_args build_ext --include-dirs %{_builddir}/AFFLIBv3-%{version}/include --library-dirs %{_builddir}/AFFLIBv3-%{version}/lib/.libs
|
||||
%if 0%{?with_python2}
|
||||
%py2_build
|
||||
%endif # with_python2
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
cd pyaff
|
||||
%if 0%{?with_python2}
|
||||
%py2_install
|
||||
%endif # with_python2
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
|
@ -105,8 +176,30 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/afflib.pc
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%files -n python2-pyaff
|
||||
%license COPYING
|
||||
%doc pyaff/README
|
||||
%{python2_sitearch}/PyAFF*
|
||||
%{python2_sitearch}/pyaff*
|
||||
%endif # with_python2
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python%{python3_pkgversion}-pyaff
|
||||
%license COPYING
|
||||
%doc pyaff/README
|
||||
%{python3_sitearch}/PyAFF*
|
||||
%{python3_sitearch}/pyaff*
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Apr 01 2019 Michal Ambroz <rebus _AT seznam.cz> - 3.7.18-2
|
||||
- separate python2-pyaff / python3-pyaff packages
|
||||
- fix python dependencies for EPEL build
|
||||
|
||||
* Mon Mar 11 2019 Michal Ambroz <rebus _AT seznam.cz> - 3.7.18-1
|
||||
- bump to 3.7.18 which contains:
|
||||
- Remove upstream patch Sanity-check-size-passed-to-malloc.patch
|
||||
|
|
@ -120,6 +213,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
- Sanity check size passed to malloc... (6 months ago)
|
||||
- Fix incrementing in vnode_split_raw.cpp for comment consistnecy (12 months ago)
|
||||
- Update Win32 readmes to fix issue #26. (1 year, 2 months ago)
|
||||
- build python3 package
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.16-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue