[patch] sleuthkit-4.10.1-unbundle.patch

sleuthkit-4.10.1-unbundle.patch (text/plain), 2.24 KB, created by Miroslav Šulc on 2021-07-01 15:14:10 UTC

diff --git a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
index 7d36f1fb6984..28031e56de98 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
@@ -14,16 +14,6 @@ HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
 #       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
@@ -46,6 +36,8 @@ DEPEND="
 	java? (
 		>=dev-java/c3p0-0.9.5:0
 		dev-java/commons-lang:3.6
+		>=dev-java/commons-validator-1.6:0
+		>=dev-java/gson-2.8.5:2.6
 		dev-java/guava:20
 		>=dev-java/jdbc-postgresql-9.4:0
 		>=dev-java/joda-time-2.4:0
@@ -62,15 +54,10 @@ DEPEND="
 # "
 
 RDEPEND="${DEPEND}
-	java? (
-		|| (
-			virtual/jre:1.8
-			virtual/jdk:1.8
-		)
-	)
+	java? ( >=virtual/jre-1.8:* )
 "
 DEPEND="${DEPEND}
-	java? ( virtual/jdk:1.8 )
+	java? ( >=virtual/jdk-1.8:* )
 	doc? ( app-doc/doxygen )
 	test? ( >=dev-util/cppunit-1.2.1 )
 "
@@ -243,6 +230,8 @@ src_compile() {
 	if use java; then
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
 		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:2.6
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time