Index: head/sysutils/sleuthkit/files/patch-tools_srchtools_sigfind.cpp =================================================================== --- head/sysutils/sleuthkit/files/patch-tools_srchtools_sigfind.cpp (revision 473333) +++ head/sysutils/sleuthkit/files/patch-tools_srchtools_sigfind.cpp (nonexistent) @@ -1,23 +0,0 @@ ---- tools/srchtools/sigfind.cpp.orig 2018-02-21 04:27:25 UTC -+++ 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; Property changes on: head/sysutils/sleuthkit/files/patch-tools_srchtools_sigfind.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/sleuthkit/Makefile =================================================================== --- head/sysutils/sleuthkit/Makefile (revision 473333) +++ head/sysutils/sleuthkit/Makefile (revision 473334) @@ -1,50 +1,59 @@ # Created by: Pieter Danhieux # $FreeBSD$ PORTNAME= sleuthkit -PORTVERSION= 4.6.0 +PORTVERSION= 4.6.1 CATEGORIES= sysutils security MASTER_SITES= https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-${PORTVERSION}/ MAINTAINER= antoine@FreeBSD.org COMMENT= Tools and library for filesystem forensic analysis LICENSE= CPL IBM GPLv2 LICENSE_COMB= multi LICENSE_NAME_CPL=Common Public License LICENSE_NAME_IBM=IBM Public License LICENSE_FILE_CPL=${WRKSRC}/licenses/cpl1.0.txt LICENSE_FILE_IBM=${WRKSRC}/licenses/IBM-LICENSE LICENSE_PERMS_CPL=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_IBM=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \ exif:graphics/exif CONFLICTS= ja-ls-[0-9]* icat-[0-9]* CPPFLAGS+= -D_WITH_GETLINE GNU_CONFIGURE= yes +CONFIGURE_ENV= ac_cv_header_libpq_fe_h=no USES= libtool perl5 sqlite USE_LDCONFIG= yes INSTALL_TARGET= install-strip DATADIR= ${PREFIX}/share/tsk PORTDOCS= NEWS.txt README.md -OPTIONS_DEFINE= AFFLIB DOCS LIBEWF -AFFLIB_DESC= Build with AFFLIB support +OPTIONS_DEFINE= AFFLIB DOCS LIBEWF LIBVHDI LIBVMDK +AFFLIB_DESC= Build with AFF support LIBEWF_DESC= Build with EWF support -OPTIONS_DEFAULT=LIBEWF +LIBVHDI_DESC= Build with VHDI support +LIBVMDK_DESC= Build with VMDK support +OPTIONS_DEFAULT=LIBEWF LIBVHDI LIBVMDK AFFLIB_LIB_DEPENDS= libafflib.so:sysutils/afflib AFFLIB_CONFIGURE_WITH= afflib=${LOCALBASE} LIBEWF_LIB_DEPENDS= libewf.so:devel/libewf LIBEWF_CONFIGURE_WITH= libewf=${LOCALBASE} + +LIBVHDI_LIB_DEPENDS= libvhdi.so:devel/libvhdi +LIBVHDI_CONFIGURE_WITH= libvhdi=${LOCALBASE} + +LIBVMDK_LIB_DEPENDS= libvmdk.so:devel/libvmdk +LIBVMDK_CONFIGURE_WITH= libvmdk=${LOCALBASE} post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/sysutils/sleuthkit/distinfo =================================================================== --- head/sysutils/sleuthkit/distinfo (revision 473333) +++ head/sysutils/sleuthkit/distinfo (revision 473334) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519248480 -SHA256 (sleuthkit-4.6.0.tar.gz) = f52a08ab0de078182c0f2d19d3e1b341424a9e0c1633a61c3b892fb38f9acb97 -SIZE (sleuthkit-4.6.0.tar.gz) = 8634432 +TIMESTAMP = 1525801149 +SHA256 (sleuthkit-4.6.1.tar.gz) = 1f68f3b5983acdb871a30592fb735a32f4db93f041fcf318bcf3ec87128ab433 +SIZE (sleuthkit-4.6.1.tar.gz) = 8642960 Index: head/sysutils/sleuthkit/pkg-plist =================================================================== --- head/sysutils/sleuthkit/pkg-plist (revision 473333) +++ head/sysutils/sleuthkit/pkg-plist (revision 473334) @@ -1,94 +1,94 @@ bin/blkcalc bin/blkcat bin/blkls bin/blkstat bin/fcat bin/ffind bin/fiwalk bin/fls bin/fsstat bin/hfind bin/icat bin/ifind bin/ils bin/img_cat bin/img_stat bin/istat bin/jcat bin/jls bin/jpeg_extract bin/mactime bin/mmcat bin/mmls bin/mmstat bin/sigfind bin/sorter bin/srch_strings bin/tsk_comparedir bin/tsk_gettimes bin/tsk_loaddb bin/tsk_recover bin/usnjls include/tsk/auto/tsk_auto.h include/tsk/auto/tsk_is_image_supported.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 include/tsk/fs/tsk_iso9660.h include/tsk/fs/tsk_ntfs.h include/tsk/fs/tsk_yaffs.h include/tsk/hashdb/tsk_hashdb.h include/tsk/img/tsk_img.h include/tsk/libtsk.h include/tsk/tsk_incs.h include/tsk/vs/tsk_bsd.h include/tsk/vs/tsk_dos.h 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 lib/libtsk.so lib/libtsk.so.13 -lib/libtsk.so.13.4.1 +lib/libtsk.so.13.4.2 man/man1/blkcalc.1.gz man/man1/blkcat.1.gz man/man1/blkls.1.gz man/man1/blkstat.1.gz man/man1/fcat.1.gz man/man1/ffind.1.gz man/man1/fls.1.gz man/man1/fsstat.1.gz man/man1/hfind.1.gz man/man1/icat.1.gz man/man1/ifind.1.gz man/man1/ils.1.gz man/man1/img_cat.1.gz man/man1/img_stat.1.gz man/man1/istat.1.gz man/man1/jcat.1.gz man/man1/jls.1.gz man/man1/mactime.1.gz man/man1/mmcat.1.gz man/man1/mmls.1.gz man/man1/mmstat.1.gz man/man1/sigfind.1.gz man/man1/sorter.1.gz man/man1/tsk_comparedir.1.gz man/man1/tsk_gettimes.1.gz man/man1/tsk_loaddb.1.gz man/man1/tsk_recover.1.gz man/man1/usnjls.1.gz %%DATADIR%%/sorter/default.sort %%DATADIR%%/sorter/freebsd.sort %%DATADIR%%/sorter/images.sort %%DATADIR%%/sorter/linux.sort %%DATADIR%%/sorter/openbsd.sort %%DATADIR%%/sorter/solaris.sort %%DATADIR%%/sorter/windows.sort