diff --git a/class_parser.py b/class_parser.py index 5ecf1e7..bbb63cd 100644 --- a/class_parser.py +++ b/class_parser.py @@ -235,7 +235,7 @@ DEBUG = 0 # The pytsk3 version. -VERSION = "20260416" +VERSION = "20260418" # These functions are used to manage library memory. FREE = "aff4_free" diff --git a/dpkg/changelog b/dpkg/changelog index 402fca9..e13b5e4 100644 --- a/dpkg/changelog +++ b/dpkg/changelog @@ -1,5 +1,5 @@ -pytsk3 (20260416-1) unstable; urgency=low +pytsk3 (20260418-1) unstable; urgency=low * Auto-generated - -- Joachim Metz Thu, 16 Apr 2026 04:47:37 -0100 + -- Joachim Metz Sat, 18 Apr 2026 06:52:05 -0100 diff --git a/patches/sleuthkit-4.15.0-crc.h b/patches/sleuthkit-4.15.0-crc.h deleted file mode 100644 index 2edf225..0000000 --- a/patches/sleuthkit-4.15.0-crc.h +++ /dev/null @@ -1,24 +0,0 @@ -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 2209971..8456d52 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pytsk3 -version = 20260416 +version = 20260418 description = Python bindings for the SleuthKit long_description = Python bindings for the SleuthKit author = Michael Cohen diff --git a/setup.py b/setup.py index bc482e5..8fcac07 100755 --- a/setup.py +++ b/setup.py @@ -305,6 +305,7 @@ def patch_sleuthkit(self): continue patch_file = os.path.join("..", patch_file) + print("Applying patch file: {0:s}".format(patch_file)) subprocess.check_call(["git", "apply", patch_file], cwd="sleuthkit") def run(self): @@ -328,6 +329,17 @@ def run(self): self.patch_sleuthkit() + files = [ + os.path.join('sleuthkit', 'win32', 'PostgreSQL_CRT', 'win32', + 'msvcr120.dll'), + os.path.join('sleuthkit', 'win32', 'PostgreSQL_CRT', 'win64', + 'msvcr120.dll'), + ] + + for file in files: + print("Removing: {0:s}".format(file)) + os.remove(file) + compiler_type = distutils.ccompiler.get_default_compiler() if compiler_type != "msvc": subprocess.check_call(["./bootstrap"], cwd="sleuthkit")