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

Thu Jun 2 07:07:29 UTC 2011

The following commit has been merged in the debian branch:
commit 9f5b07714fb5f4c60c234501fabb79c30ceaa621
Author: Julien Valroff <julien at kirya.net>
Date:   Wed Jun 1 21:16:03 2011 +0200

    Actually add patch

diff --git a/debian/patches/30_fix-manpages.diff b/debian/patches/30_fix-manpages.diff
new file mode 100644
index 0000000..2a7a8ad
--- /dev/null
+++ b/debian/patches/30_fix-manpages.diff
@@ -0,0 +1,72 @@
+Description: Fixes formatting errors in manpages
+Author: Julien Valroff <julien at debian.org>
+Last-Update: 2011-06-01
+
+--- a/man/tsk_comparedir.1
++++ b/man/tsk_comparedir.1
+@@ -30,7 +30,7 @@
+ .IP -V
+ Print version
+ .IP "-i imgtype"
+-The format of the image file (use '-i list' for supported types)
++The format of the image file (use '\-i list' for supported types)
+ If not given, autodetection methods are used.
+ .IP "-b dev_sector_size"
+ The size (in bytes) of the device sectors
+--- a/man/tsk_gettimes.1
++++ b/man/tsk_gettimes.1
+@@ -14,7 +14,7 @@
+ .I image
+ .SH DESCRIPTION
+ .B tsk_gettimes
+-examines each of the file systems in a disk image and returns the data about them in the MACtime body format (the same as running 'fls -m' on each file system).  The output of this can be used as input to mactime to make a timeline of file activity. The data is printed to STDOUT, which can then be redirected to a file.
++examines each of the file systems in a disk image and returns the data about them in the MACtime body format (the same as running 'fls \-m' on each file system).  The output of this can be used as input to mactime to make a timeline of file activity. The data is printed to STDOUT, which can then be redirected to a file.
+ 
+ The arguments are as follows:
+ .IP -v
+@@ -22,7 +22,7 @@
+ .IP -V
+ Print version
+ .IP "-i imgtype"
+-The format of the image file (use '-i list' for supported types)
++The format of the image file (use '\-i list' for supported types)
+ If not given, autodetection methods are used.
+ .IP "-b dev_sector_size"
+ The size (in bytes) of the device sectors
+--- a/man/tsk_loaddb.1
++++ b/man/tsk_loaddb.1
+@@ -32,10 +32,10 @@
+ Don't create block data table.  This table maps each block to the file that
+ allocated it.  This option will make this program run faster.
+ .IP "-i imgtype"
+-The format of the image file (use '-i list' for supported types)
++The format of the image file (use '\-i list' for supported types)
+ .IP "-b dev_sector_size"
+ The size (in bytes) of the device sectors
+-If -i or -b are not given, autodetection methods are used.
++If \-i or \-b are not given, autodetection methods are used.
+ 
+ .SH EXAMPLES
+ To load image data from image.dd to image.dd.db:
+--- a/man/tsk_recover.1
++++ b/man/tsk_recover.1
+@@ -28,7 +28,7 @@
+ .IP -e
+ Recover all files (allocated and unallocated)
+ .IP "-i imgtype"
+-The format of the image file (use '-i list' for supported types)
++The format of the image file (use '\-i list' for supported types)
+ If not given, autodetection methods are used.
+ .IP "-b dev_sector_size"
+ The size (in bytes) of the device sectors
+--- a/man/hfind.1
++++ b/man/hfind.1
+@@ -95,7 +95,7 @@
+ 
+ 	# hfind /usr/local/hash/nsrl/NSRLFile.txt
+ 	76b1f4de1522c20b67acc132937cf82e
+-	80001A80B3F1B80076B297CEE8805AAA04E1B5BA
++	80001A80B3F1B80076B297CEE8805AAA04E1B5BA 
+ 
+ 	76b1f4de1522c20b67acc132937cf82e  Hash Not Found
+ 
diff --git a/debian/patches/90_fix_ldflags.diff b/debian/patches/90_fix_ldflags.diff
new file mode 100644
index 0000000..70a0186
--- /dev/null
+++ b/debian/patches/90_fix_ldflags.diff
@@ -0,0 +1,28 @@
+Author: Cristian Greco <cristian.debian at gmail.com>
+Description: Avoid linking against unused libraries (this holds both for
+library and tools) by enabling extra LDFLAGS at build time.
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,10 @@
+     )]
+     # Check for the header file first to make sure they have the dev install
+     [AC_CHECK_HEADERS([libewf.h], 
+-      [AC_CHECK_LIB([ewf], [libewf_open])]
++      [AC_CHECK_LIB([ewf], [libewf_open],[
++        AC_SUBST([LIBEWF_LIBS],["-lewf"])
++        AC_DEFINE([HAVE_LIBEWF],[1],[Define to have libewf header included.])
++      ])]
+     )]
+ )
+ 
+--- a/tsk3/Makefile.am
++++ b/tsk3/Makefile.am
+@@ -6,7 +6,7 @@
+ libtsk3_la_SOURCES =
+ libtsk3_la_LIBADD = base/libtskbase.la img/libtskimg.la \
+     vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la \
+-    auto/libtskauto.la
++    auto/libtskauto.la @LIBEWF_LIBS@
+ # current:revision:age
+ libtsk3_la_LDFLAGS = -version-info 6:1:3
+ 
diff --git a/debian/patches/99_no_static_ldflags.diff b/debian/patches/99_no_static_ldflags.diff
new file mode 100644
index 0000000..dec2113
--- /dev/null
+++ b/debian/patches/99_no_static_ldflags.diff
@@ -0,0 +1,59 @@
+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../.. -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 \
+--- a/tools/hashtools/Makefile.am
++++ b/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
+--- a/tools/imgtools/Makefile.am
++++ b/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
+--- 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../.. -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

