3 Commits

7 changed files with 143 additions and 11 deletions

View File

@@ -0,0 +1,79 @@
Index: pytsk3-20250729/talloc/replace.h
===================================================================
--- pytsk3-20250729.orig/talloc/replace.h
+++ pytsk3-20250729/talloc/replace.h
@@ -11,7 +11,7 @@
#define _PUBLIC_ extern
-typedef int bool;
+typedef int talloc_bool;
#define true 1
#define false 0
Index: pytsk3-20250729/talloc/talloc.c
===================================================================
--- pytsk3-20250729.orig/talloc/talloc.c
+++ pytsk3-20250729/talloc/talloc.c
@@ -120,8 +120,8 @@ static void *autofree_context;
* catching use after free errors when valgrind is too slow
*/
static struct {
- bool initialised;
- bool enabled;
+ talloc_bool initialised;
+ talloc_bool enabled;
uint8_t fill_value;
} talloc_fill;
@@ -237,7 +237,7 @@ struct talloc_memlimit {
size_t cur_size;
};
-static bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size);
+static talloc_bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size);
static void talloc_memlimit_grow(struct talloc_memlimit *limit,
size_t size);
static void talloc_memlimit_shrink(struct talloc_memlimit *limit,
@@ -1582,7 +1582,7 @@ _PUBLIC_ void *_talloc_realloc(const voi
{
struct talloc_chunk *tc;
void *new_ptr;
- bool malloced = false;
+ talloc_bool malloced = false;
struct talloc_pool_hdr *pool_hdr = NULL;
size_t old_size = 0;
size_t new_size = 0;
@@ -2672,7 +2672,7 @@ static size_t _talloc_total_limit_size(c
old_limit, new_limit);
}
-static bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size)
+static talloc_bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size)
{
struct talloc_memlimit *l;
Index: pytsk3-20250729/sleuthkit/tsk/base/crc.h
===================================================================
--- pytsk3-20250729.orig/sleuthkit/tsk/base/crc.h
+++ pytsk3-20250729/sleuthkit/tsk/base/crc.h
@@ -91,7 +91,7 @@ Status : Copyright (C) Ross Williams, 1
#ifndef DONE_STYLE
typedef unsigned long ulong;
-typedef unsigned bool;
+typedef unsigned crc_bool;
typedef unsigned char * p_ubyte_;
#ifndef TRUE
@@ -120,8 +120,8 @@ typedef struct
int cm_width; /* Parameter: Width in bits [8,32]. */
ulong cm_poly; /* Parameter: The algorithm's polynomial. */
ulong cm_init; /* Parameter: Initial register value. */
- bool cm_refin; /* Parameter: Reflect input bytes? */
- bool cm_refot; /* Parameter: Reflect output CRC? */
+ crc_bool cm_refin; /* Parameter: Reflect input bytes? */
+ crc_bool cm_refot; /* Parameter: Reflect output CRC? */
ulong cm_xorot; /* Parameter: XOR this to output CRC. */
ulong cm_reg; /* Context: Context during execution. */

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Aug 1 14:49:21 UTC 2025 - Felix Stegmeier <felix.stegmeier@suse.com>
- Add fix-rename-bool-variable.patch gcc 15 support
- update to 20250729
* Pre-release of version 20250729, for testing purposes, based on
libtsk 4.14.0
-------------------------------------------------------------------
Tue Aug 1 18:49:10 UTC 2023 - Greg Freemyer <Greg.Freemyer@gmail.com>

29
python-tsk.keyring Normal file
View File

@@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBFSf2CoBCADJOuDavJeI0IhBPnIYol/ZfE2bXvmRJMGPasU1H6CJagTkc/Iq
SuUpiix7HcYgyGY7qHO7B1Wpnh5plc03dFW2ysTnOk8NzSqWF/gbWIYbRg8GUATg
fGy7NoIio/hbBlWkM0rPQq7AIK79m0m2U4ZAuQPamAC4y8H9j/SyTFI1gQNeExZ+
L8DE3QjSx4GAVgb4cfdQQPwGmoOIgKSudZN6oPiOj+MM3yh1vv49C45ChSWNWGjB
683zFbjuS0A483MFPI8iQGC8JecmQGvpzcOoSLkyTjT7vleFYGkfj8N0FB5Bq2L5
TT2w9lQKEjvWTe//G4tXgnGXy8PwqRZmj2CfABEBAAG0JUpvYWNoaW0gTWV0eiA8
am9hY2hpbS5tZXR6QGdtYWlsLmNvbT6JATkEEwECACMFAlSf2CoCGwMHCwkIBwMC
AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDZYl5detAXfkBgCAC4W/adqlNYSkK5VDoU
FDMMRDffVVe0WdPlW7PDJXR0R0IParwHD+FJY3jtNA2upqKTCXm7JbQRN/n4Qrfb
PJHr0EoBF7iG6kT4RKocImciuMJaj4fTolGNdc0iRKl5tMIb64RiE47XhN7v6/oP
UaqrbnF5EW9EZ2AqOSTEcLeTgKLErMlv2dLjFXg8jXGNxTkmi6BELyaczgWBgD9I
3tfMvXLswI5q9RtpJUc8oAfV81ibfFm6UeItQxM6SM0WLKILlXIQqqiQ4oCbAm4R
PJI4RwoJYAhcJOmUXrAUC5obhjkf9Qo0RJzVMFLuQXDiRV5W5dBL/hs9M0FVWDxv
siZNuQENBFSf2CoBCADODF+4Q3nXhmvTpVZTh17gYzCQqOHKctyTwoWg0VidmWWD
lmtDBX8hWh1fjm0KQezzYagddgjlPncgq/oyrhvq2fEG3nch5qpb8k94v6KlhC9+
SoJAwFoMLfCG8lQXASHKFvt3LJKJhS3laOLzzc4QNhWG7KRrwiOcp47bjoL8x+9L
U1EkGZR1OMGWYaJmokEcPTNchLEgL7MMRtdaPmh9R2f8N7eqb/mKNZCxyt89a3yw
uapLtYe5dRPEnpL00PXd9uMlwMbyuMcP60CouMFGqqKeBITWTd8vPsz+CpictNZw
Toa25CCGgoGm2pP5catMdjH3SDZef5Mkqq5uZT/pABEBAAGJAR8EGAECAAkFAlSf
2CoCGwwACgkQ2WJeXXrQF34oPQf6AyuzFs60DKrldW8tKPZxSmrQoOEK5h+w1WUQ
RTvJyE5CECzocC68s46jGkluMa4wHzBDGYH2CoWAqXpnEC4UivBtlZses92vdqtM
5kqWrSkamTwsggtVyqHvHUW+OSiJLluGA1amn1sVaQUAIP9PEk/q7Qj9VzctKGA5
3UVw6NA/sYad+IIg95qu798GF4nrtyY9nhQg9YM/6C2CF6FpJJUlNMPXm9zx20dL
cuAm/5zwU7xoNbV8c829EiqrRCdJMY8/LPriF7fDxUQa3AAptFZoWWkt4T5QbjB4
VpPayIneEZRdCFktpSPgVYLm8HboNXeladSTdOtJS0HaoPzMTg==
=fRjn
-----END PGP PUBLIC KEY BLOCK-----

View File

@@ -1,7 +1,10 @@
#
# spec file for package python-tsk
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +18,21 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?sle15_python_module_pythons}
%define timestamp 20210419
Name: python-tsk
Version: 0~%{timestamp}
Version: 20250729
Release: 0
Summary: Python bindings for tsk - The SleuthKit
Summary: Python bindings for tsk (The SleuthKit)
# the included talloc library is LGPL 3
License: Apache-2.0 AND LGPL-3.0-or-later
URL: https://github.com/py4n6/pytsk/
Source0: https://files.pythonhosted.org/packages/source/p/pytsk3/pytsk3-%{timestamp}.tar.gz
Source: https://files.pythonhosted.org/packages/source/p/pytsk3/pytsk3-%{version}.tar.gz
Source2: https://github.com/py4n6/pytsk/releases/download/%{version}/pytsk3-%{version}.tar.gz.asc
Source3: python-tsk.keyring
#PATCH-FIX-UPSTREAM fix-rename-bool-variable.patch taken from https://github.com/py4n6/pytsk/pull/111/
Patch0: fix-rename-bool-variable.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -47,7 +53,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
The Sleuthkit is a forensic filesystem analysis framework (http://www.sleuthkit.org/). This project is a python 3 binding for the sleuthkit.
%prep
%setup -q -n pytsk3-%{timestamp}
%autosetup -p1 -n pytsk3-%{version}
# remove unused libraries with incompatible license, use libtalloc from main repositories
# rm -rf pytsk talloc
# rm -rf pytsk talloc.new
@@ -67,7 +73,6 @@ $python ./run_tests.py
}
%files %{python_files}
%defattr(-,root,root)
%doc README
%license LICENSE
%{python_sitearch}/*

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:492d833924409fef89b802434d13f404b0121a5247cfe71d2068723a25079035
size 3187790

3
pytsk3-20250729.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e41fb4d43f79b81e135dea15c5bc18649eaf8cda04bfba13e8ba7c1de6ee05a
size 3327242

View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmiIXrAACgkQ2WJeXXrQ
F34UZwf7BC43+i67R8GnI2Z1c3YFfl6ip+x39q7fYwi43vjOEpROBPihYGzsGzLk
2WLeQ2ZlMBBo2iOrWmnz0T0vvaKW9jEK6c953MXeNgdF7vdDsS0GoZ4rLxmXpxru
FGV8kkXr6rbkFBIDPOD7OHGpWkshzq14/9DKH10AANuO23TPq1ubvpqVjBAYJNa1
sl5d4KTKrOiZWNQ95HS+lNv7lBzAoj9p82etiBoGeaDSD9mleH+KJYx00HGc2mnG
8dKavrKk49ZsagjiBg3KwI23dHh/Xm3FYulSRetEL89kX7D9l4XbVdI406DY986b
3XM/jcEdLIFaM6GxPw37cOuFnFKskg==
=FkYG
-----END PGP SIGNATURE-----