On 08.11.2013 22:35, Niels Thykier wrote:
However, sleuthkit suffers from #713364 which is a FTBFS bug, so I
have no reason to believe a binNMU will be successful.
[...]
Comments welcome, a fix for #713364 in sid (or deferred) even more so.
I have taken the 2 patches from upstream that I mailed in September to
the bugreport and made a debdiff for a NMU upload. I don't have upload
rights though so I would need a sponsor to actually upload to Debian.
--
Andreas Moog, Berliner Str. 29, 36205 Sontra/Germany
Ubuntu Developer
PGP-encrypted mails preferred (Key-ID: 74DE6624)
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624
diff -Nru sleuthkit-3.2.3/debian/changelog sleuthkit-3.2.3/debian/changelog
--- sleuthkit-3.2.3/debian/changelog2011-10-14 19:52:37.0 +0200
+++ sleuthkit-3.2.3/debian/changelog2013-11-09 22:58:23.0 +0100
@@ -1,3 +1,12 @@
+sleuthkit (3.2.3-2.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * d/patches/95_fix-libewf2-detection.patch, 96_fix_build_libewf2.patch:
+- Add 2 patches from upstream git to fix detection and build against
+ libewf2 (Closes: #713364)
+
+ -- Andreas Moog am...@ubuntu.com Sat, 09 Nov 2013 22:55:04 +0100
+
sleuthkit (3.2.3-2) unstable; urgency=low
* Team upload.
diff -Nru sleuthkit-3.2.3/debian/patches/95_fix-libewf2-detection.patch
sleuthkit-3.2.3/debian/patches/95_fix-libewf2-detection.patch
--- sleuthkit-3.2.3/debian/patches/95_fix-libewf2-detection.patch
1970-01-01 01:00:00.0 +0100
+++ sleuthkit-3.2.3/debian/patches/95_fix-libewf2-detection.patch
2013-11-09 22:54:25.0 +0100
@@ -0,0 +1,17 @@
+Description: Fix detection of libewf v2 API.
+Author: Joachim Metz
+Origin: upstream,
https://github.com/sleuthkit/sleuthkit/commit/ee5515215c1f618bf966d175ace1270fea7c5d4b
+Bug: http://sourceforge.net/p/sleuthkit/bugs/208/
+Last-Update: 2013-08-29
+
+--- sleuthkit-3.2.3.orig/configure.ac
sleuthkit-3.2.3/configure.ac
+@@ -121,7 +121,7 @@ AS_IF([test x$with_libewf != xno],
+ )]
+ # 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_get_version],[
+ AC_SUBST([LIBEWF_LIBS],[-lewf])
+ AC_DEFINE([HAVE_LIBEWF],[1],[Define to have libewf header included.])
+ ])]
diff -Nru sleuthkit-3.2.3/debian/patches/96_fix_build_libewf2.patch
sleuthkit-3.2.3/debian/patches/96_fix_build_libewf2.patch
--- sleuthkit-3.2.3/debian/patches/96_fix_build_libewf2.patch 1970-01-01
01:00:00.0 +0100
+++ sleuthkit-3.2.3/debian/patches/96_fix_build_libewf2.patch 2013-11-09
22:54:25.0 +0100
@@ -0,0 +1,840 @@
+Description: Fix build with libewf2
+Author: Omar Choudary
+Origin: upstream,
https://github.com/sleuthkit/sleuthkit/commit/7dcf7863b449f6058952489b0367cf0c1fbd0964
+Bug: http://sourceforge.net/p/sleuthkit/feature-requests/73/
+Last-Update: 2013-08-30
+
+Index: sleuthkit-3.2.3/tsk3/img/ewf.c
+===
+--- sleuthkit-3.2.3.orig/tsk3/img/ewf.c2013-08-31 10:13:21.397922919
+
sleuthkit-3.2.3/tsk3/img/ewf.c 2013-08-31 11:05:10.793936030 +
+@@ -14,67 +14,160 @@
+ #include tsk_img_i.h
+
+ #if HAVE_LIBEWF
++
+ #include ewf.h
+
+-static ssize_t
+-ewf_image_read(TSK_IMG_INFO * img_info, TSK_OFF_T offset, char *buf,
+-size_t len)
++#define TSK_EWF_ERROR_STRING_SIZE 512
++
++static \
++ssize_t ewf_image_read(
++ TSK_IMG_INFO *img_info,
++ TSK_OFF_T offset,
++ char *buffer,
++ size_t size )
+ {
+-ssize_t cnt;
+-IMG_EWF_INFO *ewf_info = (IMG_EWF_INFO *) img_info;
++#if defined( HAVE_LIBEWF_V2_API )
++ char error_string[ TSK_EWF_ERROR_STRING_SIZE ];
+
+-if (tsk_verbose)
+-tsk_fprintf(stderr,
+-ewf_read: byte offset: % PRIuOFF len: % PRIuSIZE \n,
+-offset, len);
+-
+-if (offset img_info-size) {
+-tsk_error_reset();
+-tsk_errno = TSK_ERR_IMG_READ_OFF;
+-snprintf(tsk_errstr, TSK_ERRSTR_L,
+-split_read - % PRIuOFF, offset);
+-return -1;
+-}
++ libewf_error_t *ewf_error = NULL;
++#endif
+
+-cnt = libewf_read_random(ewf_info-handle, buf, len, offset);
+-if (cnt 0) {
+-tsk_error_reset();
+-// @@@ Add more specific error message
+-tsk_error_reset();
+-tsk_errno = TSK_ERR_IMG_READ;
+-snprintf(tsk_errstr, TSK_ERRSTR_L,
+-ewf_read - offset: % PRIuOFF - len: % PRIuSIZE - %s,
+-offset, len, strerror(errno));
+-return -1;
+-}
++ IMG_EWF_INFO *ewf_info= (IMG_EWF_INFO *) img_info;
++ ssize_t read_count= 0;
++ if( tsk_verbose != 0 )
++ {
++ tsk_fprintf(
++ stderr,
++ ewf_read: byte offset: % PRIuOFF len: % PRIuSIZE \n,
++ offset,
++
