From ca127d8f4afa12b2dbb0c0cb07fd328bd008da48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 11 Apr 2019 21:37:49 +0200 Subject: [PATCH 01/10] remove python2-pyaff from Fedora --- afflib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/afflib.spec b/afflib.spec index 8c0a7a1..e65cd21 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,10 +1,10 @@ Name: afflib Version: 3.7.18 -Release: 2%{?dist} +Release: 3%{?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 @@ -165,7 +165,6 @@ cd pyaff %files -n afftools %{_bindir}/aff* -%{python2_sitearch}/* %{_mandir}/man1/aff*.1.* %files devel @@ -194,6 +193,9 @@ cd pyaff %changelog +* 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 From 0ca60a9ec83015c14adc51574ad86a10006c4ffc Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Sat, 1 Jun 2019 13:36:45 +0200 Subject: [PATCH 02/10] Recythonize the sources --- afflib.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index e65cd21..f8b977a 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -23,7 +23,6 @@ BuildRequires: expat-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 @@ -33,6 +32,7 @@ BuildRequires: zlib-devel BuildRequires: python2 BuildRequires: python2-devel BuildRequires: python2-setuptools +BuildRequires: python2-Cython %endif # if with_python2 @@ -40,6 +40,7 @@ BuildRequires: python2-setuptools BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-Cython %endif # if with_python3 @@ -128,6 +129,9 @@ 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 @@ -193,6 +197,9 @@ cd pyaff %changelog +* 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 From 207bec0f172fc1366eb597d1fd303afbf3a899ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:38:13 +0000 Subject: [PATCH 03/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index f8b977a..762ac98 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -197,6 +197,9 @@ cd pyaff %changelog +* 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 From 7e35ab5faacf6c3726433d129faa678ffc77792d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:00:56 +0200 Subject: [PATCH 04/10] Rebuilt for Python 3.8 --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 762ac98..dc95e8c 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -197,6 +197,9 @@ cd pyaff %changelog +* 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 From 28fe086624de39ded55ff6c1355159f356f08a97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:17:41 +0000 Subject: [PATCH 05/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index dc95e8c..81e9525 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -197,6 +197,9 @@ cd pyaff %changelog +* 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 From 40cb6000a491914e907d7cd5ede00c017fa58239 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 6 Feb 2020 17:07:26 +0100 Subject: [PATCH 06/10] Fix build --- afflib.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/afflib.spec b/afflib.spec index 81e9525..eab3fb1 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -21,7 +21,6 @@ BuildRequires: expat-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: fuse-devel BuildRequires: ncurses-devel -BuildRequires: libtermcap-devel BuildRequires: openssl-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: readline-devel @@ -197,6 +196,9 @@ cd pyaff %changelog +* 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 From b84d36447595cf2c5bbcfb02a2ee7888b8a76ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:40:04 +0200 Subject: [PATCH 07/10] Rebuilt for Python 3.9 --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index eab3fb1..0b427db 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -196,6 +196,9 @@ cd pyaff %changelog +* 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 From 9a882022a89b9567bd8a6e6b620d11715826e49b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:48:52 +0000 Subject: [PATCH 08/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 0b427db..8a83263 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -196,6 +196,9 @@ cd pyaff %changelog +* 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 From 82d07dcf9ca9eb2d8d79e8f6901390c2a441162e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:50:21 +0000 Subject: [PATCH 09/10] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- afflib.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/afflib.spec b/afflib.spec index 8a83263..f0719f3 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib Version: 3.7.18 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -196,6 +196,10 @@ cd pyaff %changelog +* 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 From 5a60a7dba6f6b848547665e21471ad0971357632 Mon Sep 17 00:00:00 2001 From: nobody Date: Sun, 29 Nov 2020 16:32:51 +0100 Subject: [PATCH 10/10] bump to 3.7.19 --- .gitignore | 3 +- ...fflib-0001-Use-DESTDIR-for-packaging.patch | 0 ...2-Sanity-check-size-passed-to-malloc.patch | 0 afflib.spec | 37 +++++++++++-------- sources | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-) rename 0001-Use-DESTDIR-for-packaging.patch => afflib-0001-Use-DESTDIR-for-packaging.patch (100%) rename Sanity-check-size-passed-to-malloc.patch => afflib-0002-Sanity-check-size-passed-to-malloc.patch (100%) 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 f0719f3..c1158f8 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,6 +1,6 @@ Name: afflib -Version: 3.7.18 -Release: 11%{?dist} +Version: 3.7.19 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format # Build also the python2 package @@ -32,7 +32,7 @@ BuildRequires: python2 BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python2-Cython -%endif # if with_python2 +%endif %if 0%{?with_python3} @@ -40,7 +40,7 @@ BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-Cython -%endif # if with_python3 +%endif @@ -80,10 +80,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 @@ -91,15 +92,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 @@ -121,7 +123,7 @@ 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 @@ -136,11 +138,11 @@ 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 @@ -150,11 +152,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 @@ -182,7 +184,7 @@ cd pyaff %doc pyaff/README %{python2_sitearch}/PyAFF* %{python2_sitearch}/pyaff* -%endif # with_python2 +%endif %if 0%{?with_python3} @@ -191,11 +193,14 @@ 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 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