[Forensics-changes] [SCM] debian-forensics/ext3grep branch, debian, updated. debian/0.10.1-3-25-ge8049fb

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 08dbe62337a36e7be663ebe669137d9edc1e6d24
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Dec 10 08:57:48 2011 +0100

    Add patch to fix FTBFS with recent versions of e2fsrogs (Closes: #634412) thanks to Peter Green

diff --git a/debian/changelog b/debian/changelog
index f889619..75ed995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,10 @@ ext3grep (0.10.2-1) unstable; urgency=low
   * Add sh4 to arch list - thanks to Nobuhiro Iwamatsu <iwamatsu at debian.org>
     (Closes: #617447)
   * Use versioned DEP-5 uri
+  * Add patch to fix FTBFS with recent versions of e2fsrogs (Closes: #634412)
+    thanks to Peter Green
 
- -- Julien Valroff <julien at debian.org>  Sun, 18 Sep 2011 14:43:21 +0200
+ -- Julien Valroff <julien at debian.org>  Sat, 10 Dec 2011 08:54:47 +0100
 
 ext3grep (0.10.1-3.1) unstable; urgency=low
 
diff --git a/debian/patches/001_fix-ftbfs-e2fsprogs_1.42-WIP-702.diff b/debian/patches/001_fix-ftbfs-e2fsprogs_1.42-WIP-702.diff
new file mode 100644
index 0000000..e009aef
--- /dev/null
+++ b/debian/patches/001_fix-ftbfs-e2fsprogs_1.42-WIP-702.diff
@@ -0,0 +1,40 @@
+Description: Fix FTBFS with e2fsprogs v. 1.42-WIP-702
+Author: Peter Green <peter.green at postgrad.manchester.ac.uk>
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=14;filename=ext3grep.diff;att=1;bug=634412
+Bug: http://code.google.com/p/ext3grep/issues/detail?id=34
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634412
+Forwarded: yes
+
+--- a/src/ext3.h
++++ b/src/ext3.h
+@@ -24,6 +24,17 @@
+ #ifndef EXT3_H
+ #define EXT3_H
+ 
++// this trickery needs to happen before ext2_fs is included so
++// bail out if it has already been included by another path
++#ifdef _LINUX_EXT2_FS_H
++  #error please include this file before any other includes of ext2fs/ext2_fs.h
++#endif
++
++// some versions of the ext2 headers call this s_frags_per_group and some
++// call it s_clusters_per_group, define one to the other so our code works 
++// with both
++#define s_clusters_per_group s_frags_per_group
++
+ // Use the header files from e2progs (http://e2fsprogs.sourceforge.net)
+ // We can use these headers and then everything named ext2 or ext3.
+ #include <ext2fs/ext2_fs.h>			// Definitions of ext2, ext3 and ext4.
+@@ -110,6 +121,12 @@
+     __u32 faddr(void) const { return i_faddr; }
+     __u16 uid_high(void) const { return i_uid_high; }
+     __u16 gid_high(void) const { return i_gid_high; }
++#ifndef i_reseved2
++    //i_reseved2 has been split into two fields in recent 
++    //versions of the headers, luckilly we can still access
++    //it in one peice through the hurd side of the union
++    #define i_reserved2 osd2.hurd2.h_i_author
++#endif
+     __u32 reserved2(void) const { return i_reserved2; }
+ 
+     void set_reserved2(__u32 val) { i_reserved2 = val; }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2872574
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_fix-ftbfs-e2fsprogs_1.42-WIP-702.diff

-- 
debian-forensics/ext3grep