diff --git a/Fix-53-incompatible-pointer-types-in-pyaff.c.patch b/Fix-53-incompatible-pointer-types-in-pyaff.c.patch deleted file mode 100644 index b85c063b144dd7baae1002326eec6371e0dcf5b2..0000000000000000000000000000000000000000 --- a/Fix-53-incompatible-pointer-types-in-pyaff.c.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 01210f488410a23838c54fcc22297cf08ac7de66 Mon Sep 17 00:00:00 2001 -From: Phillip Hellewell -Date: Wed, 14 Feb 2024 00:43:56 -0700 -Subject: [PATCH] Fix #53: incompatible pointer types in pyaff.c - ---- - pyaff/afflib.pxd | 3 ++- - pyaff/pyaff.c | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/pyaff/afflib.pxd b/pyaff/afflib.pxd -index 850765c..b6cce11 100644 ---- a/pyaff/afflib.pxd -+++ b/pyaff/afflib.pxd -@@ -2,7 +2,8 @@ from libc.stdint cimport int64_t, uint32_t, uint64_t - from posix.fcntl cimport O_RDONLY - - cdef extern from "afflib/afflib.h": -- struct AFFILE -+ struct _AFFILE -+ ctypedef _AFFILE AFFILE - - enum: AF_MAX_NAME_LEN - -diff --git a/pyaff/pyaff.c b/pyaff/pyaff.c -index 99544f6..8ba33db 100644 ---- a/pyaff/pyaff.c -+++ b/pyaff/pyaff.c -@@ -1478,7 +1478,7 @@ struct __pyx_obj_5pyaff_affile; - */ - struct __pyx_obj_5pyaff_affile { - PyObject_HEAD -- struct AFFILE *af; -+ AFFILE *af; - int64_t size; - }; - --- -2.27.0 - diff --git a/afflib.spec b/afflib.spec index 104db3a83b448ff8f90a23fab6dcf464d408925a..edd6466a4a298cd11d4e2c5c270d00e55911a676 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,13 +1,11 @@ Name: afflib -Version: 3.7.20 -Release: 2 +Version: 3.7.22 +Release: 1 Summary: Library to support the Advanced Forensic Format -License: LGPL-2.0 and LGPL-2.1 and GPL-2.0+ and Public Domain +License: BSD-4-Clause AND Public Domain URL: https://github.com/sshock/AFFLIBv3 Source0: %{url}/archive/refs/tags/v%{version}.tar.gz -Patch1: Fix-53-incompatible-pointer-types-in-pyaff.c.patch - BuildRequires: gcc-c++ libtool curl-devel expat-devel ncurses-devel BuildRequires: libtermcap-devel openssl-devel zlib-devel BuildRequires: python3 python3-devel python3-setuptools python3-Cython @@ -50,9 +48,7 @@ chmod 0644 lib/base64.{h,cpp} %build %configure --enable-shared --disable-static --enable-python=no --enable-s3=yes -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 -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +%disable_rpath %make_build cd pyaff %global py_setup_args build_ext --include-dirs %{_builddir}/AFFLIBv3-%{version}/include --library-dirs %{_builddir}/AFFLIBv3-%{version}/lib/.libs @@ -64,13 +60,9 @@ cd pyaff cd pyaff %py3_install -%post -/sbin/ldconfig -%postun -/sbin/ldconfig - %files -%doc AUTHORS BUGLIST.txt ChangeLog NEWS README COPYING +%license COPYING +%doc AUTHORS BUGLIST.txt ChangeLog NEWS README %doc doc/announce_2.2.txt %{_libdir}/*.so.* @@ -90,6 +82,9 @@ cd pyaff %{python3_sitearch}/pyaff* %changelog +* Mon Oct 06 2025 Funda Wang - 3.7.22-1 +- update to 3.7.22 + * Mon Aug 04 2025 Liu Qingtao - 3.7.20-2 - backport: Fix incompatible pointer types in pyaff.c diff --git a/v3.7.20.tar.gz b/v3.7.20.tar.gz deleted file mode 100644 index a0f215add3505d9f5381463682b8a9af80cf3201..0000000000000000000000000000000000000000 Binary files a/v3.7.20.tar.gz and /dev/null differ diff --git a/v3.7.22.tar.gz b/v3.7.22.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9a26210c420aff7f8aef8634109212665f5aeac8 Binary files /dev/null and b/v3.7.22.tar.gz differ