diff --git a/app-forensics/bulk_extractor/Manifest b/app-forensics/bulk_extractor/Manifest index 877b78429..df28aacdf 100644 --- a/app-forensics/bulk_extractor/Manifest +++ b/app-forensics/bulk_extractor/Manifest @@ -1,2 +1 @@ -DIST bulk_extractor-2.0.6.tar.gz 8449867 BLAKE2B 0c7300eca0b2e59e17cea87fd27dedd7a8a7e4ecb807d22a85433bbaf18b8f36cde4831f58d48d56fef0c72b23ab2d1ec833dff1e0c2645b186ab4f19ff04b65 SHA512 911917ced83e35b81c52af8e37f3dba24c6c0a14172e8e997a6e068a58069287f3881add78a3fa363bb3e4ddd9297dfd082fcc74b772d692ec32bed404eab1c2 -DIST bulk_extractor-2.1.0.tar.gz 12371425 BLAKE2B 17db6ad139a15394f85d2934003572fa65a3f8049e256ab4b7a9ded50b248dc81d43ea2be53491ec2705abc30f46a8195106f4c2eff1a6125c63b561705fa9d7 SHA512 90e547b561571131fc30e9e9c6d1f6d474eb47a9c370bf0e0c78590bfddbd1618964ffbee7011b97f28d62ed57d05088cc0da1948eb2086e490044979dce0f1a +DIST bulk_extractor-2.1.1.tar.gz 12369744 BLAKE2B 00f2c184bc3988f4de0f9357d7c10b2bb3e232ea785e9a4eb63a113bf9c9e53aef227ac0dae77500c43fc80085429d081fd37a9e429b1c8de61d8f32e2309fe2 SHA512 cbb94a0552bde72926fa195c5014a29646dc20dbb0cf90ee8cce4c796d6c3c5953b93cc78c65a837e82c433ee1dc404e5df43607542e5f21c527abe60a1c7f17 diff --git a/app-forensics/bulk_extractor/bulk_extractor-2.0.6-r1.ebuild b/app-forensics/bulk_extractor/bulk_extractor-2.0.6-r1.ebuild deleted file mode 100644 index 1a1f0438a..000000000 --- a/app-forensics/bulk_extractor/bulk_extractor-2.0.6-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Scans a disk image for regular expressions and other content" -HOMEPAGE="https://github.com/simsong/bulk_extractor" -SRC_URI="https://github.com/simsong/bulk_extractor/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" - -#fails to compile with ewf -#fails to compile with exiv2 -#fails to compile without rar -IUSE="aff doc beviewer exiv2 hashdb +rar" - -# ewf? ( app-forensics/libewf ) -RDEPEND=" - aff? ( app-forensics/afflib ) - dev-libs/expat - dev-libs/libgcrypt:= - exiv2? ( media-gfx/exiv2 ) - sys-libs/zlib - hashdb? ( dev-libs/hashdb ) - beviewer? ( - || ( virtual/jre:* virtual/jdk:* ) - )" - -DEPEND="${RDEPEND} - dev-db/sqlite:3 - dev-libs/boost - dev-libs/openssl:0= - dev-libs/libxml2 - doc? ( app-text/doxygen ) - virtual/man" - -BDEPEND=" - sys-devel/flex - virtual/pkgconfig" - -src_prepare() { -# eapply "${FILESDIR}/bulk_extractor-2.0.3_uint32_t.patch" - - eautoreconf - default -} - -src_configure() { - econf \ - --disable-o3 \ - --disable-libewf -# $(use ewf || echo "--disable-libewf") -# $(use beviewer || echo "--disable-BEViewer") \ -# $(use exiv2 && echo "--enable-exiv2") \ -# $(use aff || echo "--disable-afflib") \ -# $(use hashdb || echo "--disable-hashdb") \ -# $(use rar || echo "--disable-rar" ) -} - -src_install() { - dobin src/${PN} - doman man/*.1 - dodoc AUTHORS ChangeLog NEWS README.md - - if use doc ; then - pushd doc/doxygen >/dev/null || die - doxygen || die "doxygen failed" - popd >/dev/null || die - - dodoc -r \ - doc/doxygen/html \ - doc/Diagnostics_Notes \ - doc/announce \ - doc/*.{pdf,txt,md} \ - doc/programmer_manual/*.pdf - fi - -# if use beviewer; then -# local bev_dir="/opt/beviewer-${PV}" - -# insinto "${bev_dir}" -# doins java_gui/BEViewer.jar - -# insinto /usr/share/pixmaps -# newins java_gui/icons/24/run-build-install.png ${PN}.png - -# make_wrapper "beviewer" \ -# "/usr/bin/java -Xmx1g -jar \"${bev_dir}/BEViewer.jar\"" -# make_desktop_entry \ -# "beviewer" \ -# "BEViewer (bulk_extractor)" \ -# "${PN}" "Utility" -# fi -} - -#pkg_postinst() { -# if use beviewer; then -# xdg_icon_cache_update -# xdg_desktop_database_update -# fi -#} - -#pkg_postrm() { -# if use beviewer; then -# xdg_icon_cache_update -# xdg_desktop_database_update -# fi -#} diff --git a/app-forensics/bulk_extractor/bulk_extractor-2.1.0.ebuild b/app-forensics/bulk_extractor/bulk_extractor-2.1.1.ebuild similarity index 97% rename from app-forensics/bulk_extractor/bulk_extractor-2.1.0.ebuild rename to app-forensics/bulk_extractor/bulk_extractor-2.1.1.ebuild index e8fedeeb8..abf37cdbb 100644 --- a/app-forensics/bulk_extractor/bulk_extractor-2.1.0.ebuild +++ b/app-forensics/bulk_extractor/bulk_extractor-2.1.1.ebuild @@ -8,6 +8,9 @@ inherit autotools DESCRIPTION="Scans a disk image for regular expressions and other content" HOMEPAGE="https://github.com/simsong/bulk_extractor" SRC_URI="https://github.com/simsong/bulk_extractor/releases/download/v${PV}/${P}.tar.gz" +PATCHES=( + "${FILESDIR}/${P}_uint32_t.patch" +) LICENSE="GPL-2" SLOT="0" diff --git a/app-forensics/bulk_extractor/files/add_exiv2-0.27_api_support.patch b/app-forensics/bulk_extractor/files/add_exiv2-0.27_api_support.patch deleted file mode 100644 index 63b33075a..000000000 --- a/app-forensics/bulk_extractor/files/add_exiv2-0.27_api_support.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur a/src/dfxml/src/dfxml_writer.cpp b/src/dfxml/src/dfxml_writer.cpp ---- a/src/dfxml/src/dfxml_writer.cpp 2014-09-16 22:34:02.000000000 +0400 -+++ b/src/dfxml/src/dfxml_writer.cpp 2019-03-17 10:28:31.797180265 +0300 -@@ -646,6 +646,10 @@ - #include - #include - #include -+#include -+#if EXIV2_TEST_VERSION(0, 27, 0) -+#include -+#endif - #endif - - #ifdef HAVE_HASHDB diff --git a/app-forensics/bulk_extractor/files/bulk_extractor-2.0.3_uint32_t.patch b/app-forensics/bulk_extractor/files/bulk_extractor-2.0.3_uint32_t.patch deleted file mode 100644 index ebbc9dc60..000000000 --- a/app-forensics/bulk_extractor/files/bulk_extractor-2.0.3_uint32_t.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/be20_api/unicode_escape.h b/src/be20_api/unicode_escape.h ---- a/src/be20_api/unicode_escape.h -+++ b/src/be20_api/unicode_escape.h -@@ -8,7 +8,7 @@ - #define UNICODE_ESCAPE_H - - #include --//#include -+#include - #include - #include - #include diff --git a/app-forensics/bulk_extractor/files/bulk_extractor-2.1.1_uint32_t.patch b/app-forensics/bulk_extractor/files/bulk_extractor-2.1.1_uint32_t.patch new file mode 100644 index 000000000..a34e6301d --- /dev/null +++ b/app-forensics/bulk_extractor/files/bulk_extractor-2.1.1_uint32_t.patch @@ -0,0 +1,15 @@ +Add missing include +Fix by rick +https://github.com/simsong/bulk_extractor/issues/491 + +--- a/src/exif_entry.h ++++ b/src/exif_entry.h +@@ -3,7 +3,7 @@ + + #include + #include +- ++#include + + + /**