[Forensics-changes] [sleuthkit] 04/06: Drop fix-spelling and link-to-sqlite patches
Hilko Bengen
bengen at moszumanska.debian.org
Fri Aug 11 21:45:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch debian
in repository sleuthkit.
commit b44a5667bb05957539b44a5d6b13aec2572726d9
Author: Hilko Bengen <bengen at debian.org>
Date: Wed Aug 9 11:21:09 2017 +0200
Drop fix-spelling and link-to-sqlite patches
---
debian/patches/10_link-to-sqlite.patch | 19 ----
debian/patches/20_fix-spelling-errors.patch | 95 --------------------
debian/patches/30_fix-manpages.patch | 129 +++++++++++++++-------------
debian/patches/40_no-static-ldflags.patch | 34 ++++++--
debian/patches/50_disable-ant-clean.patch | 20 +++--
debian/patches/60_fix-FTBFS-HURD.patch | 18 ++--
debian/patches/series | 2 -
7 files changed, 121 insertions(+), 196 deletions(-)
diff --git a/debian/patches/10_link-to-sqlite.patch b/debian/patches/10_link-to-sqlite.patch
deleted file mode 100644
index 0933fe1..0000000
--- a/debian/patches/10_link-to-sqlite.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: link against libsqlite3 rather than statically linking
- against the embedded library
-Author: Julien Valroff <julien at debian.org>
-Reviewed-by: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Updated: 2017-01-24
-Forwarded: not-needed
-Index: sleuthkit-4.4.0/tsk/auto/Makefile.am
-===================================================================
---- sleuthkit-4.4.0.orig/tsk/auto/Makefile.am
-+++ sleuthkit-4.4.0/tsk/auto/Makefile.am
-@@ -3,7 +3,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 auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp db_postgresql.cpp case_db.cpp guid.cpp tsk_db.cpp tsk_case_db.h tsk_auto.h tsk_auto_i.h tsk_case_db.h tsk_db.h tsk_db_sqlite.h tsk_db_postgresql.h db_connection_info.h guid.h
-+libtskauto_la_SOURCES = auto.cpp auto_db.cpp db_sqlite.cpp db_postgresql.cpp case_db.cpp guid.cpp tsk_db.cpp tsk_case_db.h tsk_auto.h tsk_auto_i.h tsk_case_db.h tsk_db.h tsk_db_sqlite.h tsk_db_postgresql.h db_connection_info.h guid.h
-
- indent:
- indent *.cpp *.h
diff --git a/debian/patches/20_fix-spelling-errors.patch b/debian/patches/20_fix-spelling-errors.patch
deleted file mode 100644
index 11fe57d..0000000
--- a/debian/patches/20_fix-spelling-errors.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: fix spelling errors in upstream source code.
-Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Update: 2016-11-29
-Index: sleuthkit-4.3.1/tsk/auto/auto_db.cpp
-===================================================================
---- sleuthkit-4.3.1.orig/tsk/auto/auto_db.cpp
-+++ sleuthkit-4.3.1/tsk/auto/auto_db.cpp
-@@ -428,7 +428,7 @@ uint8_t
- if (m_db->inTransaction()) {
- tsk_error_reset();
- tsk_error_set_errno(TSK_ERR_AUTO_DB);
-- tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be commited");
-+ tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be committed");
- registerError();
- return 1;
- }
-@@ -485,7 +485,7 @@ uint8_t
- if (m_db->inTransaction()) {
- tsk_error_reset();
- tsk_error_set_errno(TSK_ERR_AUTO_DB);
-- tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be commited");
-+ tsk_error_set_errstr("TskAutoDb::startAddImage(): Already in a transaction, image might not be committed");
- registerError();
- return 1;
- }
-@@ -563,7 +563,7 @@ int64_t
- TskAutoDb::commitAddImage()
- {
- if (tsk_verbose)
-- tsk_fprintf(stderr, "TskAutoDb::commitAddImage: Commiting add image process\n");
-+ tsk_fprintf(stderr, "TskAutoDb::commitAddImage: Committing add image process\n");
-
- if (m_imgTransactionOpen == false) {
- tsk_error_reset();
-Index: sleuthkit-4.3.1/tsk/auto/db_sqlite.cpp
-===================================================================
---- sleuthkit-4.3.1.orig/tsk/auto/db_sqlite.cpp
-+++ sleuthkit-4.3.1/tsk/auto/db_sqlite.cpp
-@@ -160,9 +160,9 @@ uint8_t
- {
-
- if (attempt(sqlite3_bind_int64(m_insertObjectPreparedStmt, 1, parObjId),
-- "TskDbSqlite::addObj: Error binding parent to statment: %s (result code %d)\n")
-+ "TskDbSqlite::addObj: Error binding parent to statement: %s (result code %d)\n")
- || attempt(sqlite3_bind_int(m_insertObjectPreparedStmt, 2, type),
-- "TskDbSqlite::addObj: Error binding type to statment: %s (result code %d)\n")
-+ "TskDbSqlite::addObj: Error binding type to statement: %s (result code %d)\n")
- || attempt(sqlite3_step(m_insertObjectPreparedStmt), SQLITE_DONE,
- "TskDbSqlite::addObj: Error adding object to row: %s (result code %d)\n"))
- {
-@@ -817,13 +817,13 @@ int64_t TskDbSqlite::findParObjId(const
- // Find the parent file id in the database using the parent metadata address
- // @@@ This should use sequence number when the new database supports it
- if (attempt(sqlite3_bind_int64(m_selectFilePreparedStmt, 1, fs_file->name->par_addr),
-- "TskDbSqlite::findParObjId: Error binding meta_addr to statment: %s (result code %d)\n")
-+ "TskDbSqlite::findParObjId: Error binding meta_addr to statement: %s (result code %d)\n")
- || attempt(sqlite3_bind_int64(m_selectFilePreparedStmt, 2, fsObjId),
-- "TskDbSqlite::findParObjId: Error binding fs_obj_id to statment: %s (result code %d)\n")
-+ "TskDbSqlite::findParObjId: Error binding fs_obj_id to statement: %s (result code %d)\n")
- || attempt(sqlite3_bind_text(m_selectFilePreparedStmt, 3, parent_path, -1, SQLITE_STATIC),
-- "TskDbSqlite::findParObjId: Error binding path to statment: %s (result code %d)\n")
-+ "TskDbSqlite::findParObjId: Error binding path to statement: %s (result code %d)\n")
- || attempt(sqlite3_bind_text(m_selectFilePreparedStmt, 4, parent_name, -1, SQLITE_STATIC),
-- "TskDbSqlite::findParObjId: Error binding path to statment: %s (result code %d)\n")
-+ "TskDbSqlite::findParObjId: Error binding path to statement: %s (result code %d)\n")
- || attempt(sqlite3_step(m_selectFilePreparedStmt), SQLITE_ROW,
- "TskDbSqlite::findParObjId: Error selecting file id by meta_addr: %s (result code %d)\n"))
- {
-@@ -1653,7 +1653,7 @@ TSK_RETVAL_ENUM TskDbSqlite::getObjectIn
- }
-
- if (attempt(sqlite3_bind_int64(objectsStatement, 1, objId),
-- "TskDbSqlite::getObjectInfo: Error binding objId to statment: %s (result code %d)\n")
-+ "TskDbSqlite::getObjectInfo: Error binding objId to statement: %s (result code %d)\n")
- || attempt(sqlite3_step(objectsStatement), SQLITE_ROW,
- "TskDbSqlite::getObjectInfo: Error selecting object by objid: %s (result code %d)\n")) {
- sqlite3_finalize(objectsStatement);
-@@ -1687,7 +1687,7 @@ TSK_RETVAL_ENUM TskDbSqlite::getVsInfo(i
- }
-
- if (attempt(sqlite3_bind_int64(vsInfoStatement, 1, objId),
-- "TskDbSqlite::getVsInfo: Error binding objId to statment: %s (result code %d)\n")
-+ "TskDbSqlite::getVsInfo: Error binding objId to statement: %s (result code %d)\n")
- || attempt(sqlite3_step(vsInfoStatement), SQLITE_ROW,
- "TskDbSqlite::getVsInfo: Error selecting object by objid: %s (result code %d)\n")) {
- sqlite3_finalize(vsInfoStatement);
-@@ -1754,7 +1754,7 @@ TSK_RETVAL_ENUM TskDbSqlite::getFsRootDi
- }
-
- if (attempt(sqlite3_bind_int64(rootDirInfoStatement, 1, fsObjId),
-- "TskDbSqlite::getFsRootDirObjectInfo: Error binding objId to statment: %s (result code %d)\n")
-+ "TskDbSqlite::getFsRootDirObjectInfo: Error binding objId to statement: %s (result code %d)\n")
- || attempt(sqlite3_step(rootDirInfoStatement), SQLITE_ROW,
- "TskDbSqlite::getFsRootDirObjectInfo: Error selecting object by objid: %s (result code %d)\n")) {
- sqlite3_finalize(rootDirInfoStatement);
diff --git a/debian/patches/30_fix-manpages.patch b/debian/patches/30_fix-manpages.patch
index 38ac84f..c689164 100644
--- a/debian/patches/30_fix-manpages.patch
+++ b/debian/patches/30_fix-manpages.patch
@@ -1,12 +1,21 @@
-Description: Fixes formatting errors in manpages
-Author: Julien Valroff <julien at debian.org>
-Reviewed-by: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Update: 2015-11-12
-Index: sleuthkit-4.2.0/man/hfind.1
+From: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Date: Sat, 5 Aug 2017 13:57:57 +0200
+Subject: _fix-manpages
+
===================================================================
---- sleuthkit-4.2.0.orig/man/hfind.1
-+++ sleuthkit-4.2.0/man/hfind.1
-@@ -72,64 +72,64 @@ The following input types are valid. Fo
+---
+ man/hfind.1 | 44 ++++++++++++++++++++++----------------------
+ man/mactime.1 | 22 +++++++++++-----------
+ man/tsk_gettimes.1 | 2 +-
+ man/tsk_loaddb.1 | 4 ++--
+ man/tsk_recover.1 | 2 +-
+ 5 files changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/man/hfind.1 b/man/hfind.1
+index 0fc308e..bab801a 100644
+--- a/man/hfind.1
++++ b/man/hfind.1
+@@ -72,64 +72,64 @@ The following input types are valid. For NSRL, 'nsrl-md5' and
sorted by. The 'md5sum' value can also be used to sort and index "home made"
databases. 'hfind' can take data in both common formats:
@@ -93,54 +102,10 @@ Index: sleuthkit-4.2.0/man/hfind.1
.SH "SEE ALSO"
-Index: sleuthkit-4.2.0/man/tsk_gettimes.1
-===================================================================
---- sleuthkit-4.2.0.orig/man/tsk_gettimes.1
-+++ sleuthkit-4.2.0/man/tsk_gettimes.1
-@@ -16,7 +16,7 @@ tsk_gettimes - Collect MAC times from a
- .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.
-+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
-Index: sleuthkit-4.2.0/man/tsk_loaddb.1
-===================================================================
---- sleuthkit-4.2.0.orig/man/tsk_loaddb.1
-+++ sleuthkit-4.2.0/man/tsk_loaddb.1
-@@ -16,11 +16,11 @@ tsk_loaddb - populate a SQLite database
- .B tsk_loaddb
- loads disk information from
- .I image
--to a SQLite database. This database can then be used by tools in other languages for analysis. By default, the database is stored in the same directory as the image with ".db" appended to the name or the database name can be specified with '-d'.
-+to a SQLite database. This database can then be used by tools in other languages for analysis. By default, the database is stored in the same directory as the image with ".db" appended to the name or the database name can be specified with '\-d'.
-
- The arguments are as follows:
- .IP "-a"
--Adds image to an existing database instead of creating a new one. Requires that -d be also specified.
-+Adds image to an existing database instead of creating a new one. Requires that \-d be also specified.
- .IP "-d database"
- Path for the database (default is the same directory as the image with name derived from image name
- .IP -v
-Index: sleuthkit-4.2.0/man/tsk_recover.1
-===================================================================
---- sleuthkit-4.2.0.orig/man/tsk_recover.1
-+++ sleuthkit-4.2.0/man/tsk_recover.1
-@@ -47,7 +47,7 @@ Sector offset for a volume to recover (r
- 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)
- .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.
-Index: sleuthkit-4.2.0/man/mactime.1
-===================================================================
---- sleuthkit-4.2.0.orig/man/mactime.1
-+++ sleuthkit-4.2.0/man/mactime.1
+diff --git a/man/mactime.1 b/man/mactime.1
+index e874dd2..ddd5976 100644
+--- a/man/mactime.1
++++ b/man/mactime.1
@@ -1,8 +1,8 @@
-.TH MACTIME 1
+.TH MACTIME 1
@@ -152,7 +117,7 @@ Index: sleuthkit-4.2.0/man/mactime.1
.I body
.B ] [-g
.I group file
-@@ -17,7 +17,7 @@ mactime \- Create an ASCII time line of
+@@ -17,7 +17,7 @@ mactime \- Create an ASCII time line of file activity
.B mactime
creates an ASCII time line of file activity based on the body file
specified by '\-b' or from STDIN. The time line is written to STDOUT.
@@ -161,7 +126,7 @@ Index: sleuthkit-4.2.0/man/mactime.1
by 'ils \-m', 'fls \-m', or the mac-robber tool.
.SH ARGUMENTS
-@@ -29,13 +29,13 @@ tools can also be used to generate the f
+@@ -29,13 +29,13 @@ tools can also be used to generate the file.
Specify the location of the group file. mactime will display the group
name instead of the GID if this is given.
.IP "-p password file"
@@ -179,7 +144,7 @@ Index: sleuthkit-4.2.0/man/mactime.1
.IP -d
Display timeline and index files in comma delimited format. This is used
to import the data into a spread sheet for presentations or graphs.
-@@ -43,14 +43,14 @@ to import the data into a spread sheet f
+@@ -43,14 +43,14 @@ to import the data into a spread sheet for presentations or graphs.
Display header info about the session including time range, input source,
and passwd or group files.
.IP -V
@@ -197,7 +162,7 @@ Index: sleuthkit-4.2.0/man/mactime.1
.IP "-z list"
List valid timezones.
.IP DATE_RANGE
-@@ -61,7 +61,7 @@ Date can contain time, use format yyyy-m
+@@ -61,7 +61,7 @@ Date can contain time, use format yyyy-mm-ddThh:mm:ss for starting and/or
ending date.
.SH LICENSE
@@ -206,3 +171,47 @@ Index: sleuthkit-4.2.0/man/mactime.1
.I cpl1.0.txt
file in the The Sleuth Kit licenses directory.
+diff --git a/man/tsk_gettimes.1 b/man/tsk_gettimes.1
+index eb831cd..c429a02 100644
+--- a/man/tsk_gettimes.1
++++ b/man/tsk_gettimes.1
+@@ -16,7 +16,7 @@ tsk_gettimes - Collect MAC times from a disk image into a body file.
+ .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.
++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
+diff --git a/man/tsk_loaddb.1 b/man/tsk_loaddb.1
+index d8f610a..1379ec2 100644
+--- a/man/tsk_loaddb.1
++++ b/man/tsk_loaddb.1
+@@ -16,11 +16,11 @@ tsk_loaddb - populate a SQLite database with metadata from a disk image
+ .B tsk_loaddb
+ loads disk information from
+ .I image
+-to a SQLite database. This database can then be used by tools in other languages for analysis. By default, the database is stored in the same directory as the image with ".db" appended to the name or the database name can be specified with '-d'.
++to a SQLite database. This database can then be used by tools in other languages for analysis. By default, the database is stored in the same directory as the image with ".db" appended to the name or the database name can be specified with '\-d'.
+
+ The arguments are as follows:
+ .IP "-a"
+-Adds image to an existing database instead of creating a new one. Requires that -d be also specified.
++Adds image to an existing database instead of creating a new one. Requires that \-d be also specified.
+ .IP "-d database"
+ Path for the database (default is the same directory as the image with name derived from image name
+ .IP -v
+diff --git a/man/tsk_recover.1 b/man/tsk_recover.1
+index 4ab9585..2c5e6fb 100644
+--- a/man/tsk_recover.1
++++ b/man/tsk_recover.1
+@@ -47,7 +47,7 @@ Sector offset for a volume to recover (recovers only that volume)
+ 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)
+ .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.
diff --git a/debian/patches/40_no-static-ldflags.patch b/debian/patches/40_no-static-ldflags.patch
index 72bf711..80913a9 100644
--- a/debian/patches/40_no-static-ldflags.patch
+++ b/debian/patches/40_no-static-ldflags.patch
@@ -1,8 +1,18 @@
-Description: Drop `-static` from LDFLAGS from tools/*/Makefile.am in order to
- avoid sleuthkit tools to be statically linked against libtsk.
-Author: Cristian Greco <cristian at regolo.cc>
-Reviewed-by: Joao Eriberto Mota Filho
-Last-Update: 2013-12-04
+From: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Date: Sat, 5 Aug 2017 13:57:57 +0200
+Subject: _no-static-ldflags
+
+---
+ tools/autotools/Makefile.am | 1 -
+ tools/fstools/Makefile.am | 1 -
+ tools/hashtools/Makefile.am | 1 -
+ tools/imgtools/Makefile.am | 1 -
+ tools/srchtools/Makefile.am | 1 -
+ tools/vstools/Makefile.am | 1 -
+ 6 files changed, 6 deletions(-)
+
+diff --git a/tools/autotools/Makefile.am b/tools/autotools/Makefile.am
+index 75a5879..98a866e 100644
--- a/tools/autotools/Makefile.am
+++ b/tools/autotools/Makefile.am
@@ -1,6 +1,5 @@
@@ -12,15 +22,19 @@ Last-Update: 2013-12-04
EXTRA_DIST = .indent.pro
bin_PROGRAMS = tsk_recover tsk_loaddb tsk_comparedir tsk_gettimes
+diff --git a/tools/fstools/Makefile.am b/tools/fstools/Makefile.am
+index 21cac01..a65828c 100644
--- a/tools/fstools/Makefile.am
+++ b/tools/fstools/Makefile.am
@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
LDADD = ../../tsk/libtsk.la
-LDFLAGS += -static
EXTRA_DIST = .indent.pro fscheck.cpp
bin_PROGRAMS = blkcalc blkcat blkls blkstat ffind fls fcat fsstat icat ifind ils \
+diff --git a/tools/hashtools/Makefile.am b/tools/hashtools/Makefile.am
+index 9570377..c7df1c8 100644
--- a/tools/hashtools/Makefile.am
+++ b/tools/hashtools/Makefile.am
@@ -1,6 +1,5 @@
@@ -30,6 +44,8 @@ Last-Update: 2013-12-04
EXTRA_DIST = .indent.pro md5.c sha1.c
bin_PROGRAMS = hfind
+diff --git a/tools/imgtools/Makefile.am b/tools/imgtools/Makefile.am
+index 4a2c291..32bf716 100644
--- a/tools/imgtools/Makefile.am
+++ b/tools/imgtools/Makefile.am
@@ -1,6 +1,5 @@
@@ -39,9 +55,11 @@ Last-Update: 2013-12-04
EXTRA_DIST = .indent.pro
bin_PROGRAMS = img_cat img_stat
+diff --git a/tools/srchtools/Makefile.am b/tools/srchtools/Makefile.am
+index e7f8a75..b5d3211 100644
--- a/tools/srchtools/Makefile.am
+++ b/tools/srchtools/Makefile.am
-@@ -6,7 +6,6 @@
+@@ -6,7 +6,6 @@ srch_strings_SOURCES = srch_strings.c
sigfind_SOURCES = sigfind.cpp
sigfind_LDADD = ../../tsk/libtsk.la
@@ -49,6 +67,8 @@ Last-Update: 2013-12-04
indent:
indent *.c *.cpp
+diff --git a/tools/vstools/Makefile.am b/tools/vstools/Makefile.am
+index 2ac9c21..b3140c2 100644
--- a/tools/vstools/Makefile.am
+++ b/tools/vstools/Makefile.am
@@ -1,6 +1,5 @@
diff --git a/debian/patches/50_disable-ant-clean.patch b/debian/patches/50_disable-ant-clean.patch
index fadc2e3..d99e7b4 100644
--- a/debian/patches/50_disable-ant-clean.patch
+++ b/debian/patches/50_disable-ant-clean.patch
@@ -1,11 +1,17 @@
-Description: cancel the 'ant clean' command.
-Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Update: 2014-03-11
-Index: sleuthkit-4.1.3/bindings/java/Makefile.am
+From: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Date: Sat, 5 Aug 2017 13:57:57 +0200
+Subject: _disable-ant-clean
+
===================================================================
---- sleuthkit-4.1.3.orig/bindings/java/Makefile.am 2014-01-27 01:27:02.000000000 -0200
-+++ sleuthkit-4.1.3/bindings/java/Makefile.am 2014-03-11 20:30:56.588842013 -0300
-@@ -12,5 +12,5 @@
+---
+ bindings/java/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
+index 0d5bb77..fb20093 100644
+--- a/bindings/java/Makefile.am
++++ b/bindings/java/Makefile.am
+@@ -12,5 +12,5 @@ all-local:
CLEANFILES = $(tsk_jar)
diff --git a/debian/patches/60_fix-FTBFS-HURD.patch b/debian/patches/60_fix-FTBFS-HURD.patch
index 4f01f98..e49a45a 100644
--- a/debian/patches/60_fix-FTBFS-HURD.patch
+++ b/debian/patches/60_fix-FTBFS-HURD.patch
@@ -1,10 +1,16 @@
-Description: fix a FTBFS in HURD.
-Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Update: 2015-05-11
-Index: sleuthkit-4.1.3/tools/autotools/tsk_recover.cpp
+From: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Date: Sat, 5 Aug 2017 13:57:57 +0200
+Subject: _fix-FTBFS-HURD
+
===================================================================
---- sleuthkit-4.1.3.orig/tools/autotools/tsk_recover.cpp
-+++ sleuthkit-4.1.3/tools/autotools/tsk_recover.cpp
+---
+ tools/autotools/tsk_recover.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/autotools/tsk_recover.cpp b/tools/autotools/tsk_recover.cpp
+index ac9acb1..8043b49 100644
+--- a/tools/autotools/tsk_recover.cpp
++++ b/tools/autotools/tsk_recover.cpp
@@ -14,6 +14,10 @@
#include <sys/stat.h>
#include <errno.h>
diff --git a/debian/patches/series b/debian/patches/series
index 239ea9b..bae6ef8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-10_link-to-sqlite.patch
-20_fix-spelling-errors.patch
30_fix-manpages.patch
40_no-static-ldflags.patch
50_disable-ant-clean.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/sleuthkit.git
More information about the forensics-changes
mailing list