summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2018-09-12 05:06:56 +0000
committerspz <spz@pkgsrc.org>2018-09-12 05:06:56 +0000
commit2a078b343f6e2572557c072350684043004e365d (patch)
treeb451b729e025615b6cc356463b4935fbc882bdd6
parent389a21e1609880de2306c0e77a3cf6d562d851e3 (diff)
downloadpkgsrc-2a078b343f6e2572557c072350684043004e365d.tar.gz
Pullup ticket #5822 - requested by bsiegert
security/sleuthkit: security fix Revisions pulled up: - security/sleuthkit/Makefile 1.11 - security/sleuthkit/distinfo 1.6 - security/sleuthkit/patches/patch-tsk_fs_iso9660__dent.c 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: he Date: Thu Aug 23 07:47:34 UTC 2018 Modified Files: pkgsrc/security/sleuthkit: Makefile distinfo Added Files: pkgsrc/security/sleuthkit/patches: patch-tsk_fs_iso9660__dent.c Log Message: Add a fix for CVE-2017-13755, pointed to from https://github.com/sleuthkit/sleuthkit/issues/913 Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/sleuthkit/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/sleuthkit/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/security/sleuthkit/patches/patch-tsk_fs_iso9660__dent.c
-rw-r--r--security/sleuthkit/Makefile4
-rw-r--r--security/sleuthkit/distinfo3
-rw-r--r--security/sleuthkit/patches/patch-tsk_fs_iso9660__dent.c17
3 files changed, 21 insertions, 3 deletions
diff --git a/security/sleuthkit/Makefile b/security/sleuthkit/Makefile
index 7ed23932708..defbf6b0848 100644
--- a/security/sleuthkit/Makefile
+++ b/security/sleuthkit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2016/07/09 06:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8.18.1 2018/09/12 05:06:56 spz Exp $
DISTNAME= sleuthkit-4.1.3
-PKGREVISION= 4
+PKGREVISION= 6
CATEGORIES= security sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sleuthkit/}
diff --git a/security/sleuthkit/distinfo b/security/sleuthkit/distinfo
index b7155036ed3..d8ec2ade921 100644
--- a/security/sleuthkit/distinfo
+++ b/security/sleuthkit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 01:18:09 agc Exp $
+$NetBSD: distinfo,v 1.5.24.1 2018/09/12 05:06:56 spz Exp $
SHA1 (sleuthkit-4.1.3.tar.gz) = 9350bb59bb5fbe41d6e29a8d0494460b937749ef
RMD160 (sleuthkit-4.1.3.tar.gz) = 223c6ffe22259ca057b6d9634813536e7ccd9dba
@@ -6,4 +6,5 @@ SHA512 (sleuthkit-4.1.3.tar.gz) = 66f6ac32da5a21b3505390557ed6cf7bbcfcca69f231e2
Size (sleuthkit-4.1.3.tar.gz) = 7952733 bytes
SHA1 (patch-configure) = aa08d433f3bdc2fa96bcfe6e39897006b9ac3b3f
SHA1 (patch-tools_autotools_tsk__recover.cpp) = c82f8c366ae2675ee6c0c948c466b40f27bc1163
+SHA1 (patch-tsk_fs_iso9660__dent.c) = d60cb41962c750a3f9d8941b52191fd1bb06cda9
SHA1 (patch-tsk_img__tsk_img.h) = e466387bb40fdb14473ee835e168c0b28f43ab20
diff --git a/security/sleuthkit/patches/patch-tsk_fs_iso9660__dent.c b/security/sleuthkit/patches/patch-tsk_fs_iso9660__dent.c
new file mode 100644
index 00000000000..7b7e9a0e7bd
--- /dev/null
+++ b/security/sleuthkit/patches/patch-tsk_fs_iso9660__dent.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-tsk_fs_iso9660__dent.c,v 1.1.2.2 2018/09/12 05:06:56 spz Exp $
+
+--- tsk/fs/iso9660_dent.c.orig 2014-01-27 03:27:03.000000000 +0000
++++ tsk/fs/iso9660_dent.c
+@@ -98,6 +98,12 @@ iso9660_proc_dir(TSK_FS_INFO * a_fs, TSK
+ iso9660_inode_node *in;
+ TSK_OFF_T dir_offs = a_dir_addr * a_fs->block_size;
+
++ // had an issue once where dir was too small
++ // manu later calculations assume we can fit at least one entry
++ if (a_length < sizeof(iso9660_dentry)) {
++ return TSK_OK;
++ }
++
+ if ((fs_name = tsk_fs_name_alloc(ISO9660_MAXNAMLEN + 1, 0)) == NULL)
+ return TSK_ERR;
+