From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B39A158091 for ; Thu, 9 Jun 2022 06:45:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 554C8E0875; Thu, 9 Jun 2022 06:45:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE5E3E0809 for ; Thu, 9 Jun 2022 06:45:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C568A340F0E for ; Thu, 9 Jun 2022 06:45:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FA787F for ; Thu, 9 Jun 2022 06:45:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1654757105.da53202239bf2672611569423994ec4fd6397acb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/sleuthkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-forensics/sleuthkit/Manifest app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild X-VCS-Directories: app-forensics/sleuthkit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: da53202239bf2672611569423994ec4fd6397acb X-VCS-Branch: master Date: Thu, 9 Jun 2022 06:45:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d59b11b-012b-4b48-9a25-b7d17693fd65 X-Archives-Hash: e307306f5f730626808f66103b5ef134 commit: da53202239bf2672611569423994ec4fd6397acb Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Jun 8 09:03:33 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 9 06:45:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da532022 app-forensics/sleuthkit: drop 4.10.1-r3 Closes: https://bugs.gentoo.org/833324 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Sam James gentoo.org> app-forensics/sleuthkit/Manifest | 2 - app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild | 301 --------------------- 2 files changed, 303 deletions(-) diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest index 9ab4c08b2ef5..03ea8d0f9d44 100644 --- a/app-forensics/sleuthkit/Manifest +++ b/app-forensics/sleuthkit/Manifest @@ -1,5 +1,3 @@ -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.11.1.tar.gz 3718417 BLAKE2B 4ce1fa68f770e61942e00e6a05ac751afdd7f33d781ec1069e9a8cb9a27d22f0ed506e9affeaddaf9ecfa98e6d30f468314b5a00d35b20ba01fc312765dbef14 SHA512 04e4ca1c18bda56c816aa493eb3b887f2f62162e16c35079d4208b89464a78109fc189fec55ea6db8a60ab01a4e46c87902f00286abee203ff0c53ab572cfeda DIST sleuthkit-libewf_64bit-20130416.tar.gz 23818247 BLAKE2B 23be933ed8a74e4834ee6571a28d81ba16e98e4e4e27b5b1b3b655d1d92a6eadcba35aadf96aa404e6e0a225b27f3f5daff2836879b87fe58440a3ad5645de44 SHA512 611cbb57de17600caee0330bbe9917c4481d7711a35dba8c072fd49cd3e1714e0a3ce30fd8fcac9981db848e80870bf5d215326c56808bb6f5b4c8dcc1e5a3c9 diff --git a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild deleted file mode 100644 index 345ed4e0ca35..000000000000 --- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2021 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 -# See: https://bugs.gentoo.org/690010 -# 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 - 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" -IUSE="aff doc ewf java static-libs test +threads zlib" -RESTRICT="!test? ( test )" - -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.6 - dev-java/guava:20 - >=dev-java/jdbc-postgresql-9.4:0 - >=dev-java/joda-time-2.4:0 - dev-java/sparsebitset - ) - 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} - java? ( virtual/jdk:1.8 ) - 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.10.1-exclude-usr-local.patch -) - -src_unpack() { - local f - - unpack ${P}.tar.gz - - if use ewf; then - pushd "${T}" &>/dev/null || die - unpack sleuthkit-libewf_64bit-20130416.tar.gz - export TSK_LIBEWF_SRCDIR="${T}"/libewf_64bit-VisualStudio_2010 - 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() { - # Inlining breaks the compilation, disable it - sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \ - -i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die -} - -src_prepare() { - use ewf && tsk_prepare_libewf - - # Do not pass '-Werror'. This is overkill for user builds. - 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 - - # Prevent "make install" from installing - # jar files under /usr/share/java - # We'll use the java eclasses for this - # See: https://github.com/sleuthkit/sleuthkit/pull/1379 - 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 - - --with-libcstring=no - --with-libcerror=no - --with-libcdata=no - --with-libclocale=no - --with-libcnotify=no - --with-libcsplit=no - --with-libuna=no - --with-libcfile=no - --with-libcpath=no - --with-libbfio=no - --with-libfcache=no - --with-libfvalue=no - - ) - # 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) - ) - # 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 - 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}" guava:20 - 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 - 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() { - # 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 - - # 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 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 - - # 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 - # 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 - 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 -}