Hi,
I need to update sleuthkit for the new version of plaso.
Attached is the updated version of sleuthkit. It builds fine, but if I
run the regress tests of the py-tsk port it segfaults on the libtsk.
If I add LDFLAGS="-lstdc++", it works fine but it's not the good way to
fix it.
Any idea?
To test: build & install the sleuthkit port attached, and make test in
the py-tsk port attached.
Thanks for helping,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/sleuthkit/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile 14 Jul 2019 00:39:40 -0000 1.27
+++ Makefile 11 Mar 2020 06:36:22 -0000
@@ -2,11 +2,10 @@
COMMENT= forensic toolkit based on TCT
-DISTNAME= sleuthkit-4.6.0
+DISTNAME= sleuthkit-4.8.0
CATEGORIES= sysutils security
-REVISION= 2
-SHARED_LIBS += tsk 1.0 # 17.0
+SHARED_LIBS += tsk 2.0 # 17.0
HOMEPAGE= http://www.sleuthkit.org/
@@ -17,7 +16,7 @@ PERMIT_PACKAGE= Yes
MASTER_SITES = https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/
-WANTLIB += c m pthread ${COMPILER_LIBCXX} sqlite3 z
+WANTLIB += bfio c m pthread ${COMPILER_LIBCXX} sqlite3 vhdi vmdk z
COMPILER = base-clang ports-gcc
@@ -29,13 +28,21 @@ CONFIGURE_ARGS += --mandir='${PREFIX}/m
--without-afflib \
--without-libewf
-CONFIGURE_ENV = ac_cv_path_CPPUNIT_CONFIG=no
+CONFIGURE_ENV = ac_cv_path_CPPUNIT_CONFIG=no \
+ ac_cv_header_postgresql_libpq_fe_h=no
+# LDFLAGS="-lstdc++"
RUN_DEPENDS = converters/p5-DateManip
-LIB_DEPENDS = databases/sqlite3
+LIB_DEPENDS = databases/sqlite3 \
+ devel/libbfio \
+ sysutils/libvhdi \
+ sysutils/libvmdk
NO_TEST = Yes
pre-configure:
@sed -i 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/sorter.1
+
+post-install:
+ mv ${PREFIX}/bin/pstat ${PREFIX}/bin/pstat.sleuthkit
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/sleuthkit/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 14 Mar 2018 12:39:17 -0000 1.13
+++ distinfo 11 Mar 2020 06:36:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (sleuthkit-4.6.0.tar.gz) = 9SoIqw3geBgsDy0Z0+GzQUJKngwWM6YcO4kvs4+ay5c=
-SIZE (sleuthkit-4.6.0.tar.gz) = 8634432
+SHA256 (sleuthkit-4.8.0.tar.gz) = 9YS0bIgmk7y9gZ+1j3XpvkWsir2/YFwZD4fvESLyj2w=
+SIZE (sleuthkit-4.8.0.tar.gz) = 8784392
Index: patches/patch-tools_srchtools_sigfind_cpp
===================================================================
RCS file: patches/patch-tools_srchtools_sigfind_cpp
diff -N patches/patch-tools_srchtools_sigfind_cpp
--- patches/patch-tools_srchtools_sigfind_cpp 7 Apr 2018 23:15:28 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-tools_srchtools_sigfind_cpp,v 1.4 2018/04/07 23:15:28 nigel Exp $
-
-Index: tools/srchtools/sigfind.cpp
---- tools/srchtools/sigfind.cpp.orig
-+++ tools/srchtools/sigfind.cpp
-@@ -302,7 +302,7 @@ main(int argc, char **argv)
- break;
- }
- else if (retval == -1) {
-- fprintf(stderr, "error reading bytes %"PRIuOFF"\n", i);
-+ fprintf(stderr, "error reading bytes %" PRIuOFF "\n", i);
- exit(1);
- }
-
-@@ -312,9 +312,9 @@ main(int argc, char **argv)
- ((sig_size < 3) || (block[rel_offset + 2] == sig[2])) &&
- ((sig_size < 4) || (block[rel_offset + 3] == sig[3]))) {
- if (prev_hit == -1)
-- printf("Block: %"PRIuOFF" (-)\n", i);
-+ printf("Block: %" PRIuOFF " (-)\n", i);
- else
-- printf("Block: %"PRIuOFF" (+%"PRIuOFF")\n", i,
-+ printf("Block: %" PRIuOFF " (+%" PRIuOFF ")\n", i,
- (i - prev_hit));
-
- prev_hit = i;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/sleuthkit/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 31 Oct 2017 21:38:28 -0000 1.9
+++ pkg/PLIST 11 Mar 2020 06:36:22 -0000
@@ -26,6 +26,7 @@ bin/mactime
@bin bin/mmcat
@bin bin/mmls
@bin bin/mmstat
+@bin bin/pstat.sleuthkit
@bin bin/sigfind
bin/sorter
@bin bin/srch_strings
@@ -36,12 +37,19 @@ bin/sorter
@bin bin/usnjls
include/tsk/
include/tsk/auto/
+include/tsk/auto/guid.h
include/tsk/auto/tsk_auto.h
include/tsk/auto/tsk_is_image_supported.h
include/tsk/base/
include/tsk/base/tsk_base.h
include/tsk/base/tsk_os.h
include/tsk/fs/
+include/tsk/fs/apfs_compat.hpp
+include/tsk/fs/apfs_fs.h
+include/tsk/fs/apfs_fs.hpp
+include/tsk/fs/decmpfs.h
+include/tsk/fs/tsk_apfs.h
+include/tsk/fs/tsk_apfs.hpp
include/tsk/fs/tsk_exfatfs.h
include/tsk/fs/tsk_ext2fs.h
include/tsk/fs/tsk_fatfs.h
@@ -55,9 +63,21 @@ include/tsk/fs/tsk_yaffs.h
include/tsk/hashdb/
include/tsk/hashdb/tsk_hashdb.h
include/tsk/img/
+include/tsk/img/pool.hpp
include/tsk/img/tsk_img.h
include/tsk/libtsk.h
+include/tsk/pool/
+include/tsk/pool/apfs_pool_compat.hpp
+include/tsk/pool/pool_compat.hpp
+include/tsk/pool/tsk_apfs.h
+include/tsk/pool/tsk_apfs.hpp
+include/tsk/pool/tsk_pool.h
+include/tsk/pool/tsk_pool.hpp
include/tsk/tsk_incs.h
+include/tsk/util/
+include/tsk/util/crypto.hpp
+include/tsk/util/lw_shared_ptr.hpp
+include/tsk/util/span.hpp
include/tsk/vs/
include/tsk/vs/tsk_bsd.h
include/tsk/vs/tsk_dos.h
@@ -65,7 +85,7 @@ include/tsk/vs/tsk_gpt.h
include/tsk/vs/tsk_mac.h
include/tsk/vs/tsk_sun.h
include/tsk/vs/tsk_vs.h
-lib/libtsk.a
+@static-lib lib/libtsk.a
lib/libtsk.la
@lib lib/libtsk.so.${LIBtsk_VERSION}
@man man/man1/blkcalc.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/py-tsk/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile 12 Jul 2019 20:49:50 -0000 1.9
+++ Makefile 9 Mar 2020 20:53:13 -0000
@@ -2,10 +2,9 @@
COMMENT = Python bindings for The Sleuth Kit (libtsk)
-MODPY_EGG_VERSION = 20180225
+MODPY_EGG_VERSION = 20200117
DISTNAME = pytsk3-${MODPY_EGG_VERSION}
PKGNAME = py-tsk-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = sysutils
@@ -24,9 +23,12 @@ MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
WANTLIB += pthread talloc tsk ${MODPY_WANTLIB}
+
+# C++11
+COMPILER= ports-clang ports-gcc
pre-configure:
${SUBST_DATA} ${WRKSRC}/setup.py ${WRKSRC}/setup.py.new
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/py-tsk/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 14 Mar 2018 12:36:40 -0000 1.6
+++ distinfo 9 Mar 2020 20:53:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (pytsk3-20180225.tar.gz) = 2Bjk5yL06r+aCbip+AzhD6tmNBXcDoZ4c7ux+MBg7Pc=
-SIZE (pytsk3-20180225.tar.gz) = 3149373
+SHA256 (pytsk3-20200117.tar.gz) = VhdxZKNY6YuqJYKWqi6aUJME3I2rBTq6w0dDWgl42WI=
+SIZE (pytsk3-20200117.tar.gz) = 3060827
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/py-tsk/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 22 Jan 2017 08:18:04 -0000 1.1.1.1
+++ pkg/PLIST 9 Mar 2020 20:53:13 -0000
@@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/01/22 08:18:04 rpointel Exp $
+@pkgpath sysutils/py-tsk
lib/python${MODPY_VERSION}/site-packages/pytsk3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pytsk3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/pytsk3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pytsk3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/pytsk3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/pytsk3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/pytsk3.so
+@so lib/python${MODPY_VERSION}/site-packages/pytsk3.so
