[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.1.3-1-11-gddc48dd

[Julien Valroff]

The following commit has been merged in the debian branch:
commit c1daa5669da8acdcb4406a7f929f36d2a1536a56
Author: Julien Valroff <julien at kirya.net>
Date:   Sat May 7 16:55:17 2011 +0200

    Refresh patch to prevent static linking

diff --git a/debian/patches/99_no_static_ldflags.patch b/debian/patches/99_no_static_ldflags.patch
index 89c8705..dec2113 100644
--- a/debian/patches/99_no_static_ldflags.patch
+++ b/debian/patches/99_no_static_ldflags.patch
@@ -5,7 +5,7 @@ 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 
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
  LDADD = ../../tsk3/libtsk3.la
 -LDFLAGS += -static
  EXTRA_DIST = .indent.pro fscheck.cpp
@@ -14,7 +14,7 @@ avoid sleuthkit tools to be statically linked against libtsk.
 --- a/tools/hashtools/Makefile.am
 +++ b/tools/hashtools/Makefile.am
 @@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -Wall 
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
  LDADD = ../../tsk3/libtsk3.la
 -LDFLAGS += -static
  EXTRA_DIST = .indent.pro md5.c sha1.c
@@ -23,7 +23,7 @@ avoid sleuthkit tools to be statically linked against libtsk.
 --- a/tools/imgtools/Makefile.am
 +++ b/tools/imgtools/Makefile.am
 @@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -Wall
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
  LDADD = ../../tsk3/libtsk3.la
 -LDFLAGS += -static
  EXTRA_DIST = .indent.pro
@@ -42,9 +42,18 @@ avoid sleuthkit tools to be statically linked against libtsk.
 --- a/tools/vstools/Makefile.am
 +++ b/tools/vstools/Makefile.am
 @@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -Wall 
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
  LDADD = ../../tsk3/libtsk3.la
 -LDFLAGS += -static
  EXTRA_DIST = .indent.pro
  
  bin_PROGRAMS = mmls mmstat mmcat
+--- a/tools/autotools/Makefile.am
++++ b/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

-- 
debian-forensics/sleuthkit