--- /dev/null
+From f8c1cada7f01826b15a82b20600b8df7562fa2ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+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
+
--- /dev/null
+# Copyright 1999-2018 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 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 )
+ 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 )
+"
+# 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}
+ 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
+)
+
+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
+ )
+ # 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)"
+ # TODO: add support for non-existing libraries libvhdi and libvmdk
+ # myeconfargs+=(
+ # $(use_with vhdi libvhdi)
+ # $(use_with vmdk libvmdk)
+ # )
+ myeconfargs+=(
+ --without-libvhdi
+ --without-libvmdk
+ )
+
+ if use ewf; then
+ tsk_compile_libewf
+ myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
+ fi
+
+ 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() {
+ # 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
+}
projects / gentoo.git / commitdiff