diff --git a/class_parser.py b/class_parser.py index 87aac08..c936092 100644 --- a/class_parser.py +++ b/class_parser.py @@ -235,7 +235,7 @@ DEBUG = 0 # The pytsk3 version. -VERSION = "20250729" +VERSION = "20250801" # These functions are used to manage library memory. FREE = "aff4_free" diff --git a/dpkg/changelog b/dpkg/changelog index fb832bb..daa087f 100644 --- a/dpkg/changelog +++ b/dpkg/changelog @@ -1,5 +1,5 @@ -pytsk3 (20250729-1) unstable; urgency=low +pytsk3 (20250801-1) unstable; urgency=low * Auto-generated - -- Joachim Metz Tue, 29 Jul 2025 07:05:03 -0100 + -- Joachim Metz Fri, 01 Aug 2025 07:51:42 -0100 diff --git a/patches/sleuthkit-4.14.0-crc.h b/patches/sleuthkit-4.14.0-crc.h new file mode 100644 index 0000000..2edf225 --- /dev/null +++ b/patches/sleuthkit-4.14.0-crc.h @@ -0,0 +1,24 @@ +diff --git a/tsk/base/crc.h b/tsk/base/crc.h +index f9f4617c3..f73426c36 100644 +--- a/tsk/base/crc.h ++++ b/tsk/base/crc.h +@@ -91,7 +91,7 @@ Status : Copyright (C) Ross Williams, 1993. However, permission is + #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. */ diff --git a/setup.cfg b/setup.cfg index 4caabc4..cc9b1fc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pytsk3 -version = 20250729 +version = 20250801 description = Python bindings for the SleuthKit long_description = Python bindings for the SleuthKit author = Michael Cohen diff --git a/talloc/replace.h b/talloc/replace.h index 1847a8e..87a889d 100644 --- a/talloc/replace.h +++ b/talloc/replace.h @@ -11,7 +11,7 @@ #define _PUBLIC_ extern -typedef int bool; +typedef int talloc_bool; #define true 1 #define false 0 diff --git a/talloc/talloc.c b/talloc/talloc.c index 45035e6..e095442 100644 --- a/talloc/talloc.c +++ b/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 void *context, void *ptr, size_t size, cons { 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(const void *ptr, 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;