* [gentoo-commits] repo/gentoo:master commit in: app-forensics/sleuthkit/files/, app-forensics/sleuthkit/
@ 2018-04-23 21:52 Göktürk Yüksek
0 siblings, 0 replies; 5+ messages in thread
From: Göktürk Yüksek @ 2018-04-23 21:52 UTC (permalink / raw
To: gentoo-commits
commit: 15edf362028940ec8457c508320f17dbc1ef6a8b
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 21:51:26 2018 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 21:52:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15edf362
app-forensics/sleuthkit: clean up old & vulnerable #629352
Bug: https://bugs.gentoo.org/629352
Package-Manager: Portage-2.3.27, Repoman-2.3.9
app-forensics/sleuthkit/Manifest | 4 --
.../files/sleuthkit-3.2.3-tools-shared-libs.patch | 55 ----------------------
.../files/sleuthkit-4.0.0-system-sqlite.patch | 34 -------------
.../files/sleuthkit-4.1.0-system-sqlite.patch | 34 -------------
app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild | 39 ---------------
app-forensics/sleuthkit/sleuthkit-4.1.0.ebuild | 38 ---------------
app-forensics/sleuthkit/sleuthkit-4.1.2.ebuild | 38 ---------------
app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild | 38 ---------------
8 files changed, 280 deletions(-)
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index c87d47621d4..532874c9e0c 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,8 +1,4 @@
DIST libewf-20130128.tar.gz 1978794 BLAKE2B e5d2bd8f4a8b878e13536b89b032d8cee6982272065b2bf325f8a811dff258264118a79496912377337ceb9ad630138b6bedb89e3c3be89a5f6a6fea85ab586b SHA512 94cdd0c3f0d8f535f3462c5adba266302f9b129abacda077ed429fa38af6862fca5a90ba2e606b78607b509769305cc6134c483c7033c20e226596cca2d42b90
-DIST sleuthkit-4.0.2.tar.gz 7577570 BLAKE2B 7199adce8b85d75a031e7f133ba175ff3ef1f87cae9ba9a3ce02a321b11f0a5bcb9023730df1b35956dc61c15025f9a4a141255f62698800938c90376feed8c9 SHA512 acf1d6006db3e75675eb769034ea78fd78133ac0f83c9caa74ec720c0dd25f95fb1a5df2c652027eeeac53e1fca6a3096b5248db95e3a01ce95e72e779e44f37
-DIST sleuthkit-4.1.0.tar.gz 7974564 BLAKE2B c736b26713abf7df45b873099fe7886825be3c0fc5cb288e9a207fb9b404df890420ac1664ab45cc3866cb6a69ad31fe9c8e4cb6caa662e5dfc8ee36acdb4670 SHA512 1cfa96bd3746c59c92c3e3f07f5f3f0f6896239bcaec012c43958654bb63794ecf9d7bd28bb9b4ab939558f4b27f03cd87f645ea91a8f9cfbb9037df93ef5223
-DIST sleuthkit-4.1.2.tar.gz 7990136 BLAKE2B 02aa1545261f6b8a9c03c3f78563aea9e2cf521622fba2b91140de1162c10b5d1f3f7110bef598d45be5612d44e2bf6d4096fd731c486498e2524566a75a8300 SHA512 1f64acf42e86adf275bcd86c63c097210a498ac34ce69e64b3c120d86dffae65b5d57ed9618692dd510f637e940a48a60912dd57c8de840bf3a2b4428baabab8
-DIST sleuthkit-4.1.3.tar.gz 7952733 BLAKE2B ffdf19904275a6a9f96a822e33097db60ae0c8e9a034813c6a6f917845811ee9e2b7c52db85aacdd3d4d9bf7c2ae8974840849f6922248af5104298952d6ad3a SHA512 66f6ac32da5a21b3505390557ed6cf7bbcfcca69f231e20a7086fd48c5de45a3f064a716837d25eb582d0a89bae3b6ba7e89dcf3159e1cacdb4b5d452d0ce9a2
DIST sleuthkit-4.5.0.tar.gz 8611141 BLAKE2B a1ae66bfcb74ce1fec24f80dfe60cd68f1de53119331c38848f7f82de8052eda49d78fdea49e42ada5843094939ef212dece42a5ceb85931a79e02adccda30e6 SHA512 911890cacca739f121681514197104cb2dc3bd219f3e068c4ce61264498c56989359976fc75172e1f456c94e4e25c6206413b0234c36e55736a577b8e664e4b3
DIST sleuthkit-4.6.0.tar.gz 8634432 BLAKE2B b45721cdee798d84f0caa0bfe38645346539bb497f5a492c72016a6b3b0246b362ecea676a7a0e788d66cc0dc32335e719912434bd61aa205b7d51b8d4bd7c14 SHA512 dbf880e8503dccb0a686f1d9658d56e9cb40f452127f9b713cf2a4941f4083fa1cf80a886994d58421307a679242cd4ee005b3e874cf429cfb140a597a0dc739
DIST sqlite-jdbc-3.8.11.jar 5131732 BLAKE2B 1a04fa9e9cb97fdddc19af2de9efa7b54c0b527642e6e325e31054e4e294e3bc6af00ea291087ed9dd26668d48dae356035fc85212c0eb81656550d552103ed0 SHA512 5f4705101992e8916e29742c560aef0d01eba9dc0d2d984b75a77e56be3c9fd20b284390fe8f9bb54bf9d1f8528c3413922684c446212ca8961ac731543fb179
diff --git a/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch
deleted file mode 100644
index 749c6703004..00000000000
--- a/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- sleuthkit-3.2.3/tools/autotools/Makefile.am
-+++ sleuthkit-3.2.3/tools/autotools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro
-
- bin_PROGRAMS = tsk_recover tsk_loaddb tsk_comparedir tsk_gettimes
---- sleuthkit-3.2.3/tools/fstools/Makefile.am
-+++ sleuthkit-3.2.3/tools/fstools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro fscheck.cpp
-
- bin_PROGRAMS = blkcalc blkcat blkls blkstat ffind fls fsstat icat ifind ils \
---- sleuthkit-3.2.3/tools/hashtools/Makefile.am
-+++ sleuthkit-3.2.3/tools/hashtools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro md5.c sha1.c
-
- bin_PROGRAMS = hfind
---- sleuthkit-3.2.3/tools/imgtools/Makefile.am
-+++ sleuthkit-3.2.3/tools/imgtools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro
-
- bin_PROGRAMS = img_cat img_stat
---- sleuthkit-3.2.3/tools/srchtools/Makefile.am
-+++ sleuthkit-3.2.3/tools/srchtools/Makefile.am
-@@ -6,7 +6,6 @@
-
- sigfind_SOURCES = sigfind.cpp
- sigfind_LDADD = ../../tsk3/libtsk3.la
--sigfind_LDFLAGS = -static
-
- indent:
- indent *.c *.cpp
---- sleuthkit-3.2.3/tools/vstools/Makefile.am
-+++ sleuthkit-3.2.3/tools/vstools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro
-
- bin_PROGRAMS = mmls mmstat mmcat
diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.0.0-system-sqlite.patch b/app-forensics/sleuthkit/files/sleuthkit-4.0.0-system-sqlite.patch
deleted file mode 100644
index 7b98f4dafd2..00000000000
--- a/app-forensics/sleuthkit/files/sleuthkit-4.0.0-system-sqlite.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- sleuthkit-4.0.0/tsk3/auto/db_sqlite.cpp
-+++ sleuthkit-4.0.0/tsk3/auto/db_sqlite.cpp
-@@ -14,7 +14,7 @@
- */
-
- #include "tsk_db_sqlite.h"
--#include "sqlite3.h"
-+#include <sqlite3.h>
-
- #include <string.h>
-
---- sleuthkit-4.0.0/tsk3/auto/Makefile.am
-+++ sleuthkit-4.0.0/tsk3/auto/Makefile.am
-@@ -3,7 +3,8 @@
-
- noinst_LTLIBRARIES = libtskauto.la
- # Note that the .h files are in the top-level Makefile
--libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
-+libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
-+libtskauto_la_LIBADD = -lsqlite3
-
- indent:
- indent *.cpp *.h
---- sleuthkit-4.0.0/tsk3/auto/tsk_db_sqlite.h
-+++ sleuthkit-4.0.0/tsk3/auto/tsk_db_sqlite.h
-@@ -25,7 +25,7 @@
- #include <ostream>
-
-
--#include "sqlite3.h"
-+#include <sqlite3.h>
- #include "tsk_auto_i.h"
-
- using std::map;
diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.1.0-system-sqlite.patch b/app-forensics/sleuthkit/files/sleuthkit-4.1.0-system-sqlite.patch
deleted file mode 100644
index 413357fb504..00000000000
--- a/app-forensics/sleuthkit/files/sleuthkit-4.1.0-system-sqlite.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- sleuthkit-4.1.0/tsk/auto/db_sqlite.cpp
-+++ sleuthkit-4.1.0/tsk/auto/db_sqlite.cpp
-@@ -14,7 +14,7 @@
- */
-
- #include "tsk_db_sqlite.h"
--#include "sqlite3.h"
-+#include <sqlite3.h>
-
- #include <string.h>
-
---- sleuthkit-4.1.0/tsk/auto/Makefile.am
-+++ sleuthkit-4.1.0/tsk/auto/Makefile.am
-@@ -3,7 +3,8 @@
-
- noinst_LTLIBRARIES = libtskauto.la
- # Note that the .h files are in the top-level Makefile
--libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
-+libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
-+libtskauto_la_LIBADD = -lsqlite3
-
- indent:
- indent *.cpp *.h
---- sleuthkit-4.1.0/tsk/auto/tsk_db_sqlite.h
-+++ sleuthkit-4.1.0/tsk/auto/tsk_db_sqlite.h
-@@ -25,7 +25,7 @@
- #include <ostream>
-
-
--#include "sqlite3.h"
-+#include <sqlite3.h>
- #include "tsk_auto_i.h"
-
- using std::map;
diff --git a/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild b/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild
deleted file mode 100644
index 8101b681c64..00000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 IBM"
-SLOT="0/9" # subslot = major soname version
-KEYWORDS="amd64 hppa ppc x86"
-IUSE="aff ewf static-libs"
-
-DEPEND="dev-db/sqlite:3
- ewf? ( app-forensics/libewf )
- aff? ( app-forensics/afflib )"
-RDEPEND="${DEPEND}
- dev-perl/Date-Manip"
-
-DOCS=( NEWS.txt README.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.0-system-sqlite.patch
- "${FILESDIR}"/${PN}-3.2.3-tools-shared-libs.patch
-)
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
- local myeconfargs=(
- $(use_with aff afflib)
- $(use_with ewf libewf)
- )
- autotools-utils_src_configure
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.1.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.1.0.ebuild
deleted file mode 100644
index eff539597ac..00000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 IBM"
-SLOT="0/10" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="aff ewf static-libs"
-
-DEPEND="dev-db/sqlite:3
- ewf? ( app-forensics/libewf )
- aff? ( app-forensics/afflib )"
-RDEPEND="${DEPEND}
- dev-perl/Date-Manip"
-
-DOCS=( NEWS.txt README.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-system-sqlite.patch
- "${FILESDIR}"/${P}-tools-shared-libs.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_with aff afflib)
- $(use_with ewf libewf)
- )
- autotools-utils_src_configure
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.1.2.ebuild b/app-forensics/sleuthkit/sleuthkit-4.1.2.ebuild
deleted file mode 100644
index 0f0908413b1..00000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 IBM"
-SLOT="0/10" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="aff ewf static-libs"
-
-DEPEND="dev-db/sqlite:3
- ewf? ( app-forensics/libewf )
- aff? ( app-forensics/afflib )"
-RDEPEND="${DEPEND}
- dev-perl/Date-Manip"
-
-DOCS=( NEWS.txt README.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.1.0-system-sqlite.patch
- "${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_with aff afflib)
- $(use_with ewf libewf)
- )
- autotools-utils_src_configure
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild b/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild
deleted file mode 100644
index 0f0908413b1..00000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 IBM"
-SLOT="0/10" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="aff ewf static-libs"
-
-DEPEND="dev-db/sqlite:3
- ewf? ( app-forensics/libewf )
- aff? ( app-forensics/afflib )"
-RDEPEND="${DEPEND}
- dev-perl/Date-Manip"
-
-DOCS=( NEWS.txt README.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.1.0-system-sqlite.patch
- "${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_with aff afflib)
- $(use_with ewf libewf)
- )
- autotools-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/sleuthkit/files/, app-forensics/sleuthkit/
@ 2018-11-29 18:08 Göktürk Yüksek
0 siblings, 0 replies; 5+ messages in thread
From: Göktürk Yüksek @ 2018-11-29 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 117cb1fe33767577c267e12a721e7d47781edd85
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 18:07:42 2018 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 18:07:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117cb1fe
app-forensics/sleuthkit: backport fix for CVE-2018-19497 to 4.6.4
Bug: https://bugs.gentoo.org/661160
Bug: https://github.com/sleuthkit/sleuthkit/pull/1374
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../sleuthkit-4.6.4-CVE-2018-19497-backport.patch | 83 ++++++++++++++++++++++
...hkit-4.6.4.ebuild => sleuthkit-4.6.4-r1.ebuild} | 1 +
2 files changed, 84 insertions(+)
diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.6.4-CVE-2018-19497-backport.patch b/app-forensics/sleuthkit/files/sleuthkit-4.6.4-CVE-2018-19497-backport.patch
new file mode 100644
index 00000000000..3ed90477481
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-4.6.4-CVE-2018-19497-backport.patch
@@ -0,0 +1,83 @@
+From dd679ad1d855e7f69a887eb343bb53d49dc664e7 Mon Sep 17 00:00:00 2001
+From: Jordy Zomer <zome8499@student.alfa-college.nl>
+Date: Sat, 24 Nov 2018 12:19:38 +0100
+Subject: [PATCH 1/3] Fix CVE-2018-19497.
+
+An issue was discovered in The Sleuth Kit (TSK) through 4.6.4.
+The "tsk_getu16(hfs->fs_info.endian, &rec_buf[rec_off2])" call in hfs_dir_open_meta_cb in
+tsk/fs/hfs_dent.c does not properly check boundaries. This results in
+a crash (SEGV on unknown address
+READ memory access)
+when reading too much in the destination buffer.
+---
+ tsk/fs/hfs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tsk/fs/hfs.c b/tsk/fs/hfs.c
+index 00f1720b1b..0dec507165 100644
+--- a/tsk/fs/hfs.c
++++ b/tsk/fs/hfs.c
+@@ -956,7 +956,8 @@ hfs_cat_traverse(HFS_INFO * hfs,
+ key = (hfs_btree_key_cat *) & node[rec_off];
+
+ keylen = 2 + tsk_getu16(hfs->fs_info.endian, key->key_len);
+- if ((keylen) > nodesize) {
++
++ if (keylen > nodesize - rec_off) {
+ tsk_error_set_errno(TSK_ERR_FS_GENFS);
+ tsk_error_set_errstr
+ ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %"
+
+From fb2bc0ad693db852fac1dcc77a072aeabe106ac8 Mon Sep 17 00:00:00 2001
+From: Jordy Zomer <zome8499@student.alfa-college.nl>
+Date: Sat, 24 Nov 2018 12:37:09 +0100
+Subject: [PATCH 2/3] fix length in printf of nodesize
+
+Also fix the length in printf next to comit dd679ad1d855e7f69a887eb343bb53d49dc664e7
+---
+ tsk/fs/hfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tsk/fs/hfs.c b/tsk/fs/hfs.c
+index 0dec507165..4f7c0679a8 100644
+--- a/tsk/fs/hfs.c
++++ b/tsk/fs/hfs.c
+@@ -961,7 +961,7 @@ hfs_cat_traverse(HFS_INFO * hfs,
+ tsk_error_set_errno(TSK_ERR_FS_GENFS);
+ tsk_error_set_errstr
+ ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %"
+- PRIu16 ")", rec, cur_node, keylen, nodesize);
++ PRIu16 ")", rec, cur_node, keylen, nodesize - rec_off);
+ free(node);
+ return 1;
+ }
+
+From 8242588f4354339d9cb1ad82622e7c16c55391c9 Mon Sep 17 00:00:00 2001
+From: Jordy Zomer <zome8499@student.alfa-college.nl>
+Date: Sat, 24 Nov 2018 12:47:23 +0100
+Subject: [PATCH 3/3] UPDATE on CVE-2018-19497.
+
+make it >= because if keylen == nodesize - rec_off it's already past it's destination.
+Also fix the sprintf
+---
+ tsk/fs/hfs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tsk/fs/hfs.c b/tsk/fs/hfs.c
+index 4f7c0679a8..bb3819ada9 100644
+--- a/tsk/fs/hfs.c
++++ b/tsk/fs/hfs.c
+@@ -957,11 +957,11 @@ hfs_cat_traverse(HFS_INFO * hfs,
+
+ keylen = 2 + tsk_getu16(hfs->fs_info.endian, key->key_len);
+
+- if (keylen > nodesize - rec_off) {
++ if (keylen >= nodesize - rec_off) {
+ tsk_error_set_errno(TSK_ERR_FS_GENFS);
+ tsk_error_set_errstr
+ ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %"
+- PRIu16 ")", rec, cur_node, keylen, nodesize - rec_off);
++ PRIu16 ")", rec, cur_node, keylen, (nodesize - rec_off));
+ free(node);
+ return 1;
+ }
diff --git a/app-forensics/sleuthkit/sleuthkit-4.6.4.ebuild b/app-forensics/sleuthkit/sleuthkit-4.6.4-r1.ebuild
similarity index 99%
rename from app-forensics/sleuthkit/sleuthkit-4.6.4.ebuild
rename to app-forensics/sleuthkit/sleuthkit-4.6.4-r1.ebuild
index 93c16837715..654808fc51d 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.6.4.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.6.4-r1.ebuild
@@ -60,6 +60,7 @@ DEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
+ "${FILESDIR}"/${PN}-4.6.4-CVE-2018-19497-backport.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/sleuthkit/files/, app-forensics/sleuthkit/
@ 2019-01-24 20:18 Göktürk Yüksek
0 siblings, 0 replies; 5+ messages in thread
From: Göktürk Yüksek @ 2019-01-24 20:18 UTC (permalink / raw
To: gentoo-commits
commit: 358b5b2e29330305ba4c8bee1f072668877f2ab3
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 19:46:51 2019 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 20:17:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358b5b2e
app-forensics/sleuthkit: remove old 4.6.0 and 4.6.4
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
app-forensics/sleuthkit/Manifest | 2 -
.../sleuthkit-4.6.4-CVE-2018-19497-backport.patch | 83 -------
app-forensics/sleuthkit/sleuthkit-4.6.0.ebuild | 227 ------------------
app-forensics/sleuthkit/sleuthkit-4.6.4-r1.ebuild | 256 ---------------------
4 files changed, 568 deletions(-)
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 281da89a45b..d6e3eea75bc 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,7 +1,5 @@
DIST SparseBitSet-1.1.jar 23706 BLAKE2B 8623a723f11f97386a108c775fefddd324997b68bea7f7ade0581ec5800bfa8d32f699ab903ad66c631b7b5c69ba1ef377243653f5044f39234dac07543eb129 SHA512 cf75431c5f705961800ce5cbca2acb9b2459eaf98ec37b5ee21c5a90d204ffb466fa25457b0560fbb024489777efbea0276201024c7b1b2853124930ac490983
DIST libewf-20130128.tar.gz 1978794 BLAKE2B e5d2bd8f4a8b878e13536b89b032d8cee6982272065b2bf325f8a811dff258264118a79496912377337ceb9ad630138b6bedb89e3c3be89a5f6a6fea85ab586b SHA512 94cdd0c3f0d8f535f3462c5adba266302f9b129abacda077ed429fa38af6862fca5a90ba2e606b78607b509769305cc6134c483c7033c20e226596cca2d42b90
DIST sleuthkit-4.5.0.tar.gz 8611141 BLAKE2B a1ae66bfcb74ce1fec24f80dfe60cd68f1de53119331c38848f7f82de8052eda49d78fdea49e42ada5843094939ef212dece42a5ceb85931a79e02adccda30e6 SHA512 911890cacca739f121681514197104cb2dc3bd219f3e068c4ce61264498c56989359976fc75172e1f456c94e4e25c6206413b0234c36e55736a577b8e664e4b3
-DIST sleuthkit-4.6.0.tar.gz 8634432 BLAKE2B b45721cdee798d84f0caa0bfe38645346539bb497f5a492c72016a6b3b0246b362ecea676a7a0e788d66cc0dc32335e719912434bd61aa205b7d51b8d4bd7c14 SHA512 dbf880e8503dccb0a686f1d9658d56e9cb40f452127f9b713cf2a4941f4083fa1cf80a886994d58421307a679242cd4ee005b3e874cf429cfb140a597a0dc739
-DIST sleuthkit-4.6.4.tar.gz 8655341 BLAKE2B 9d8a2884d1c90e9be3104221c22fdc4346c8f288a13384ef8205cea46bbda2249691b548b7d19a1b34d6d0d1fc6d5390aa0fc8c8b28ea75b53de946b62c8e25c SHA512 0dd3fc3659fd6dee49ababd8033bcc5ce218c9154b61eb072a943e8d1a96fb04dcabc85124583bc69ad0ced2609fed11812164a3db6587446255a9c507f08762
DIST sleuthkit-4.6.5.tar.gz 8658866 BLAKE2B 29b75c96a14c5d42522e7116a80cc368c8097fa43af27c0e958215142d6ee61131c7b154fb876fa3ea9c727e8100de9bd703dfd8cef9ccce1f6602222c8470fa SHA512 ba21be166da1a7bdd197946722a1e0947f90bbb2c27d635cdfbcbc870aa42937fe6b42f432482f70a5e686942c8891d0367b5ce28615315d8905661e73aefe32
DIST sqlite-jdbc-3.8.11.jar 5131732 BLAKE2B 1a04fa9e9cb97fdddc19af2de9efa7b54c0b527642e6e325e31054e4e294e3bc6af00ea291087ed9dd26668d48dae356035fc85212c0eb81656550d552103ed0 SHA512 5f4705101992e8916e29742c560aef0d01eba9dc0d2d984b75a77e56be3c9fd20b284390fe8f9bb54bf9d1f8528c3413922684c446212ca8961ac731543fb179
diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.6.4-CVE-2018-19497-backport.patch b/app-forensics/sleuthkit/files/sleuthkit-4.6.4-CVE-2018-19497-backport.patch
deleted file mode 100644
index 3ed90477481..00000000000
--- a/app-forensics/sleuthkit/files/sleuthkit-4.6.4-CVE-2018-19497-backport.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From dd679ad1d855e7f69a887eb343bb53d49dc664e7 Mon Sep 17 00:00:00 2001
-From: Jordy Zomer <zome8499@student.alfa-college.nl>
-Date: Sat, 24 Nov 2018 12:19:38 +0100
-Subject: [PATCH 1/3] Fix CVE-2018-19497.
-
-An issue was discovered in The Sleuth Kit (TSK) through 4.6.4.
-The "tsk_getu16(hfs->fs_info.endian, &rec_buf[rec_off2])" call in hfs_dir_open_meta_cb in
-tsk/fs/hfs_dent.c does not properly check boundaries. This results in
-a crash (SEGV on unknown address
-READ memory access)
-when reading too much in the destination buffer.
----
- tsk/fs/hfs.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tsk/fs/hfs.c b/tsk/fs/hfs.c
-index 00f1720b1b..0dec507165 100644
---- a/tsk/fs/hfs.c
-+++ b/tsk/fs/hfs.c
-@@ -956,7 +956,8 @@ hfs_cat_traverse(HFS_INFO * hfs,
- key = (hfs_btree_key_cat *) & node[rec_off];
-
- keylen = 2 + tsk_getu16(hfs->fs_info.endian, key->key_len);
-- if ((keylen) > nodesize) {
-+
-+ if (keylen > nodesize - rec_off) {
- tsk_error_set_errno(TSK_ERR_FS_GENFS);
- tsk_error_set_errstr
- ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %"
-
-From fb2bc0ad693db852fac1dcc77a072aeabe106ac8 Mon Sep 17 00:00:00 2001
-From: Jordy Zomer <zome8499@student.alfa-college.nl>
-Date: Sat, 24 Nov 2018 12:37:09 +0100
-Subject: [PATCH 2/3] fix length in printf of nodesize
-
-Also fix the length in printf next to comit dd679ad1d855e7f69a887eb343bb53d49dc664e7
----
- tsk/fs/hfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tsk/fs/hfs.c b/tsk/fs/hfs.c
-index 0dec507165..4f7c0679a8 100644
---- a/tsk/fs/hfs.c
-+++ b/tsk/fs/hfs.c
-@@ -961,7 +961,7 @@ hfs_cat_traverse(HFS_INFO * hfs,
- tsk_error_set_errno(TSK_ERR_FS_GENFS);
- tsk_error_set_errstr
- ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %"
-- PRIu16 ")", rec, cur_node, keylen, nodesize);
-+ PRIu16 ")", rec, cur_node, keylen, nodesize - rec_off);
- free(node);
- return 1;
- }
-
-From 8242588f4354339d9cb1ad82622e7c16c55391c9 Mon Sep 17 00:00:00 2001
-From: Jordy Zomer <zome8499@student.alfa-college.nl>
-Date: Sat, 24 Nov 2018 12:47:23 +0100
-Subject: [PATCH 3/3] UPDATE on CVE-2018-19497.
-
-make it >= because if keylen == nodesize - rec_off it's already past it's destination.
-Also fix the sprintf
----
- tsk/fs/hfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tsk/fs/hfs.c b/tsk/fs/hfs.c
-index 4f7c0679a8..bb3819ada9 100644
---- a/tsk/fs/hfs.c
-+++ b/tsk/fs/hfs.c
-@@ -957,11 +957,11 @@ hfs_cat_traverse(HFS_INFO * hfs,
-
- keylen = 2 + tsk_getu16(hfs->fs_info.endian, key->key_len);
-
-- if (keylen > nodesize - rec_off) {
-+ if (keylen >= nodesize - rec_off) {
- tsk_error_set_errno(TSK_ERR_FS_GENFS);
- tsk_error_set_errstr
- ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %"
-- PRIu16 ")", rec, cur_node, keylen, nodesize - rec_off);
-+ PRIu16 ")", rec, cur_node, keylen, (nodesize - rec_off));
- free(node);
- return 1;
- }
diff --git a/app-forensics/sleuthkit/sleuthkit-4.6.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.6.0.ebuild
deleted file mode 100644
index 94b34243548..00000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.6.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
-inherit autotools java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
-# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
-# TODO: Upstream uses a very specific version of libewf which is not in
-# the tree anymore. So we statically compile and link to sleuthkit.
-# Hopefully upstream will figure something out in the future.
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
- java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.8.11/sqlite-jdbc-3.8.11.jar )
- ewf? ( https://dev.gentoo.org/~gokturk/distfiles/app-forensics/libewf/libewf-20130128.tar.gz )"
-
-LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
-SLOT="0/13" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="aff doc ewf java static-libs test +threads zlib"
-
-DEPEND="
- dev-db/sqlite:3
- dev-lang/perl:*
- aff? ( app-forensics/afflib )
- ewf? ( sys-libs/zlib )
- java? (
- >=virtual/jdk-1.8:*
- >=dev-java/c3p0-0.9.5:0
- >=dev-java/jdbc-postgresql-9.4:0
- )
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
- java? ( >=virtual/jre-1.8:= )
-"
-DEPEND="${DEPEND}
- doc? ( app-doc/doxygen )
- test? ( >=dev-util/cppunit-1.2.1 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
-)
-
-src_unpack() {
- local f
-
- unpack ${P}.tar.gz
-
- # Ick, the upstream is stuck at libewf-20130128 which is
- # not even in the tree anymore. So we have to bundle it.
- if use ewf; then
- pushd "${T}" &>/dev/null || die
- unpack libewf-20130128.tar.gz
- export TSK_LIBEWF_SRCDIR="${T}"/libewf-20130128
- popd &>/dev/null || die
- fi
-
- # Copy the jar files that don't exist in the tree yet
- if use java; then
- TSK_JAR_DIR="${S}/bindings/java/lib"
- mkdir "${TSK_JAR_DIR}" || die
- for f in ${A}; do
- if [[ ${f} =~ .jar$ ]]; then
- cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
- fi
- done
- export TSK_JAR_DIR
- fi
-}
-
-src_prepare() {
- if use ewf; then
- # Yeah, libewf-20130128 obviously doesn't just nicely compile
- sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
- -i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
- fi
-
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
-
- # Prevent "make install" from installing
- # jar files under /usr/share/java
- # We'll use the java eclasses for this
- sed -e '/^jar_DATA/ d;' -i Makefile.am || die
-
- # Disable dependency retrieval using ivy
- # We will handle it ourselves
- sed -e '/name="compile"/ s/, retrieve-deps//' \
- -e '/name="dist-/ s/, init-ivy//g' \
- -i build.xml || die
-
- java-pkg-opt-2_src_prepare
-
- popd &>/dev/null || die
- fi
-
- # Override the doxygen output directories
- if use doc; then
- sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
- -i tsk/docs/Doxyfile \
- -i bindings/java/doxygen/Doxyfile || die
- fi
-
- # It's safe to call this even after java-pkg-opt-2_src_prepare
- # because future calls to eapply_user do nothing and return 0
- default
-
- eautoreconf
-}
-
-tsk_compile_libewf() {
- local myeconfargs=(
- --prefix=/
- --libdir=/lib
- --enable-static
- --disable-shared
- --disable-winapi
- --without-libbfio
- --with-zlib
- --without-bzip2
- --without-libhmac
- --without-openssl
- --without-libuuid
- --without-libfuse
- )
- # We want to contain our build flags
- local CFLAGS="${CFLAGS}"
- local LDFLAGS="${LDFLAGS}"
-
- pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
-
- # Produce relocatable code
- CFLAGS+=" -fPIC"
- LDFLAGS+=" -fPIC"
- econf "${myeconfargs[@]}"
-
- # Do not waste CPU cycles on building ewftools
- sed -e '/ewftools/ d' -i Makefile || die
- emake
-
- # Only install the headers and the library
- emake -C libewf DESTDIR="${T}"/image install
- emake -C include DESTDIR="${T}"/image install
-
- popd &>/dev/null || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable java)
- $(use_enable static-libs static)
- $(use_enable threads multithreading)
- $(use_with aff afflib)
- $(use_with ewf libewf)
- $(use_with zlib)
- )
-
- use ewf && tsk_compile_libewf
- myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
-
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
- java-ant-2_src_configure
- popd &>/dev/null || die
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Create symlinks of jars for the required dependencies
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
-
- java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
- java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
-
- popd &>/dev/null || die
- fi
-
- # Create the doc output dirs if requested
- if use doc; then
- mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
- fi
-
- emake all $(usex doc api-docs "")
-}
-
-src_install() {
- local f
-
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
-
- java-pkg_dojar dist/${P}.jar
-
- # Install the bundled jar files
- pushd "${TSK_JAR_DIR}" &>/dev/null || die
- for f in *; do
- # Skip the symlinks java-pkg_jar-from created
- [[ -f ${f} ]] || continue
-
- # Strip the version numbers as per eclass recommendation
- [[ ${f} =~ -([0-9].)+.jar$ ]] || continue
-
- java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
- done
- popd &>/dev/null || die
-
- popd &>/dev/null || die
- fi
-
- default
-
- # It unconditionally builds both api and jni docs
- # We install conditionally based on the provided use flags
- if use doc; then
- dodoc -r "${T}"/doc/api-docs
- use java && dodoc -r "${T}"/doc/jni-docs
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.6.4-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.6.4-r1.ebuild
deleted file mode 100644
index 45b8e2dd049..00000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.6.4-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
-inherit autotools java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
-# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
-# TODO: Upstream uses a very specific version of libewf which is not in
-# the tree anymore. So we statically compile and link to sleuthkit.
-# Hopefully upstream will figure something out in the future.
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
- java? (
- http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.8.11/sqlite-jdbc-3.8.11.jar
- http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar
- )
- ewf? ( https://dev.gentoo.org/~gokturk/distfiles/app-forensics/libewf/libewf-20130128.tar.gz )"
-
-LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
-SLOT="0/13" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="aff doc ewf java postgres static-libs test +threads zlib"
-
-# Note: It is not possible to move the dep on dev-java/jdbc-postgresql
-# inside a conditional postgres? block because java sources import
-# org.postgres unconditionally as of writing this (version 4.6.4). The
-# postgres USE flag will be used for the TSK postgresql support however.
-DEPEND="
- dev-db/sqlite:3
- dev-lang/perl:*
- aff? ( app-forensics/afflib )
- ewf? ( sys-libs/zlib )
- java? (
- >=virtual/jdk-1.8:*
- >=dev-java/c3p0-0.9.5:0
- >=dev-java/jdbc-postgresql-9.4:0
- )
- postgres? ( dev-db/postgresql:= )
- zlib? ( sys-libs/zlib )
-"
-# TODO: add support for not-in-tree libraries libvhdi and libvmdk
-# libvhdi: https://github.com/libyal/libvhdi
-# libvmdk: https://github.com/libyal/libvmdk
-# DEPEND="${DEPEND}
-# vhdi? ( dev-libs/libvhdi )
-# vmdk? ( dev-libs/libvmdk )
-# "
-
-RDEPEND="${DEPEND}
- java? ( >=virtual/jre-1.8:= )
-"
-DEPEND="${DEPEND}
- doc? ( app-doc/doxygen )
- test? ( >=dev-util/cppunit-1.2.1 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
- "${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
- "${FILESDIR}"/${PN}-4.6.4-CVE-2018-19497-backport.patch
-)
-
-src_unpack() {
- local f
-
- unpack ${P}.tar.gz
-
- # Ick, the upstream is stuck at libewf-20130128 which is
- # not even in the tree anymore. So we have to bundle it.
- if use ewf; then
- pushd "${T}" &>/dev/null || die
- unpack libewf-20130128.tar.gz
- export TSK_LIBEWF_SRCDIR="${T}"/libewf-20130128
- popd &>/dev/null || die
- fi
-
- # Copy the jar files that don't exist in the tree yet
- if use java; then
- TSK_JAR_DIR="${T}/lib"
- mkdir "${TSK_JAR_DIR}" || die
- for f in ${A}; do
- if [[ ${f} =~ .jar$ ]]; then
- cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
- fi
- done
- export TSK_JAR_DIR
- fi
-}
-
-tsk_prepare_libewf() {
- # Yeah, libewf-20130128 obviously doesn't just nicely compile
- sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
- -i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
-}
-
-src_prepare() {
- use ewf && tsk_prepare_libewf
-
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
-
- # Prevent "make install" from installing
- # jar files under /usr/share/java
- # We'll use the java eclasses for this
- sed -e '/^jar_DATA/ d;' -i Makefile.am || die
-
- java-pkg-opt-2_src_prepare
-
- popd &>/dev/null || die
- fi
-
- # Override the doxygen output directories
- if use doc; then
- sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
- -i tsk/docs/Doxyfile \
- -i bindings/java/doxygen/Doxyfile || die
- fi
-
- # It's safe to call this even after java-pkg-opt-2_src_prepare
- # because future calls to eapply_user do nothing and return 0
- default
-
- eautoreconf
-}
-
-tsk_compile_libewf() {
- local myeconfargs=(
- --prefix=/
- --libdir=/lib
- --enable-static
- --disable-shared
- --disable-winapi
- --without-libbfio
- --with-zlib
- --without-bzip2
- --without-libhmac
- --without-openssl
- --without-libuuid
- --without-libfuse
- )
- # We want to contain our build flags
- local CFLAGS="${CFLAGS}"
- local LDFLAGS="${LDFLAGS}"
-
- pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
-
- # Produce relocatable code
- CFLAGS+=" -fPIC"
- LDFLAGS+=" -fPIC"
- econf "${myeconfargs[@]}"
-
- # Do not waste CPU cycles on building ewftools
- sed -e '/ewftools/ d' -i Makefile || die
- emake
-
- # Only install the headers and the library
- emake -C libewf DESTDIR="${T}"/image install
- emake -C include DESTDIR="${T}"/image install
- find "${T}"/image -name '*.la' -delete || die
-
- popd &>/dev/null || die
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-offline="${TSK_JAR_DIR}"
- $(use_enable java)
- $(use_enable static-libs static)
- $(use_enable threads multithreading)
- $(use_with aff afflib)
- $(use_with zlib)
- )
- # Workaround the automagic detection of postgresql
- local -x ac_cv_lib_pq_PQlibVersion="$(usex postgres)"
- # TODO: add support for non-existing libraries libvhdi and libvmdk
- # myeconfargs+=(
- # $(use_with vhdi libvhdi)
- # $(use_with vmdk libvmdk)
- # )
- myeconfargs+=(
- --without-libvhdi
- --without-libvmdk
- )
-
- use ewf && tsk_compile_libewf
- myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
-
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
- java-ant-2_src_configure
- popd &>/dev/null || die
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Give it an existing bogus ivy home #672220
- local -x IVY_HOME="${T}"
-
- # Create symlinks of jars for the required dependencies
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
-
- java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
- java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
-
- popd &>/dev/null || die
- fi
-
- # Create the doc output dirs if requested
- if use doc; then
- mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
- fi
-
- emake all $(usex doc api-docs "")
-}
-
-src_install() {
- local f
-
- if use java; then
- pushd "${S}"/bindings/java &>/dev/null || die
-
- java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
- # Install the bundled jar files
- pushd "${TSK_JAR_DIR}" &>/dev/null || die
- for f in *; do
- # Skip the symlinks java-pkg_jar-from created
- [[ -f ${f} ]] || continue
-
- # Strip the version numbers as per eclass recommendation
- [[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
-
- java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
- done
- popd &>/dev/null || die
-
- popd &>/dev/null || die
- fi
-
- default
-
- # It unconditionally builds both api and jni docs
- # We install conditionally based on the provided use flags
- if use doc; then
- dodoc -r "${T}"/doc/api-docs
- use java && dodoc -r "${T}"/doc/jni-docs
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/sleuthkit/files/, app-forensics/sleuthkit/
@ 2023-06-27 5:25 Göktürk Yüksek
0 siblings, 0 replies; 5+ messages in thread
From: Göktürk Yüksek @ 2023-06-27 5:25 UTC (permalink / raw
To: gentoo-commits
commit: 02148b29dc4cce3de2ed4781e07c561963668f2d
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 05:22:06 2023 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 05:24:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02148b29
app-forensics/sleuthkit: fix configure.ac to use '==' instead of '='
Address a build time issue where using '==' may fail with:
test: xyes: unexpected operator
silently disabling the build of Java support, ultimately
leading to failure in src_install.
Bug: https://bugs.gentoo.org/870250
Url: https://github.com/sleuthkit/sleuthkit/pull/2835
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
.../sleuthkit-4.12.0-configure-ac-test-fix.patch | 34 ++++++++++++++++++++++
app-forensics/sleuthkit/sleuthkit-4.12.0.ebuild | 1 +
2 files changed, 35 insertions(+)
diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.12.0-configure-ac-test-fix.patch b/app-forensics/sleuthkit/files/sleuthkit-4.12.0-configure-ac-test-fix.patch
new file mode 100644
index 000000000000..2bb52435fd9a
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-4.12.0-configure-ac-test-fix.patch
@@ -0,0 +1,34 @@
+https://github.com/sleuthkit/sleuthkit/pull/2835
+
+From fd19051920849343631df1cbf8d4b86f1bf98b2c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Mon, 26 Jun 2023 22:05:47 -0700
+Subject: [PATCH] configure.ac: use '=' for comparison instead of '=='
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The operator '==' isn't POSIX compliant[0]. Use the standard '=', as it's
+done everywhere else in configure.ac.
+
+[0] https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
+
+Bug: https://bugs.gentoo.org/870250
+Signed-off-by: Göktürk Yüksek <gokturk@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4226f5be4..bec6ddbf62 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,7 +252,7 @@ AS_IF([test "x$enable_java" != "xno"], [
+ dnl if we found everything we need, set ax_java_support for the
+ dnl status message and set X_JNI for use in Makefile
+ AS_IF([test "x$JNI_CPPFLAGS" != x && test "x$ANT_FOUND" != x && test "x$JAVA" != x], [ax_java_support=yes], [ax_java_support=no])
+-AM_CONDITIONAL([X_JNI],[test "x$ax_java_support" == "xyes"])
++AM_CONDITIONAL([X_JNI],[test "x$ax_java_support" = "xyes"])
+
+ AC_CONFIG_COMMANDS([tsk/tsk_incs.h],
+ [echo "#ifndef _TSK_INCS_H" > tsk/tsk_incs.h
diff --git a/app-forensics/sleuthkit/sleuthkit-4.12.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.0.ebuild
index bca5e7d4bd6a..774fb6e6da83 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.12.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.12.0.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
"${FILESDIR}"/${PN}-4.10.1-exclude-usr-local.patch
+ "${FILESDIR}"/${PN}-4.12.0-configure-ac-test-fix.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-forensics/sleuthkit/files/, app-forensics/sleuthkit/
@ 2025-02-16 13:17 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-02-16 13:17 UTC (permalink / raw
To: gentoo-commits
commit: 5251f8f8122302cfbd8c0e0c64948890f8bd2b38
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 13:14:50 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 13:17:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5251f8f8
app-forensics/sleuthkit: fix build w/ c23
Closes: https://bugs.gentoo.org/943976
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../sleuthkit/files/sleuthkit-4.12.1-c23.patch | 30 ++++++++++++++++++++++
app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild | 3 ++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.12.1-c23.patch b/app-forensics/sleuthkit/files/sleuthkit-4.12.1-c23.patch
new file mode 100644
index 000000000000..59b8083c6fd6
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-4.12.1-c23.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/943976
+https://github.com/sleuthkit/sleuthkit/commit/dc9b299ea2c4fd4d79305df1e62073aac14fdb2e
+
+From dc9b299ea2c4fd4d79305df1e62073aac14fdb2e Mon Sep 17 00:00:00 2001
+From: Joel Uckelman <joel.uckelman@aon.com>
+Date: Fri, 1 Nov 2024 18:11:25 +0000
+Subject: [PATCH] Don't redefine bool. That causes collisions.
+
+--- a/tsk/base/crc.h
++++ b/tsk/base/crc.h
+@@ -91,7 +91,6 @@ Status : Copyright (C) Ross Williams, 1993. However, permission is
+ #ifndef DONE_STYLE
+
+ typedef unsigned long ulong;
+-typedef unsigned bool;
+ typedef unsigned char * p_ubyte_;
+
+ #ifndef TRUE
+@@ -120,8 +119,8 @@ typedef struct
+ int cm_width; /* Parameter: Width in bits [8,32]. */
+ ulong cm_poly; /* Parameter: The algorithm's polynomial. */
+ ulong cm_init; /* Parameter: Initial register value. */
+- bool cm_refin; /* Parameter: Reflect input bytes? */
+- bool cm_refot; /* Parameter: Reflect output CRC? */
++ unsigned cm_refin; /* Parameter: Reflect input bytes? */
++ unsigned cm_refot; /* Parameter: Reflect output CRC? */
+ ulong cm_xorot; /* Parameter: XOR this to output CRC. */
+
+ ulong cm_reg; /* Context: Context during execution. */
+
diff --git a/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
index 357f7c67d8b1..b79459e877c8 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -78,6 +78,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
"${FILESDIR}"/${PN}-4.10.1-exclude-usr-local.patch
"${FILESDIR}"/${PN}-4.12.0-configure-ac-test-fix.patch
+ "${FILESDIR}"/${PN}-4.12.1-c23.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-02-16 13:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-23 21:52 [gentoo-commits] repo/gentoo:master commit in: app-forensics/sleuthkit/files/, app-forensics/sleuthkit/ Göktürk Yüksek
-- strict thread matches above, loose matches on Subject: below --
2018-11-29 18:08 Göktürk Yüksek
2019-01-24 20:18 Göktürk Yüksek
2023-06-27 5:25 Göktürk Yüksek
2025-02-16 13:17 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox