[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.1.1-1-4-g12f32fa

[Cristian Greco]

The following commit has been merged in the debian branch:
commit dfc5c4f9eaa27d9b7b50a27affb7bb7aeb0dd697
Author: Cristian Greco <cristian at regolo.cc>
Date:   Tue Jun 15 21:57:32 2010 +0200

    New patch, 99_no_static_ldflags.patch: drop `-static` from LDFLAGS from tools/*/Makefile.am in order to avoid sleuthkit tools to be statically linked against libtsk.

diff --git a/debian/patches/99_no_static_ldflags.patch b/debian/patches/99_no_static_ldflags.patch
new file mode 100644
index 0000000..89c8705
--- /dev/null
+++ b/debian/patches/99_no_static_ldflags.patch
@@ -0,0 +1,50 @@
+Author: Cristian Greco <cristian at regolo.cc>
+Description: Drop `-static` from LDFLAGS from tools/*/Makefile.am in order to
+avoid sleuthkit tools to be statically linked against libtsk.
+
+--- a/tools/fstools/Makefile.am
++++ b/tools/fstools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -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 \
+--- a/tools/hashtools/Makefile.am
++++ b/tools/hashtools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro md5.c sha1.c
+ 
+ bin_PROGRAMS = hfind
+--- a/tools/imgtools/Makefile.am
++++ b/tools/imgtools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -Wall
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = img_cat img_stat
+--- a/tools/srchtools/Makefile.am
++++ b/tools/srchtools/Makefile.am
+@@ -6,7 +6,6 @@
+ 
+ sigfind_SOURCES = sigfind.cpp 
+ sigfind_LDADD = ../../tsk3/libtsk3.la
+-sigfind_LDFLAGS = -static
+ 
+ indent:
+ 	indent *.c *.cpp
+--- a/tools/vstools/Makefile.am
++++ b/tools/vstools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = mmls mmstat mmcat
diff --git a/debian/patches/series b/debian/patches/series
index b7116d7..894fdfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 90_fix_ldflags.patch
+99_no_static_ldflags.patch

-- 
debian-forensics/sleuthkit