Update sleuthkit to 4.2.0

6 files changed, 27 insertions, 22 deletions

diff --git a/sysutils/py-pytsk/Makefile b/sysutils/py-pytsk/Makefile
index 5b382c0e94fa..58e5c2e22210 100644
--- a/sysutils/py-pytsk/Makefile
+++ b/sysutils/py-pytsk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pytsk
 PORTVERSION=	20150406
+PORTREVISION=	1
 CATEGORIES=	sysutils security devel python
 MASTER_SITES=	https://github.com/py4n6/pytsk/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index d2c2fd44acd2..4b084b6a0c16 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sleuthkit
-PORTVERSION=	4.1.3
-PORTREVISION=	2
+PORTVERSION=	4.2.0
 CATEGORIES=	sysutils security
 MASTER_SITES=	SF
 
@@ -25,21 +24,23 @@ RUN_DEPENDS=	p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
 CONFLICTS=	ja-ls-[0-9]* icat-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_path_PERL="${PERL}"
 USES=		libtool perl5
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 DATADIR=	${PREFIX}/share/tsk
 
-PORTDOCS=	NEWS.txt README.txt
+PORTDOCS=	NEWS.txt README.md
 
-OPTIONS_DEFINE=	DOCS LIBEWF
+OPTIONS_DEFINE=	AFFLIB DOCS LIBEWF
+AFFLIB_DESC=	Build with AFFLIB support
 LIBEWF_DESC=	Build with EWF support
 OPTIONS_DEFAULT=LIBEWF
 
+AFFLIB_LIB_DEPENDS=	libafflib.so:${PORTSDIR}/sysutils/afflib
+AFFLIB_CONFIGURE_WITH=	afflib=${LOCALBASE}
+
 LIBEWF_LIB_DEPENDS=	libewf.so:${PORTSDIR}/devel/libewf
-LIBEWF_CONFIGURE_ON=	--with-libewf=${LOCALBASE}
-LIBEWF_CONFIGURE_OFF=	--without-libewf
+LIBEWF_CONFIGURE_WITH=	libewf=${LOCALBASE}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index 673b0e271652..bd3c97f1f117 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sleuthkit-4.1.3.tar.gz) = 67f9d2a31a8884d58698d6122fc1a1bfa9bf238582bde2b49228ec9b899f0327
-SIZE (sleuthkit-4.1.3.tar.gz) = 7952733
+SHA256 (sleuthkit-4.2.0.tar.gz) = 91b287f19798ae480083c15401686e4a041c15f7a92054a5c0320bcb65604723
+SIZE (sleuthkit-4.2.0.tar.gz) = 8444596
diff --git a/sysutils/sleuthkit/files/patch-tsk__img__tsk_img.h b/sysutils/sleuthkit/files/patch-tsk__img__tsk_img.h
deleted file mode 100644
index 61c253208049..000000000000
--- a/sysutils/sleuthkit/files/patch-tsk__img__tsk_img.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./tsk/img/tsk_img.h.orig	2014-01-27 03:27:03.000000000 +0000
-+++ ./tsk/img/tsk_img.h	2014-02-09 16:25:08.000000000 +0000
-@@ -66,6 +66,8 @@
- 
-         TSK_IMG_TYPE_EWF_EWF = 0x0040,  ///< EWF version
- 
-+        TSK_IMG_TYPE_EXTERNAL = 0x1000,  ///< external defined format which at least implements TSK_IMG_INFO, used by pytsk
-+
-         TSK_IMG_TYPE_UNSUPP = 0xffff,   ///< Unsupported disk image type
-     } TSK_IMG_TYPE_ENUM;
- 
diff --git a/sysutils/sleuthkit/files/patch-tsk_hashdb_binsrch__index.cpp b/sysutils/sleuthkit/files/patch-tsk_hashdb_binsrch__index.cpp
new file mode 100644
index 000000000000..cd026996ab98
--- /dev/null
+++ b/sysutils/sleuthkit/files/patch-tsk_hashdb_binsrch__index.cpp
@@ -0,0 +1,11 @@
+--- tsk/hashdb/binsrch_index.cpp.orig	2015-09-16 17:07:12 UTC
++++ tsk/hashdb/binsrch_index.cpp
+@@ -23,7 +23,7 @@
+ // the hash, so there are 2 ^ 12 or 4096 possible entries.
+ static const size_t IDX_IDX_ENTRY_COUNT = 4096;
+ static const size_t IDX_IDX_SIZE = IDX_IDX_ENTRY_COUNT * sizeof(uint64_t);
+-static const uint64_t IDX_IDX_ENTRY_NOT_SET = 0xFFFFFFFFFFFFFFFF;
++static const uint64_t IDX_IDX_ENTRY_NOT_SET = 0xFFFFFFFFFFFFFFFFULL;
+ 
+ 
+ /**
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index 27d754f3e852..66c1c30d81f4 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -28,11 +28,14 @@ bin/tsk_comparedir
 bin/tsk_gettimes
 bin/tsk_loaddb
 bin/tsk_recover
+include/tsk/auto/sqlite3.h
 include/tsk/auto/tsk_auto.h
 include/tsk/base/tsk_base.h
 include/tsk/base/tsk_os.h
+include/tsk/fs/tsk_exfatfs.h
 include/tsk/fs/tsk_ext2fs.h
 include/tsk/fs/tsk_fatfs.h
+include/tsk/fs/tsk_fatxxfs.h
 include/tsk/fs/tsk_ffs.h
 include/tsk/fs/tsk_fs.h
 include/tsk/fs/tsk_hfs.h
@@ -51,8 +54,8 @@ include/tsk/vs/tsk_sun.h
 include/tsk/vs/tsk_vs.h
 lib/libtsk.a
 lib/libtsk.so
-lib/libtsk.so.10
-lib/libtsk.so.10.2.0
+lib/libtsk.so.13
+lib/libtsk.so.13.0.0
 man/man1/blkcalc.1.gz
 man/man1/blkcat.1.gz
 man/man1/blkls.1.gz