diff --git a/.gitignore b/.gitignore index 153ce7b..f4fb2f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -afflib-3.5.12.tar.gz +/afflib-3.5.12.tar.gz /afflib-3.6.4.tar.gz /afflib-3.6.6.tar.gz /afflib-3.6.8.tar.gz @@ -8,3 +8,4 @@ afflib-3.5.12.tar.gz /afflib-3.7.15.tar.gz /afflib-3.7.16.tar.gz /afflib-3.7.18.tar.gz +/afflib-3.7.19.tar.gz diff --git a/0001-Use-DESTDIR-for-packaging.patch b/afflib-0001-Use-DESTDIR-for-packaging.patch similarity index 100% rename from 0001-Use-DESTDIR-for-packaging.patch rename to afflib-0001-Use-DESTDIR-for-packaging.patch diff --git a/Sanity-check-size-passed-to-malloc.patch b/afflib-0002-Sanity-check-size-passed-to-malloc.patch similarity index 100% rename from Sanity-check-size-passed-to-malloc.patch rename to afflib-0002-Sanity-check-size-passed-to-malloc.patch diff --git a/afflib.spec b/afflib.spec index 0ba4c7f..0178445 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,10 +1,10 @@ Name: afflib -Version: 3.7.18 -Release: 2%{?dist} +Version: 3.7.19 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package -%global with_python2 1 +%global with_python2 0 # Build also the python3 package %global with_python3 1 @@ -23,9 +23,7 @@ BuildRequires: expat-devel # Afflib uses lzma-SDK 443 #BuildRequires: lzma-devel BuildRequires: ncurses-devel -BuildRequires: libtermcap-devel BuildRequires: openssl-devel -BuildRequires: python2-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: readline-devel #BuildRequires: libedit-devel - good replacement for readline - not supported for now @@ -35,14 +33,16 @@ BuildRequires: zlib-devel BuildRequires: python2 BuildRequires: python2-devel BuildRequires: python2-setuptools -%endif # if with_python2 +BuildRequires: python2-Cython +%endif %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools -%endif # if with_python3 +BuildRequires: python%{python3_pkgversion}-Cython +%endif @@ -82,10 +82,11 @@ Group: Development/Libraries %{?python_provide:%python_provide python2-pyaff} %description -n python2-pyaff -Python2 bindings for AFFLIB. +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 +# end with_python2 +%endif @@ -93,15 +94,16 @@ basic metadata accessor functions. The binding is not currently complete. %package -n python%{python3_pkgversion}-pyaff Summary: Python3 binding for the AFFLIB Group: Development/Libraries -%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} +%{?python_provide:%python_provide python%{python3_pkgversion}-pyaff} %description -n python%{python3_pkgversion}-pyaff -Python3 bindings for AFFLIB. +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 +# end with_python3 +%endif @@ -123,23 +125,26 @@ chmod 0644 lib/base64.{h,cpp} --enable-python=no \ --enable-s3=yes -# Remove rpath from libtool +# Remove rpath from libtool 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 # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# Remove the cythonized files in order to regenerate them during build. +rm $(grep -rl '/\* Generated by Cython') + %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 +%endif %if 0%{?with_python3} %py3_build -%endif # with_python3 +%endif %install @@ -149,11 +154,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' cd pyaff %if 0%{?with_python2} %py2_install -%endif # with_python2 +%endif %if 0%{?with_python3} %py3_install -%endif # with_python3 +%endif %ldconfig_scriptlets @@ -167,7 +172,6 @@ cd pyaff %files -n afftools %{_bindir}/aff* -%{python2_sitearch}/* %{_mandir}/man1/aff*.1.* %files devel @@ -182,7 +186,7 @@ cd pyaff %doc pyaff/README %{python2_sitearch}/PyAFF* %{python2_sitearch}/pyaff* -%endif # with_python2 +%endif %if 0%{?with_python3} @@ -191,11 +195,42 @@ cd pyaff %doc pyaff/README %{python3_sitearch}/PyAFF* %{python3_sitearch}/pyaff* -%endif # with_python3 +%endif %changelog +* Sun Nov 29 2020 Michal Ambroz - 3.7.19-1 +- bump to version 3.7.19 + +* Fri Jul 31 2020 Fedora Release Engineering - 3.7.18-11 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.7.18-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 3.7.18-9 +- Rebuilt for Python 3.9 + +* Thu Feb 06 2020 Nicolas Chauvet - 3.7.18-8 +- Drop libtermcap-devel merged with ncurses-devel + +* Tue Jan 28 2020 Fedora Release Engineering - 3.7.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Aug 19 2019 Miro Hrončok - 3.7.18-6 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 3.7.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 01 2019 Charalampos Stratakis - 3.7.18-4 +- Recythonize the sources + +* Thu Apr 11 2019 Miro Hrončok - 3.7.18-3 +- remove python2-pyaff from Fedora + * Mon Apr 01 2019 Michal Ambroz - 3.7.18-2 - separate python2-pyaff / python3-pyaff packages - fix python dependencies for EPEL build diff --git a/sources b/sources index cc44a32..2a83440 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (afflib-3.7.18.tar.gz) = 47ab74c86bbaedc2494558962f99463066e267f7a3f583902a53e1f488085a309b0d871093c67439033272c3ebf03d213649886930b9812013e66782ea84df85 +SHA512 (afflib-3.7.19.tar.gz) = 6e0df7477bf7dbd3814099d94e3fce122e0cf9b714a425521b7458f4eedc6e8b8e7283fd37926b7c992cdf21d3adec620df29a79a6a5311bf1d1b5d4930768bc