From 349eda96786e7a69a93195ff221549e0a9161e13 Mon Sep 17 00:00:00 2001 From: blshkv Date: Sun, 25 Aug 2019 11:35:56 +0800 Subject: [PATCH] sleuthkit: delete, give up on libyal. Use gentoo's ebuild instead --- app-forensics/sleuthkit/Manifest | 4 - ...thkit-4.6.6_default-jar-location-fix.patch | 58 ---- .../sleuthkit-4.6.6_tools-shared-libs.patch | 55 ---- app-forensics/sleuthkit/metadata.xml | 21 -- .../sleuthkit/sleuthkit-4.6.6-r1.ebuild | 259 ------------------ 5 files changed, 397 deletions(-) delete mode 100644 app-forensics/sleuthkit/Manifest delete mode 100644 app-forensics/sleuthkit/files/sleuthkit-4.6.6_default-jar-location-fix.patch delete mode 100644 app-forensics/sleuthkit/files/sleuthkit-4.6.6_tools-shared-libs.patch delete mode 100644 app-forensics/sleuthkit/metadata.xml delete mode 100644 app-forensics/sleuthkit/sleuthkit-4.6.6-r1.ebuild diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest deleted file mode 100644 index b35460bb9..000000000 --- a/app-forensics/sleuthkit/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST SparseBitSet-1.1.jar 23706 BLAKE2B 8623a723f11f97386a108c775fefddd324997b68bea7f7ade0581ec5800bfa8d32f699ab903ad66c631b7b5c69ba1ef377243653f5044f39234dac07543eb129 SHA512 cf75431c5f705961800ce5cbca2acb9b2459eaf98ec37b5ee21c5a90d204ffb466fa25457b0560fbb024489777efbea0276201024c7b1b2853124930ac490983 -DIST libewf-20130128.tar.gz 1978794 BLAKE2B e5d2bd8f4a8b878e13536b89b032d8cee6982272065b2bf325f8a811dff258264118a79496912377337ceb9ad630138b6bedb89e3c3be89a5f6a6fea85ab586b SHA512 94cdd0c3f0d8f535f3462c5adba266302f9b129abacda077ed429fa38af6862fca5a90ba2e606b78607b509769305cc6134c483c7033c20e226596cca2d42b90 -DIST sleuthkit-4.6.6.tar.gz 8668433 BLAKE2B 49594dd329e7c67c473130659bbdab02d448e15974d0ba35a9b999dc54df06f674cfb2a4916ff7b53879c00b387c3915e21aa67fe5656556f65b121b308a516c SHA512 42eba3d420fcdb37966c70bd158ff379292bf6e0366cf9b4c43b7e0d1fa4d729d1a31c49ddc7ce17bd6c31d63ddc34251ec53878714274c910db2b6974e17f19 -DIST sqlite-jdbc-3.8.11.jar 5131732 BLAKE2B 1a04fa9e9cb97fdddc19af2de9efa7b54c0b527642e6e325e31054e4e294e3bc6af00ea291087ed9dd26668d48dae356035fc85212c0eb81656550d552103ed0 SHA512 5f4705101992e8916e29742c560aef0d01eba9dc0d2d984b75a77e56be3c9fd20b284390fe8f9bb54bf9d1f8528c3413922684c446212ca8961ac731543fb179 diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.6.6_default-jar-location-fix.patch b/app-forensics/sleuthkit/files/sleuthkit-4.6.6_default-jar-location-fix.patch deleted file mode 100644 index 126fce904..000000000 --- a/app-forensics/sleuthkit/files/sleuthkit-4.6.6_default-jar-location-fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f8c1cada7f01826b15a82b20600b8df7562fa2ed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= -Date: Wed, 28 Nov 2018 21:33:46 -0500 -Subject: [PATCH v1] Allow --enable-offline to accept a directory argument for - jar libs - -Allow the hardcoded default_jar_location in build.xml to -/usr/share/java to be changed using the argument provided to ---enable-offline. Note that this changes the behavior of the switch -from "anything other than yes or no is incorrect" to "anything other -than no implies offline mode". ---- - bindings/java/Makefile.am | 4 ++++ - configure.ac | 10 +++++++++- - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am -index ad27526e..f0bb9f68 100644 ---- a/bindings/java/Makefile.am -+++ b/bindings/java/Makefile.am -@@ -7,6 +7,10 @@ jar_DATA = $(tsk_jar) - - if OFFLINE - ant_args=-Doffline=true -+if CUSTOM_DEFAULT_JAR_LOCATION -+ ant_args+= -Ddefault-jar-location="@DEFAULT_JAR_LOCATION@" -+else -+endif - else - - endif -diff --git a/configure.ac b/configure.ac -index dc9026ed..d3d41646 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -221,10 +221,18 @@ AC_ARG_ENABLE([offline], - [case "${enableval}" in - yes) offline=true ;; - no) offline=false ;; -- *) AC_MSG_ERROR([bad value ${enableval} for --enable-online]) ;; -+ *) -+ offline=true -+ default_jar_location="${enableval}" -+ ;; - esac],[offline=false]) - - AM_CONDITIONAL([OFFLINE], [test "x$offline" = xtrue]) -+AM_CONDITIONAL([CUSTOM_DEFAULT_JAR_LOCATION], [test "x$default_jar_location" != "x"]) -+AM_COND_IF([CUSTOM_DEFAULT_JAR_LOCATION], -+ [AC_SUBST([DEFAULT_JAR_LOCATION], [$default_jar_location])] -+) -+ - - - dnl Check if we should link libewf. --- -2.19.1 - diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.6.6_tools-shared-libs.patch b/app-forensics/sleuthkit/files/sleuthkit-4.6.6_tools-shared-libs.patch deleted file mode 100644 index efa335068..000000000 --- a/app-forensics/sleuthkit/files/sleuthkit-4.6.6_tools-shared-libs.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- sleuthkit-4.1.0/tools/autotools/Makefile.am -+++ sleuthkit-4.1.0/tools/autotools/Makefile.am -@@ -1,6 +1,5 @@ - AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall - LDADD = ../../tsk/libtsk.la --LDFLAGS += -static - EXTRA_DIST = .indent.pro - - bin_PROGRAMS = tsk_recover tsk_loaddb tsk_comparedir tsk_gettimes ---- sleuthkit-4.1.0/tools/fstools/Makefile.am -+++ sleuthkit-4.1.0/tools/fstools/Makefile.am -@@ -1,6 +1,5 @@ - AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall - LDADD = ../../tsk/libtsk.la --LDFLAGS += -static - EXTRA_DIST = .indent.pro fscheck.cpp - - bin_PROGRAMS = blkcalc blkcat blkls blkstat ffind fls fcat fsstat icat ifind ils \ ---- sleuthkit-4.1.0/tools/hashtools/Makefile.am -+++ sleuthkit-4.1.0/tools/hashtools/Makefile.am -@@ -1,6 +1,5 @@ - AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall - LDADD = ../../tsk/libtsk.la --LDFLAGS += -static - EXTRA_DIST = .indent.pro md5.c sha1.c - - bin_PROGRAMS = hfind ---- sleuthkit-4.1.0/tools/imgtools/Makefile.am -+++ sleuthkit-4.1.0/tools/imgtools/Makefile.am -@@ -1,6 +1,5 @@ - AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall - LDADD = ../../tsk/libtsk.la --LDFLAGS += -static - EXTRA_DIST = .indent.pro - - bin_PROGRAMS = img_cat img_stat ---- sleuthkit-4.1.0/tools/srchtools/Makefile.am -+++ sleuthkit-4.1.0/tools/srchtools/Makefile.am -@@ -6,7 +6,6 @@ - - sigfind_SOURCES = sigfind.cpp - sigfind_LDADD = ../../tsk/libtsk.la --sigfind_LDFLAGS = -static - - indent: - indent *.c *.cpp ---- sleuthkit-4.1.0/tools/vstools/Makefile.am -+++ sleuthkit-4.1.0/tools/vstools/Makefile.am -@@ -1,6 +1,5 @@ - AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall - LDADD = ../../tsk/libtsk.la --LDFLAGS += -static - EXTRA_DIST = .indent.pro - - bin_PROGRAMS = mmls mmstat mmcat diff --git a/app-forensics/sleuthkit/metadata.xml b/app-forensics/sleuthkit/metadata.xml deleted file mode 100644 index b875f268b..000000000 --- a/app-forensics/sleuthkit/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - gokturk@gentoo.org - Göktürk Yüksek - - - Enable extra aff formats - Enable libewf support - Use dev-libs/libvhdi library to access the Virtual Hard Disk (VHD) image format - Use dev-libs/libvmdk library to access the VMware Virtual Disk (VMDK) format - - - Reflect ABI compatibility for libtsk.so - - - sleuthkit - sleuthkit/sleuthkit - - diff --git a/app-forensics/sleuthkit/sleuthkit-4.6.6-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.6.6-r1.ebuild deleted file mode 100644 index 406fc38ba..000000000 --- a/app-forensics/sleuthkit/sleuthkit-4.6.6-r1.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2019 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 vhdi vmdk 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 ) - vhdi? ( dev-libs/libvhdi ) - vmdk? ( dev-libs/libvmdk ) - 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 )" - -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.8:= )" - -DEPEND="${DEPEND} - doc? ( app-doc/doxygen ) - test? ( >=dev-util/cppunit-1.2.1 ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}_tools-shared-libs.patch - "${FILESDIR}"/${P}_default-jar-location-fix.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 - - --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) - ) - # Workaround the automagic detection of postgresql - local -x ac_cv_lib_pq_PQlibVersion="$(usex postgres)" - - myeconfargs+=( - $(use_with vhdi libvhdi) - $(use_with vmdk 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 -}