[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.2.3-2-9-g3b58de6

Christophe Monniez christophe.monniez at fccu.be
Thu Apr 11 07:47:55 UTC 2013 

The following commit has been merged in the debian branch:
commit 1b7cb268d23dc29974374e27f474c27005cebf67
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Mon Apr 8 14:41:02 2013 +0200

    Refreshing patches.

diff --git a/debian/patches/10_link-to-sqlite.diff b/debian/patches/10_link-to-sqlite.diff
index b32b15d..3b7455e 100644
--- a/debian/patches/10_link-to-sqlite.diff
+++ b/debian/patches/10_link-to-sqlite.diff
@@ -10,35 +10,35 @@ Forwarded: not-needed
  
  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_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
++libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
  
  indent:
  	indent *.cpp *.h
 --- a/tsk3/auto/Makefile.in
 +++ b/tsk3/auto/Makefile.in
-@@ -43,7 +43,7 @@
+@@ -47,7 +47,7 @@
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libtskauto_la_LIBADD =
--am_libtskauto_la_OBJECTS = auto.lo auto_db.lo sqlite3.lo
-+am_libtskauto_la_OBJECTS = auto.lo auto_db.lo
+-am_libtskauto_la_OBJECTS = auto.lo auto_db.lo sqlite3.lo db_sqlite.lo \
++am_libtskauto_la_OBJECTS = auto.lo auto_db.lo db_sqlite.lo \
+ 	case_db.lo
  libtskauto_la_OBJECTS = $(am_libtskauto_la_OBJECTS)
  DEFAULT_INCLUDES = -I. -I$(top_builddir)/tsk3 at am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-@@ -191,7 +191,7 @@
+@@ -206,7 +206,7 @@
  EXTRA_DIST = .indent.pro
  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_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
++libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
  all: all-am
  
  .SUFFIXES:
-@@ -245,7 +245,6 @@
- 
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/auto.Plo at am__quote@
+@@ -262,7 +262,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/auto_db.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/case_db.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/db_sqlite.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sqlite3.Plo at am__quote@
  
  .c.o:
diff --git a/debian/patches/30_fix-manpages.diff b/debian/patches/30_fix-manpages.diff
index 743191c..09206a1 100644
--- a/debian/patches/30_fix-manpages.diff
+++ b/debian/patches/30_fix-manpages.diff
@@ -2,21 +2,10 @@ 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
+@@ -16,7 +16,7 @@
+ .I image [images]
  .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.
@@ -24,50 +13,17 @@ Last-Update: 2011-06-01
  
  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
-@@ -30,7 +30,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
-@@ -40,7 +40,7 @@
+@@ -47,7 +47,7 @@
  If not given, will attempt to recover all volumes in image and save them
  to different folders. 
  .IP "-d dir_inum"
 -Directory inum to recover from (must also specify a specific partition using -o or there must not be a volume system)
 +Directory inum to recover from (must also specify a specific partition using \-o or there must not be a volume system)
- 
- .SH EXAMPLES
- To recover only unallocated files from image.dd to the recovered directory:
+ .IP "image [images]"
+ The disk or partition image to read, whose format is given with '\-i'.
+ Multiple image file names can be given if the image is split into multiple segments.
 --- a/man/hfind.1
 +++ b/man/hfind.1
 @@ -72,64 +72,64 @@
diff --git a/debian/patches/90_fix_ldflags.diff b/debian/patches/90_fix_ldflags.diff
index c77d20f..c121fa9 100644
--- a/debian/patches/90_fix_ldflags.diff
+++ b/debian/patches/90_fix_ldflags.diff
@@ -2,20 +2,6 @@ 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 @@
@@ -25,5 +11,5 @@ library and tools) by enabling extra LDFLAGS at build time.
 -    auto/libtskauto.la
 +    auto/libtskauto.la @LIBEWF_LIBS@
  # current:revision:age
- libtsk3_la_LDFLAGS = -version-info 7:0:4
+ libtsk3_la_LDFLAGS = -version-info 9:1:0
  
diff --git a/debian/patches/series b/debian/patches/series
index e60d240..7318d01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 10_link-to-sqlite.diff
 30_fix-manpages.diff
-40_fix-typo.diff
 90_fix_ldflags.diff
 99_no_static_ldflags.diff

-- 
debian-forensics/sleuthkit

More information about the forensics-changes mailing list