gentoo auto-resync : 27:06:2023 - 07:34:25

4 files changed, 77 insertions, 11 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 4f44cdcb9944..9d28a4f5f6bf 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 7cc4881522c9..f5a297997ca4 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,10 +1,12 @@
 AUX sleuthkit-4.1.0-tools-shared-libs.patch 1678 BLAKE2B f60496480425fd78bc211a663be80db2472a9683f1ff76c747f8190d5544df532857f6e1fb4343d0405f8bf51aa7b7bf86ed55fffbeea0153341ce9f2dca077b SHA512 b559f669837194bed447ac269884ab50e6ea746aba2df799688964245c22814567871f12f96d43ba74016d5c448247b02bef5d7bdfd32fd782ef5e668686238e
 AUX sleuthkit-4.10.1-exclude-usr-local.patch 858 BLAKE2B 706aee34f3555fb703e2b2d88ebe63919b02ac93f1627dda12116bea89f0303a5d4b9adc5f1695e4e96d643d09f88514fe41d144fca1a4f8cd7618b22d21b2f7 SHA512 a4d5d31b63483e6fb88c4a1b06f40587d2b66f63092c67755fec41c29e9f671e9e2e508c0752d2894e77b059a96ae15fd33e663fd23a13dad16acf5184959c88
+AUX sleuthkit-4.12.0-configure-ac-test-fix.patch 1380 BLAKE2B bbf6a72c828a04f79218c4faed6b68339da388fc94c0b10b3c00059e5073c634e3ade054d38b101b6ed6f5a270dcf2e8ae88b32b19afb5c6588df146be0e97b1 SHA512 2d67b8f6d6812ec3b44aaf5e31c21b94483606bd61091f13717b79b11369635088a1443f5e5fbfac1fbe4af8c6537775d65c2680c6eaaa33a2425bb182b446e6
 AUX sleuthkit-4.6.4-default-jar-location-fix.patch 1768 BLAKE2B d9a0675223506649a5db7aa4e0ef883ecea84c8484836d2020528696f13e14bbe9334c2967c7b698126fb1cedd6a6719fbbe3fb945b4ea9b89d643a61232d5e8 SHA512 acc076ca74d3e5d7c75425292730783801a7afe858ea119186229a319ba4fd2e076c1214daca3e4aa3d5a7717c5ed08a9ca0bf11bb4dc2a04d3aad190dbf57c6
-DIST sleuthkit-4.10.1.tar.gz 3524246 BLAKE2B ddea16693730a993032868ea60423d4bfcf3cba470010854c7bd36ab0a033325d906a0e4760501d59fdda4f37e12052f8672d33e4e374d1a6cdb03e22d0de367 SHA512 3ee335ba98bbb16985207ad50bc15a607ea2bcf550bba392be1cace8982c893a29e9de64e6598d02f41f9f745dc720f829317ed31f068e6cb1f6c230699e47bf
 DIST sleuthkit-4.11.1.tar.gz 3718417 BLAKE2B 4ce1fa68f770e61942e00e6a05ac751afdd7f33d781ec1069e9a8cb9a27d22f0ed506e9affeaddaf9ecfa98e6d30f468314b5a00d35b20ba01fc312765dbef14 SHA512 04e4ca1c18bda56c816aa493eb3b887f2f62162e16c35079d4208b89464a78109fc189fec55ea6db8a60ab01a4e46c87902f00286abee203ff0c53ab572cfeda
+DIST sleuthkit-4.12.0.tar.gz 3760659 BLAKE2B 177b4b8ca9b843b814ab3a5a43079e05ca328b090b0aa9405f57f5fa4b57c7623739dce70ea8ad51e1e23f5d9f4f2565d713fc5fb1d4fa8e6916e19e8ef36d9a SHA512 9f20eb42d1dd7d0e15d49a4b6c18441cd31d2343fe34bc7fad1a6b6fe344b414efe959a4f7e34f5368a6efafeecbf39655648a9a3045b437a747c726134c77dc
 DIST sleuthkit-libewf_64bit-20130416.tar.gz 23818247 BLAKE2B 23be933ed8a74e4834ee6571a28d81ba16e98e4e4e27b5b1b3b655d1d92a6eadcba35aadf96aa404e6e0a225b27f3f5daff2836879b87fe58440a3ad5645de44 SHA512 611cbb57de17600caee0330bbe9917c4481d7711a35dba8c072fd49cd3e1714e0a3ce30fd8fcac9981db848e80870bf5d215326c56808bb6f5b4c8dcc1e5a3c9
 DIST sqlite-jdbc-3.25.2.jar 7064881 BLAKE2B 3917da6127137bab710a9e61f326f59320ce94654ebb8ae5e694b05aed6b9b1bd367ade2f08ce5bb52c3ac296992240ad949969f5eff712615d07a18588c6a17 SHA512 efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb
-EBUILD sleuthkit-4.10.1-r5.ebuild 7866 BLAKE2B e0f362c8b2fe8176a48eae2628b43baf9e21ddbb8bf8459e626077d4708e57160e90d708d5561e76798c6c263371d54424a1283966b8fdafbc1c61cfa3c56eb8 SHA512 293515763d2d40cb87b675ec5cd0f3458d0ace2087addb1f3713012bf52e0e99b0edf36ea57bf0d340ad27ea4999bc86ca0f33779613d663ea1fbbff1731ad8b
+DIST sqlite-jdbc-3.36.0.3.jar 9731064 BLAKE2B 5a2e55c95f0bc648b4a93eb38905ceee92558306166f837adf902a341f83d9c73ea26cc788fbe4d93d445e252c268edd15d2e55a546b5937ba0d8c7a5df3a836 SHA512 32e789a0dd37c848e927f3afa7fa1820163c165830ce01e9f341f6e01733b3311d034d004030541d6fc574ae54204c39c96d0d68f9dd4c88094147cf32a2681f
 EBUILD sleuthkit-4.11.1-r1.ebuild 8313 BLAKE2B a839b59d1cb0cc339affce37c76f9271186d46d9d5b13260b43de166f7ca63ae4968cf3db3072ee8dbc1b62ddf6251e18a0dc04d7380cb7843d91008cb7b3c1b SHA512 f40ef1a09d77379d9e9b5634e3513aeeaec6017e40f982411f5aa81c75d44c8556328bc0c23e23b1b231810406f9d27e90a24d9bf85c98736dc87c5ae3828af9
+EBUILD sleuthkit-4.12.0.ebuild 8810 BLAKE2B 035698d6dfd0c8863cb791b3d6e52331caa93053c04dc500a8dfcdecffe891732c4156b012197f0eacfac23549b6bd37963022bf1cba3ea5a700ab4b6b5c5485 SHA512 369679fdbacad645f319873bcc823948c9b3e94ad09d0d527d40819b0bb5489cc86cabc630350cd88f40775b920169407329f8a83b63d436a14dd5dd74dc75e8
 MISC metadata.xml 608 BLAKE2B 4ffbcef7c2ce2700da294752bdc19b2e98323f2fe3f73aa8f8bfe430fa6a148b8a464959a21300398ae4f6933f1383bc014a697283d148dcbe9616e6a38b01d6 SHA512 59fc9a08d8fa875adc1b9cf8a2f47e38611e474a160ef00a7b75582601cb503bb10f19ab303487658d5f16c25991eba2b7a98d4ff5182b8c4ca8dc6e905a04f3
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.10.1-r5.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.0.ebuild
index a2a1eadc3ede..774fb6e6da83 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r5.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.12.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
 inherit autotools java-pkg-opt-2 java-ant-2
@@ -16,13 +16,13 @@ HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
 #		See: https://bugs.gentoo.org/689752
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
 	java? (
-		http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
+		https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.36.0.3/sqlite-jdbc-3.36.0.3.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 )"
 
@@ -32,23 +32,30 @@ DEPEND="
 	aff? ( app-forensics/afflib )
 	ewf? ( sys-libs/zlib )
 	java? (
-		>=dev-java/c3p0-0.9.5:0
+		>=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:2.6
 		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
 	)
 	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}
@@ -56,9 +63,12 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	java? ( virtual/jdk:1.8 )
-	test? ( >=dev-util/cppunit-1.2.1 )
+	test? (
+		>=dev-util/cppunit-1.2.1
+	)
 "
 BDEPEND="
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
@@ -66,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() {
@@ -123,6 +134,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
@@ -196,18 +216,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)
 	)
-	# 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
@@ -235,6 +260,7 @@ src_compile() {
 		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
 
 		# case-uco needs gson and expects it under case-uco/java/lib
@@ -269,7 +295,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
@@ -294,3 +320,7 @@ src_install() {
 
 	find "${D}" -name '*.la' -delete || die
 }
+
+src_test() {
+	emake -C "${S}"/unit_tests check
+}