From fdc00e77aa7034730a7fe9d94da7f18b73d74a61 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Wed, 12 Mar 2025 05:56:03 +0100 Subject: [PATCH 1/5] Updated to SleuthKit 4.13.0 --- .github/workflows/build.yml | 1 - class_parser.py | 2 +- dpkg/changelog | 4 +-- patches/sleuthkit-4.12.1-configure.ac | 37 -------------------------- patches/sleuthkit-4.12.1-fatfs_utils.c | 18 ------------- setup.cfg | 2 +- setup.py | 8 +++--- sleuthkit | 2 +- 8 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 patches/sleuthkit-4.12.1-configure.ac delete mode 100644 patches/sleuthkit-4.12.1-fatfs_utils.c diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 606705e..352a8c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,6 @@ jobs: run: | sudo add-apt-repository universe && sudo add-apt-repository -y ppa:deadsnakes/ppa && - sudo add-apt-repository -y ppa:gift/dev && sudo apt-get update && sudo apt-get install -y autoconf automake autopoint autotools-dev build-essential git libtool pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools - name: Install tox diff --git a/class_parser.py b/class_parser.py index 580fd64..a447f4b 100644 --- a/class_parser.py +++ b/class_parser.py @@ -235,7 +235,7 @@ DEBUG = 0 # The pytsk3 version. -VERSION = "20240407" +VERSION = "20250312" # These functions are used to manage library memory. FREE = "aff4_free" diff --git a/dpkg/changelog b/dpkg/changelog index f661fd3..f485616 100644 --- a/dpkg/changelog +++ b/dpkg/changelog @@ -1,5 +1,5 @@ -pytsk3 (20240407-1) unstable; urgency=low +pytsk3 (20250312-1) unstable; urgency=low * Auto-generated - -- Joachim Metz Sun, 07 Apr 2024 10:22:07 -0100 + -- Joachim Metz Wed, 12 Mar 2025 05:50:00 -0100 diff --git a/patches/sleuthkit-4.12.1-configure.ac b/patches/sleuthkit-4.12.1-configure.ac deleted file mode 100644 index c560fe0..0000000 --- a/patches/sleuthkit-4.12.1-configure.ac +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 94c0c3b7..354e666e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -407,31 +407,8 @@ AC_CONFIG_FILES([ - tsk/img/Makefile - tsk/vs/Makefile - tsk/fs/Makefile -- tsk/hashdb/Makefile -- tsk/auto/Makefile - tsk/pool/Makefile -- tsk/util/Makefile -- tools/Makefile -- tools/imgtools/Makefile -- tools/vstools/Makefile -- tools/fstools/Makefile -- tools/hashtools/Makefile -- tools/srchtools/Makefile -- tools/autotools/Makefile -- tools/pooltools/Makefile -- tools/sorter/Makefile -- tools/timeline/Makefile -- tools/fiwalk/Makefile -- tools/fiwalk/src/Makefile -- tools/fiwalk/plugins/Makefile -- tests/Makefile -- samples/Makefile -- man/Makefile -- bindings/java/Makefile -- bindings/java/jni/Makefile -- case-uco/java/Makefile -- unit_tests/Makefile -- unit_tests/base/Makefile]) -+ tsk/util/Makefile]) - - AC_OUTPUT - diff --git a/patches/sleuthkit-4.12.1-fatfs_utils.c b/patches/sleuthkit-4.12.1-fatfs_utils.c deleted file mode 100644 index aefab16..0000000 --- a/patches/sleuthkit-4.12.1-fatfs_utils.c +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/tsk/fs/fatfs_utils.c b/tsk/fs/fatfs_utils.c -index 9495ac923..440b0dff8 100755 ---- a/tsk/fs/fatfs_utils.c -+++ b/tsk/fs/fatfs_utils.c -@@ -179,8 +179,11 @@ fatfs_dos_2_unix_time(uint16_t date, uint16_t time, uint8_t timetens) - * it out */ - tm1.tm_isdst = -1; - -- ret = mktime(&tm1); -- -+#if defined( _MSC_VER ) -+ ret = _mkgmtime(&tm1); -+#else -+ ret = timegm(&tm1); -+#endif - if (ret < 0) { - if (tsk_verbose) - tsk_fprintf(stderr, diff --git a/setup.cfg b/setup.cfg index 8d3d5f1..103a00e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pytsk3 -version = 20241215 +version = 20250312 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 2a2ddfa..e9c70fd 100755 --- a/setup.py +++ b/setup.py @@ -170,9 +170,9 @@ def configure_source(self, compiler): # binding. command = [ "sh", "configure", "--disable-java", "--disable-multithreading", - "--without-afflib", "--without-libbfio", "--without-libewf", - "--without-libvhdi", "--without-libvmdk", "--without-libvslvm", - "--without-zlib"] + "--without-afflib", "--without-libbfio", "--without-libcrypto", + "--without-libewf", "--without-libvhdi", "--without-libvmdk", + "--without-libvslvm", "--without-zlib"] output = subprocess.check_output(command, cwd="sleuthkit") print_line = False @@ -241,7 +241,7 @@ class UpdateCommand(Command): This is normally only run by packagers to make a new release. """ - _SLEUTHKIT_GIT_TAG = "4.12.1" + _SLEUTHKIT_GIT_TAG = "4.13.0" version = time.strftime("%Y%m%d") diff --git a/sleuthkit b/sleuthkit index 710dfac..6c6432d 160000 --- a/sleuthkit +++ b/sleuthkit @@ -1 +1 @@ -Subproject commit 710dfac6bb3e6b99135a2fab6fba239d5228dfaf +Subproject commit 6c6432d2eb0c0dae193e00b1594d158283b4465e From 8d19a2b9e2b8e5439f48bd9ac8ff618c604b429b Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Wed, 12 Mar 2025 06:10:43 +0100 Subject: [PATCH 2/5] Updated to SleuthKit 4.13.0 --- class_parser.py | 3 +++ setup.py | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/class_parser.py b/class_parser.py index a447f4b..f15754e 100644 --- a/class_parser.py +++ b/class_parser.py @@ -809,6 +809,9 @@ def write(self, out): "extern \"C\" {\n" "#endif\n" "\n" + "#undef max\n" + "#undef min\n" + "\n" "#include \n") out.write(self.private_functions()) diff --git a/setup.py b/setup.py index e9c70fd..2348f36 100755 --- a/setup.py +++ b/setup.py @@ -101,7 +101,7 @@ def build_extension(self, extension): if self.compiler.compiler_type == 'msvc': extra_args.append('/EHsc') else: - extra_args.append('-std=c++14') + extra_args.append('-std=c++17') macros = extension.define_macros[:] for undef in extension.undef_macros: @@ -295,9 +295,7 @@ def patch_sleuthkit(self): with open(filename, "w") as fd: fd.write(data) - patch_files = [ - "sleuthkit-{0:s}-configure.ac".format(self._SLEUTHKIT_GIT_TAG), - "sleuthkit-{0:s}-fatfs_utils.c".format(self._SLEUTHKIT_GIT_TAG)] + patch_files = [] for patch_file in patch_files: patch_file = os.path.join("patches", patch_file) From aab3187eac8db96ed0df518fe902e2ceed3ad087 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Wed, 12 Mar 2025 06:21:38 +0100 Subject: [PATCH 3/5] Updated to SleuthKit 4.13.0 --- dpkg/changelog | 2 +- setup.py | 5 +++-- sleuthkit-4.13.0-configure.ac | 0 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 sleuthkit-4.13.0-configure.ac diff --git a/dpkg/changelog b/dpkg/changelog index f485616..2e37243 100644 --- a/dpkg/changelog +++ b/dpkg/changelog @@ -2,4 +2,4 @@ pytsk3 (20250312-1) unstable; urgency=low * Auto-generated - -- Joachim Metz Wed, 12 Mar 2025 05:50:00 -0100 + -- Joachim Metz Wed, 12 Mar 2025 06:20:24 -0100 diff --git a/setup.py b/setup.py index 2348f36..c8b42b0 100755 --- a/setup.py +++ b/setup.py @@ -101,7 +101,7 @@ def build_extension(self, extension): if self.compiler.compiler_type == 'msvc': extra_args.append('/EHsc') else: - extra_args.append('-std=c++17') + extra_args.append('-std=c++14') macros = extension.define_macros[:] for undef in extension.undef_macros: @@ -295,7 +295,8 @@ def patch_sleuthkit(self): with open(filename, "w") as fd: fd.write(data) - patch_files = [] + patch_files = [ + "sleuthkit-{0:s}-configure.ac".format(self._SLEUTHKIT_GIT_TAG)] for patch_file in patch_files: patch_file = os.path.join("patches", patch_file) diff --git a/sleuthkit-4.13.0-configure.ac b/sleuthkit-4.13.0-configure.ac new file mode 100644 index 0000000..e69de29 From d7bf2a2bd50645dfa921b3226db2a253699e9e3c Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Wed, 12 Mar 2025 06:26:40 +0100 Subject: [PATCH 4/5] Updated to SleuthKit 4.13.0 --- class_parser.py | 3 --- dpkg/changelog | 2 +- .../sleuthkit-4.13.0-configure.ac.patch | 0 3 files changed, 1 insertion(+), 4 deletions(-) rename sleuthkit-4.13.0-configure.ac => patches/sleuthkit-4.13.0-configure.ac.patch (100%) diff --git a/class_parser.py b/class_parser.py index f15754e..a447f4b 100644 --- a/class_parser.py +++ b/class_parser.py @@ -809,9 +809,6 @@ def write(self, out): "extern \"C\" {\n" "#endif\n" "\n" - "#undef max\n" - "#undef min\n" - "\n" "#include \n") out.write(self.private_functions()) diff --git a/dpkg/changelog b/dpkg/changelog index 2e37243..30c7a89 100644 --- a/dpkg/changelog +++ b/dpkg/changelog @@ -2,4 +2,4 @@ pytsk3 (20250312-1) unstable; urgency=low * Auto-generated - -- Joachim Metz Wed, 12 Mar 2025 06:20:24 -0100 + -- Joachim Metz Wed, 12 Mar 2025 06:25:38 -0100 diff --git a/sleuthkit-4.13.0-configure.ac b/patches/sleuthkit-4.13.0-configure.ac.patch similarity index 100% rename from sleuthkit-4.13.0-configure.ac rename to patches/sleuthkit-4.13.0-configure.ac.patch From f1630eb6b4e0bc06391c52d7eb8ce258d7a448b2 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Wed, 12 Mar 2025 06:34:43 +0100 Subject: [PATCH 5/5] Updated to SleuthKit 4.13.0 --- MANIFEST.in | 2 +- dpkg/changelog | 2 +- patches/sleuthkit-4.13.0-configure.ac | 13 +++++++++++++ patches/sleuthkit-4.13.0-configure.ac.patch | 0 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 patches/sleuthkit-4.13.0-configure.ac delete mode 100644 patches/sleuthkit-4.13.0-configure.ac.patch diff --git a/MANIFEST.in b/MANIFEST.in index e3dac9e..4996687 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,7 +7,7 @@ exclude .git .gitignore .gitmodules exclude .travis.yml exclude API-CHANGES.txt config.log ruleset.xml setupDevRepos.py travis_build.sh recursive-include dpkg * -recursive-include patches *.patch +recursive-include patches * recursive-include sleuthkit * recursive-exclude sleuthkit/autom4te.cache * recursive-exclude sleuthkit/bindings * diff --git a/dpkg/changelog b/dpkg/changelog index 30c7a89..1ad7aa8 100644 --- a/dpkg/changelog +++ b/dpkg/changelog @@ -2,4 +2,4 @@ pytsk3 (20250312-1) unstable; urgency=low * Auto-generated - -- Joachim Metz Wed, 12 Mar 2025 06:25:38 -0100 + -- Joachim Metz Wed, 12 Mar 2025 06:32:21 -0100 diff --git a/patches/sleuthkit-4.13.0-configure.ac b/patches/sleuthkit-4.13.0-configure.ac new file mode 100644 index 0000000..d235171 --- /dev/null +++ b/patches/sleuthkit-4.13.0-configure.ac @@ -0,0 +1,13 @@ +diff --git a/sleuthkit/configure.ac b/sleuthkit/configure.ac +index 91163fc67..e64f4f99a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,7 +15,7 @@ AM_MAINTAINER_MODE + + dnl Checks for programs. + AC_PROG_CXX +-AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) ++AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL diff --git a/patches/sleuthkit-4.13.0-configure.ac.patch b/patches/sleuthkit-4.13.0-configure.ac.patch deleted file mode 100644 index e69de29..0000000