Version bump. Use system sqlite library (bug #383129) and respect LDFLAGS (bug #336951).

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

5 files changed, 137 insertions, 10 deletions

diff --git a/app-forensics/sleuthkit/ChangeLog b/app-forensics/sleuthkit/ChangeLog
index 845efd06eee6..59c7608ad2b4 100644
--- a/app-forensics/sleuthkit/ChangeLog
+++ b/app-forensics/sleuthkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/sleuthkit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/ChangeLog,v 1.52 2011/12/10 22:15:38 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/ChangeLog,v 1.53 2012/02/27 22:06:12 radhermit Exp $
+
+*sleuthkit-3.2.3 (27 Feb 2012)
+
+  27 Feb 2012; Tim Harder <radhermit@gentoo.org> +sleuthkit-3.2.3.ebuild,
+  +files/sleuthkit-3.2.3-system-sqlite.patch,
+  +files/sleuthkit-3.2.3-tools-shared-libs.patch:
+  Version bump. Use system sqlite library (bug #383129) and respect LDFLAGS
+  (bug #336951).
 
   10 Dec 2011; Tim Harder <radhermit@gentoo.org> sleuthkit-3.2.1.ebuild,
   sleuthkit-3.2.2.ebuild:
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 6bbcd046a144..8817fdde8451 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX sleuthkit-3.2.3-system-sqlite.patch 623 RMD160 7483338ca75b63035833985a4182840df0794a70 SHA1 7b49a87bb43050139f0ff3c6bb28e74cda44e4f9 SHA256 c896f9e9cfb931710e5b27758acdde5d592caf8c9cb472815d4ba6741526bd1d
+AUX sleuthkit-3.2.3-tools-shared-libs.patch 1685 RMD160 4f10f26a104c5191db2e8d394ebdd540d613c969 SHA1 712fb67f1291722a2f49c37f93f329313084c2a4 SHA256 1126fa5b95cfa090426576b5e04a3b1a3814b63f0196f5216157929133ba6ec6
 AUX sleuthkit-fscheck.c_fix.patch 2866 RMD160 cb0f7b3074df2a009dc6a213555a583deae5abfe SHA1 45697778aaf36c4c5c0fc7740b85266cd4de44c6 SHA256 3115ebcbc6d39bce88448c7c624f855c0a7fb0fd83f2d6dc1e02828b631e13dd
 AUX sleuthkit-makefiles_fix.patch 4069 RMD160 ab25ef83d21215789d56803b0689f05e798c84ea SHA1 f1247415930133509a1ad0a620c480c17c6b7656 SHA256 9ee0451f194b4e434b70720b568549b09e078a514617f82123db6214401d6448
 DIST sleuthkit-2.09.tar.gz 2027006 RMD160 0d7247c533f35f0cb7d11ead8d2242533d89fda4 SHA1 9d2db6868026d887a83b0becb4d95a69527df457 SHA256 43c62d9c2767a0acee4e9aab895c743c2ecdc758ebfab2d0062ddf353ebf2803
@@ -9,21 +11,23 @@ DIST sleuthkit-3.0.0.tar.gz 814597 RMD160 971213ab039ebe3c7020ab890e43d17a2f89bc
 DIST sleuthkit-3.1.0.tar.gz 842104 RMD160 543f7fae08a289bf11d2caa8c0d0c091cb909038 SHA1 60a597d394841360c2130a9060333ad7a6482e17 SHA256 f6f5b9d0206aa057e83a3dee3be6ebea59843c5ae44af39f415ccac28e1c4dc5
 DIST sleuthkit-3.2.1.tar.gz 2033920 RMD160 d20a6e46da9aef30117f93a24701a18c5d513626 SHA1 07966f3b95e00569d0df826fa713b8272b272bf6 SHA256 e0f257d2c6856dc1c1cd2a704c6cb8906ca688f0cdbb1d0665fd7a5a2f83ad37
 DIST sleuthkit-3.2.2.tar.gz 2035364 RMD160 377278239d61397c11bac3a01544edbba9efaec6 SHA1 459b622e0099f2d7c9e75d49fd44c23cda8ff887 SHA256 f2558b79c2ebc259a0e1eb6a3035b5f9aa8021a47cb0ade36d01beb57b99110a
+DIST sleuthkit-3.2.3.tar.gz 2039699 RMD160 ee9849ff34bd7d1ce90819f22f1e09a71e4d0e8c SHA1 85d100ffde54f051916a4ea9452563ff85fad4ac SHA256 ba5f63d7fd60d978de03777c72b1571004caa8dfe384f09757b6a8efa890ea62
 EBUILD sleuthkit-2.09.ebuild 2130 RMD160 8939d51bee3649b58c8a42cf356956f75af16c26 SHA1 ad2a42dcd4d8ba35b56fa98860faf06f7a86f445 SHA256 d159a4b4a5676f0e9eed9448228676ab4cada4a777e3ba8c9cbdad1aadfbcf99
 EBUILD sleuthkit-3.0.0-r1.ebuild 953 RMD160 b68c0ba4ec0c855a5dd370ffb6d35e6e5fb85a05 SHA1 933614d8ef7cc2b66b411c7b31714f88008088fb SHA256 8dbe62899481a11011a9867095f5afd46619b78753f13b204559fea76153f11b
 EBUILD sleuthkit-3.1.0.ebuild 950 RMD160 7a0d65794e0872996d0db41a48dd73244e2bbf6b SHA1 fe9b53989f5fcbc534efc4746557266ca4080fce SHA256 0c16a4a95143ad4b6ea7c92f0b108d06872e781972ae63640ef7a60d2f468255
 EBUILD sleuthkit-3.2.1.ebuild 756 RMD160 dd7f172765b6df7e0ad850175eb09a6af9911bce SHA1 b422a4730dc303a8ca0a1da92a1db43facd2d750 SHA256 1220df5a6a8e0d23bc7e21b261a94ae54209d010f43c30acb3e30deb41214869
 EBUILD sleuthkit-3.2.2.ebuild 730 RMD160 c71b3263533faec4c3ce104104378507bc7be0e3 SHA1 b6e14e517d56abe09fe0a125b4cbd2dad0077fa1 SHA256 3ef94d080c7f9135c6c80e50d9b080d883bad4c1089802c6f7b868806d37316f
-MISC ChangeLog 9025 RMD160 21c7499d649723a7708b23fe2ae88687a77b3e8b SHA1 82218355310cc8ec147eeaba1e21bb94d07a94e2 SHA256 da860662139c613208548f148b72175127a89b80bf7efdb46396d18bd8ff5d88
+EBUILD sleuthkit-3.2.3.ebuild 940 RMD160 6fabc43c9379ab021963ba1a4721c00625f952d7 SHA1 3438ad1fc4fd64a5b0789fbe69d7cc3982d394e8 SHA256 0e1b875b1cb2eeae303d964494db244329194ece2b414f74ea4c78c384155058
+MISC ChangeLog 9321 RMD160 6b0a7416ec1c96809112d471109459d6b75c3890 SHA1 ff409dcb68b94eb46be16b81a9201d75a738061b SHA256 2510b247d63fa44c1765b001768ce1cc3b907cad6ad58b9e3a266435d940e2dc
 MISC metadata.xml 411 RMD160 80696a4e5d3c78ad879a2269e2cec28f8502d9df SHA1 e114e5a12d6c1fcd095d973d7bdf233a208af01a SHA256 9838db9fe7a909fb1e04e3b8ab5b762adf3fad4d78d4355ba523b589326a451a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO49oYAAoJEEqz6FtPBkyj/csH/RImeN+zUUglQd3UQngJmsAd
-ZNOgi4H37+iEUOtYxzE8TDQp18/FWDF7AbDLZY9g1Mq4u30rvCMvJdXVwkcOgcvq
-7i2Hw7T8m5a8MvYGVP153ZUVOCZTIMbJAap62iPeait4eC5UD9U2DTRyM+SINWkz
-8yRv9CXoc5bo2rqzeXMhWGxcD68Qzgq6IQ1VnM70nu4h1T/rNxShGYdI4AZqzvEd
-fz0D3OVl9nXZGXeocGZQrT/r8ogPex14z7ohjMK4slrmNj8Pv5QGNMaTHeeLpYes
-kxixBi0ROldh4iOQ15ilLvCU3txvEJm1e8foRh1stQF6wESpuWT2885UWInVizo=
-=tSxo
+iQEcBAEBCgAGBQJPS/5dAAoJEEqz6FtPBkyjPYIH/RUf151QVUrEo6XWke4XCMOB
++ySo9Sk/imejSsQCcBpWAhMbQ3oEHLzKvcYTsqLUiSkZyCY3+kN3mHFlWCaPk2s7
+Wi9KPPjgam6Qgpo2RziwDkp7ABaKG/iLU2GIC7uUE0nnLZBOVmM9ijEENAdfGJiD
+QuUF3Fh4Iu+H4eWP+PUsYz0Ms72zRLqibRXRDcWWHWMBEAfaKOgnEpZk5h4EIX6I
+WiiSliliM+fo3Xo6HMOjvfWBMfkYaNbcGbc4AmOkWnYbknzUG/Eow4Z0V9ba+pOc
+bpqt1Xv2+6XUaJhFXHc91nLtO/BIV47oMKvk4d+t8wGQHuUbhDYtNL8vncLj35E=
+=YFvs
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/sleuthkit/files/sleuthkit-3.2.3-system-sqlite.patch b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-system-sqlite.patch
new file mode 100644
index 000000000000..95aa3f270e54
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-system-sqlite.patch
@@ -0,0 +1,23 @@
+--- sleuthkit-3.2.3/tsk3/auto/auto_db.cpp
++++ sleuthkit-3.2.3/tsk3/auto/auto_db.cpp
+@@ -14,7 +14,7 @@
+  */
+ 
+ #include "tsk_auto_i.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ #include <string.h>
+ 
+ #define TSK_SCHEMA_VER 1
+--- sleuthkit-3.2.3/tsk3/auto/Makefile.am
++++ sleuthkit-3.2.3/tsk3/auto/Makefile.am
+@@ -3,7 +3,8 @@
+ 
+ noinst_LTLIBRARIES = libtskauto.la
+ # Note that the .h files are in the top-level Makefile
+-libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h
++libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp
++libtskauto_la_LIBADD = -lsqlite3
+ 
+ indent:
+ 	indent *.cpp *.h
diff --git a/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch
new file mode 100644
index 000000000000..749c67030046
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch
@@ -0,0 +1,55 @@
+--- sleuthkit-3.2.3/tools/autotools/Makefile.am
++++ sleuthkit-3.2.3/tools/autotools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = tsk_recover tsk_loaddb tsk_comparedir tsk_gettimes
+--- sleuthkit-3.2.3/tools/fstools/Makefile.am
++++ sleuthkit-3.2.3/tools/fstools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro fscheck.cpp
+ 
+ bin_PROGRAMS = blkcalc blkcat blkls blkstat ffind fls fsstat icat ifind ils \
+--- sleuthkit-3.2.3/tools/hashtools/Makefile.am
++++ sleuthkit-3.2.3/tools/hashtools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro md5.c sha1.c
+ 
+ bin_PROGRAMS = hfind
+--- sleuthkit-3.2.3/tools/imgtools/Makefile.am
++++ sleuthkit-3.2.3/tools/imgtools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = img_cat img_stat
+--- sleuthkit-3.2.3/tools/srchtools/Makefile.am
++++ sleuthkit-3.2.3/tools/srchtools/Makefile.am
+@@ -6,7 +6,6 @@
+ 
+ sigfind_SOURCES = sigfind.cpp 
+ sigfind_LDADD = ../../tsk3/libtsk3.la
+-sigfind_LDFLAGS = -static
+ 
+ indent:
+ 	indent *.c *.cpp
+--- sleuthkit-3.2.3/tools/vstools/Makefile.am
++++ sleuthkit-3.2.3/tools/vstools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = mmls mmstat mmcat
diff --git a/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild b/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild
new file mode 100644
index 000000000000..2797e2328225
--- /dev/null
+++ b/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild,v 1.1 2012/02/27 22:06:12 radhermit Exp $
+
+EAPI="4"
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils autotools-utils
+
+DESCRIPTION="A collection of file system and media management forensic analysis tools"
+HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 IBM"
+SLOT=0
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="aff ewf static-libs"
+
+DEPEND="ewf? ( app-forensics/libewf[-ewf2] )
+	aff? ( app-forensics/afflib )"
+RDEPEND="${DEPEND}
+	dev-perl/DateManip"
+
+DOCS=( NEWS.txt README.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-sqlite.patch
+	"${FILESDIR}"/${P}-tools-shared-libs.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with aff afflib)
+		$(use_with ewf libewf)
+	)
+	autotools-utils_src_configure
+}