Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-forensics/sleuthkit
diff options
context:
space:
mode:
Diffstat (limited to 'app-forensics/sleuthkit')
-rw-r--r--app-forensics/sleuthkit/Manifest8
-rw-r--r--app-forensics/sleuthkit/files/sleuthkit-4.12.0-configure-ac-test-fix.patch34
-rw-r--r--app-forensics/sleuthkit/metadata.xml2
-rw-r--r--app-forensics/sleuthkit/sleuthkit-4.11.1-r2.ebuild (renamed from app-forensics/sleuthkit/sleuthkit-4.10.1-r1.ebuild)68
-rw-r--r--app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild (renamed from app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild)128
5 files changed, 151 insertions, 89 deletions
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index bfff1f566575..0c620b66ce46 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 commons-validator-1.6.jar 186077 BLAKE2B 39080bebfde71d87847b65f212d47a51bab9567cb0aaf7122359a67a8eb817877a6cc80495a15aefb12936d0e36532ed771dc0a2dff8401fc301f658ed38ef88 SHA512 aded530d3b79ead6ba5c44668c6d6964d7721f9617249f6aaa1c8f558ad4b3d3c1b6d78b639a4cb8dd27a671879b662fdbba0502fd04e131f3286169507df30c
-DIST gson-2.8.5.jar 241622 BLAKE2B b13887177b5d5f2a11b2dde1fdbaa3a95b55bb7b5500624c7eb0745e861c897ed1e27868bad19d30a1670c90f3068a8fd40e1b81e5e25e96819fa5c371a5e1af SHA512 5dd7214c542a7b93aab3eab0ba13e4ac3d6ddb05c795fb6d3992e21925a98dce87cb186ac67b4d3ad146f96e14d38b3892837eca57a27b4e845aca6d4e4f708a
-DIST sleuthkit-4.10.1.tar.gz 3524246 BLAKE2B ddea16693730a993032868ea60423d4bfcf3cba470010854c7bd36ab0a033325d906a0e4760501d59fdda4f37e12052f8672d33e4e374d1a6cdb03e22d0de367 SHA512 3ee335ba98bbb16985207ad50bc15a607ea2bcf550bba392be1cace8982c893a29e9de64e6598d02f41f9f745dc720f829317ed31f068e6cb1f6c230699e47bf
-DIST sleuthkit-4.9.0.tar.gz 3473764 BLAKE2B 3950e586595f53a81c845b3b1fbaf4939a84ee3d81e8141cabf41c9fbee1b1f5cf1b8bd6cab95b157d60364541736f750c8ada61c76da89e663721b9a67330ef SHA512 1db8b9f825aa551fe5bdf01285832b903fb4f2d6a8fd9a57a5cd5c9005dfdbec22d3dd49d394616d838e2a2111110018e787f2ed467a1c27a500fc75bed0dd0b
+DIST sleuthkit-4.11.1.tar.gz 3718417 BLAKE2B 4ce1fa68f770e61942e00e6a05ac751afdd7f33d781ec1069e9a8cb9a27d22f0ed506e9affeaddaf9ecfa98e6d30f468314b5a00d35b20ba01fc312765dbef14 SHA512 04e4ca1c18bda56c816aa493eb3b887f2f62162e16c35079d4208b89464a78109fc189fec55ea6db8a60ab01a4e46c87902f00286abee203ff0c53ab572cfeda
+DIST sleuthkit-4.12.1.tar.gz 3768424 BLAKE2B 506d21645cfe809994ebe3edac47402b3590ab4d5bc16260daa706b1fba5ceacf5eb2c3baa96cfa1b7404fbdfcf77705d6f28ddaf293e8d71a1e4cbde93f74a6 SHA512 f3efe1339edc9eb07023975a1e2e2dc7bc47d61d838aada941b7591e2c5beb74fc5298ebf68ae71875bf8f0f09c0d7929a11762fa47840e7e18398d3ff80b9fc
DIST sleuthkit-libewf_64bit-20130416.tar.gz 23818247 BLAKE2B 23be933ed8a74e4834ee6571a28d81ba16e98e4e4e27b5b1b3b655d1d92a6eadcba35aadf96aa404e6e0a225b27f3f5daff2836879b87fe58440a3ad5645de44 SHA512 611cbb57de17600caee0330bbe9917c4481d7711a35dba8c072fd49cd3e1714e0a3ce30fd8fcac9981db848e80870bf5d215326c56808bb6f5b4c8dcc1e5a3c9
DIST sqlite-jdbc-3.25.2.jar 7064881 BLAKE2B 3917da6127137bab710a9e61f326f59320ce94654ebb8ae5e694b05aed6b9b1bd367ade2f08ce5bb52c3ac296992240ad949969f5eff712615d07a18588c6a17 SHA512 efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb
+DIST sqlite-jdbc-3.42.0.0.jar 13030515 BLAKE2B 02ffee9875fefd3f2ba4e9115d0b4fee53163bab994830b28033159ab08df264e5f86bbcfb7d1fae145c9aaafc6537fb9084594ce6b21c9715226a1cf644f174 SHA512 6d0491f7f2f542629f4e69d5891ded85e887f0d8dad8c4568ead07b1eda79e0b97f625374a635f12d419d2f42a4049976365e0a8265ee371172f330be9571616
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/metadata.xml b/app-forensics/sleuthkit/metadata.xml
index 72bb1326592f..577cfefc8b1b 100644
--- a/app-forensics/sleuthkit/metadata.xml
+++ b/app-forensics/sleuthkit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gokturk@gentoo.org</email>
diff --git a/app-forensics/sleuthkit/sleuthkit-4.10.1-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.11.1-r2.ebuild
index ddb5a5ad0eea..4d0ad720368c 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r1.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.11.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
inherit autotools java-pkg-opt-2 java-ant-2
@@ -10,34 +10,19 @@ DESCRIPTION="A collection of file system and media management forensic analysis
HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
# See: https://bugs.gentoo.org/690010
-# TODO: SparseBitSet does not exist in the tree, we bundle it for now
-# See: https://bugs.gentoo.org/690012
# 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.
# See: https://bugs.gentoo.org/689752
-# TODO: gson-2.8.5 does not exist in the tree. Building it seems to
-# require Java 9. We have Java 11 in the tree but I don't see a
-# way to use it as a gentoo-vm in order to build gson. Sleuthkit
-# upstream still uses Java 8.
-# See: https://bugs.gentoo.org/706274
-# TODO: commons-validator-1.6 does not exist in the tree. The latest version
-# as of writing this ebuild is 1.4.1, for which the build fails. As
-# per #711930, this is a security sensitive bump. We're gonna fetch
-# the jar file here and file a bug request for a bump as well:
-# https://bugs.gentoo.org/721020
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
java? (
- https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
- http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar
- https://repo1.maven.org/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar
)
ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
SLOT="0/19" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"
IUSE="aff doc ewf java static-libs test +threads zlib"
RESTRICT="!test? ( test )"
@@ -48,10 +33,13 @@ DEPEND="
ewf? ( sys-libs/zlib )
java? (
>=dev-java/c3p0-0.9.5:0
- dev-java/commons-lang:3.1
- dev-java/guava:20
+ dev-java/commons-lang:3.6
+ >=dev-java/commons-validator-1.6:0
+ >=dev-java/gson-2.8.5:0
+ dev-java/guava:0
>=dev-java/jdbc-postgresql-9.4:0
>=dev-java/joda-time-2.4:0
+ dev-java/sparsebitset:0
)
zlib? ( sys-libs/zlib )
"
@@ -64,17 +52,17 @@ DEPEND="
# "
RDEPEND="${DEPEND}
- java? (
- || (
- virtual/jre:1.8
- virtual/jdk:1.8
- )
- )
+ java? ( virtual/jre:1.8 )
"
DEPEND="${DEPEND}
java? ( virtual/jdk:1.8 )
- doc? ( app-doc/doxygen )
- test? ( >=dev-util/cppunit-1.2.1 )
+ test? (
+ >=dev-util/cppunit-1.2.1
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
"
PATCHES=(
@@ -138,6 +126,15 @@ src_prepare() {
java-pkg-opt-2_src_prepare
popd &>/dev/null || die
+
+ # Call ant with jar target for case-uco.
+ # The default invocation of ant tries to
+ # run junit tests, which there are none.
+ # It ends up failing with:
+ # junit.framework.AssertionFailedError: No tests found in org.sleuthkit.caseuco.TestSuite
+ sed -e '/\tant \$(ant_args)/ s|$| jar|' \
+ -i "${S}"/case-uco/java/Makefile.am \
+ || die
fi
# Override the doxygen output directories
@@ -211,6 +208,7 @@ src_configure() {
--enable-offline="${TSK_JAR_DIR}"
$(use_enable java)
$(use_enable static-libs static)
+ $(use_enable test cppunit)
$(use_enable threads multithreading)
$(use_with aff afflib)
$(use_with zlib)
@@ -244,14 +242,18 @@ src_compile() {
# Create symlinks of jars for the required dependencies
if use java; then
java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
- java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.1
- java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" gson
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" guava
java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
# case-uco needs gson and expects it under case-uco/java/lib
# symlink it to the jar dir we create for java bindings
ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
+ ln -s ./gson.jar "${TSK_JAR_DIR}"/gson-2.8.5.jar || die
fi
# Create the doc output dirs if requested
@@ -280,7 +282,7 @@ src_install() {
pushd "${TSK_JAR_DIR}" &>/dev/null || die
for f in *; do
# Skip the symlinks java-pkg_jar-from created
- [[ -f ${f} ]] || continue
+ [[ -L ${f} ]] && continue
# Strip the version numbers as per eclass recommendation
[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
@@ -305,3 +307,7 @@ src_install() {
find "${D}" -name '*.la' -delete || die
}
+
+src_test() {
+ emake -C "${S}"/unit_tests check
+}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild
index 4d51d37dde09..3322803dbb6f 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
inherit autotools java-pkg-opt-2 java-ant-2
@@ -10,83 +10,74 @@ DESCRIPTION="A collection of file system and media management forensic analysis
HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
# See: https://bugs.gentoo.org/690010
-# TODO: SparseBitSet does not exist in the tree, we bundle it for now
-# See: https://bugs.gentoo.org/690012
# 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.
# See: https://bugs.gentoo.org/689752
-# TODO: gson-2.8.5 does not exist in the tree. Building it seems to
-# require Java 9. We have Java 11 in the tree but I don't see a
-# way to use it as a gentoo-vm in order to build gson. Sleuthkit
-# upstream still uses Java 8.
-# See: https://bugs.gentoo.org/706274
-# TODO: commons-validator-1.6 does not exist in the tree. The latest version
-# as of writing this ebuild is 1.4.1, for which the build fails. As
-# per #711930, this is a security sensitive bump. We're gonna fetch
-# the jar file here and file a bug request for a bump as well:
-# https://bugs.gentoo.org/721020
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
java? (
- https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
- http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
- http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar
- https://repo1.maven.org/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar
+ https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.42.0.0/sqlite-jdbc-3.42.0.0.jar
)
- ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
+ ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz
+ -> sleuthkit-libewf_64bit-20130416.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"
+SLOT="0/19" # subslot = major soname version
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="aff doc ewf java static-libs test +threads zlib"
RESTRICT="!test? ( test )"
-#
-# 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? (
- >=dev-java/c3p0-0.9.5:0
- dev-java/commons-lang:3.1
- dev-java/guava:20
+ >=dev-java/c3p0-0.9.5.5:0
+ dev-java/commons-lang:3.6
+ >=dev-java/commons-validator-1.6:0
+ >=dev-java/gson-2.8.5:0
+ dev-java/guava:0
>=dev-java/jdbc-postgresql-9.4:0
>=dev-java/joda-time-2.4:0
+ >=dev-java/mchange-commons-0.2.20:0
+ dev-java/sparsebitset:0
)
- postgres? ( dev-db/postgresql:= )
zlib? ( sys-libs/zlib )
"
-# TODO: add support for not-in-tree libraries libvhdi and libvmdk
+# TODO: add support for not-in-tree libraries:
# libvhdi: https://github.com/libyal/libvhdi
# libvmdk: https://github.com/libyal/libvmdk
+# libvslvm: https://github.com/libyal/libvslvm
+# Upstream also says "A stand-alone version of libbfio is needed
+# to allow libvslvm to directly read from a TSK_IMAGE." Not sure
+# what it means yet.
+#
# DEPEND="${DEPEND}
# vhdi? ( dev-libs/libvhdi )
# vmdk? ( dev-libs/libvmdk )
+# vslvm? ( dev-libs/libvslvm dev-libs/libbfio )
# "
RDEPEND="${DEPEND}
- java? (
- || (
- virtual/jre:1.8
- virtual/jdk:1.8
- )
- )
+ java? ( virtual/jre:1.8 )
"
DEPEND="${DEPEND}
java? ( virtual/jdk:1.8 )
- doc? ( app-doc/doxygen )
- test? ( >=dev-util/cppunit-1.2.1 )
+ test? (
+ >=dev-util/cppunit-1.2.1
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
"
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() {
@@ -127,6 +118,10 @@ src_prepare() {
sed -e '/AM_CXXFLAGS/ s/-Werror//g' \
-i tsk/util/Makefile.am \
-i tsk/pool/Makefile.am || die
+ # Remove -static from LDFLAGS because it doesn't actually create
+ # a static binary. It confuses libtool, who then inserts rpath
+ sed -e '/LDFLAGS/ s/-static//' \
+ -i tools/pooltools/Makefile.am || die
if use java; then
pushd "${S}"/bindings/java &>/dev/null || die
@@ -140,6 +135,15 @@ src_prepare() {
java-pkg-opt-2_src_prepare
popd &>/dev/null || die
+
+ # Call ant with jar target for case-uco.
+ # The default invocation of ant tries to
+ # run junit tests, which there are none.
+ # It ends up failing with:
+ # junit.framework.AssertionFailedError: No tests found in org.sleuthkit.caseuco.TestSuite
+ sed -e '/\tant \$(ant_args)/ s|$| jar|' \
+ -i "${S}"/case-uco/java/Makefile.am \
+ || die
fi
# Override the doxygen output directories
@@ -213,20 +217,23 @@ src_configure() {
--enable-offline="${TSK_JAR_DIR}"
$(use_enable java)
$(use_enable static-libs static)
+ $(use_enable test cppunit)
$(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
+ # TODO: add support for non-existing libraries:
# myeconfargs+=(
# $(use_with vhdi libvhdi)
# $(use_with vmdk libvmdk)
+ # $(use_with vslvm libvslvm)
+ # $(use_with vslvm libbfio) # not a typo
# )
myeconfargs+=(
--without-libvhdi
--without-libvmdk
+ --without-libvslvm
+ --without-libbfio
)
use ewf && tsk_compile_libewf
@@ -247,15 +254,20 @@ 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}" commons-lang:3.1
- java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" gson
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" guava
java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" mchange-commons
+ java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
- popd &>/dev/null || die
+ # case-uco needs gson and expects it under case-uco/java/lib
+ # symlink it to the jar dir we create for java bindings
+ ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
+ ln -s ./gson.jar "${TSK_JAR_DIR}"/gson-2.8.5.jar || die
fi
# Create the doc output dirs if requested
@@ -267,18 +279,24 @@ src_compile() {
}
src_install() {
+ # Give it an existing bogus ivy home #756766
+ local -x IVY_HOME="${T}"
local f
if use java; then
pushd "${S}"/bindings/java &>/dev/null || die
- java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+ # Install case-uco
+ pushd "${S}"/case-uco/java &>/dev/null || die
+ java-pkg_newjar "dist/${PN}-caseuco-${PV}".jar "${PN}-caseuco.jar"
+ popd || die
- # Install the bundled jar files
+ # Install the bundled jar files as well as the
+ # sleuthkit jar installed here by case-uco
pushd "${TSK_JAR_DIR}" &>/dev/null || die
for f in *; do
# Skip the symlinks java-pkg_jar-from created
- [[ -f ${f} ]] || continue
+ [[ -L ${f} ]] && continue
# Strip the version numbers as per eclass recommendation
[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
@@ -291,6 +309,8 @@ src_install() {
fi
default
+ # Default install target for case-uco installs the jar in the wrong place
+ rm -r "${ED}"/usr/share/java
# It unconditionally builds both api and jni docs
# We install conditionally based on the provided use flags
@@ -301,3 +321,7 @@ src_install() {
find "${D}" -name '*.la' -delete || die
}
+
+src_test() {
+ emake -C "${S}"/unit_tests check
+}