[Forensics-changes] [SCM] debian-forensics/extundelete branch, debian, updated. debian/0.2.0-1-5-g909bcd9

[Michael Prokop]

The following commit has been merged in the debian branch:
commit 264d96d33c6da5af22fc746e18a7b7190da7741f
Author: Michael Prokop <mika at debian.org>
Date:   Wed Jan 11 16:28:57 2012 +0100

    Add three patches addressing compile issues with e2fslibs-dev >=1.42-1
    
    All of them have been forwarded to upstream,
    Nic Cas <number9652 at users.sourceforge.net>

diff --git a/debian/patches/02_fix_reserved2_checksum_lo_compile_issue.patch b/debian/patches/02_fix_reserved2_checksum_lo_compile_issue.patch
new file mode 100644
index 0000000..606e5f7
--- /dev/null
+++ b/debian/patches/02_fix_reserved2_checksum_lo_compile_issue.patch
@@ -0,0 +1,18 @@
+Description: fix compile error regarding linux2.l_i_reserved2 deprecation
+  See git commit 89efc88e65136ece22708cc28ec4124a33feeecd
+  "libext2fs: add metadata checksum and snapshot feature flags"
+  in upstreams e2fsprogs repository
+Forwarded: yes
+Author: Michael Prokop <mika at debian.org>
+Last-Update: 2011-01-11
+
+--- a/src/extundelete.cc
++++ b/src/extundelete.cc
+@@ -2611,5 +2611,6 @@ void parse_inode_block(struct ext2_inode *inode, const char *buf, ext2_ino_t ino
+   //FIXME: need to change behavior depending on the fs operating system
+ 	inode->osd2.linux2.l_i_uid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*58] );
+ 	inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*60] );
+-	inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *) &inodebuf[item*62] );
++	inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *) &inodebuf[item*62] );
++	inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *) &inodebuf[item*63] );
+ }
diff --git a/debian/patches/03_fix_opaque_ext2_group_desc_compile_error.patch b/debian/patches/03_fix_opaque_ext2_group_desc_compile_error.patch
new file mode 100644
index 0000000..d81d807
--- /dev/null
+++ b/debian/patches/03_fix_opaque_ext2_group_desc_compile_error.patch
@@ -0,0 +1,18 @@
+Description: fix FTBFS of #634401 regarding opaque_ext2_group_desc
+  extundelete: FTBFS: extundelete.cc:963:47: error:
+   invalid use of incomplete type 'struct opaque_ext2_group_desc'
+Forwarded: yes
+Author: Eric Sandeen <sandeen at redhat.com>
+Last-Update: 2011-01-11
+
+--- a/src/extundelete.cc
++++ b/src/extundelete.cc
+@@ -941,7 +941,7 @@ int load_super_block(ext2_filsys fs)
+ 	group_descriptor_table = new ext2_group_desc[groups_];
+ 	for (uint32_t n = 0; n < fs->group_desc_count; n++)
+ 	{
+-		group_descriptor_table[n] = fs->group_desc[n];
++		group_descriptor_table[n] = *ext2fs_group_desc(fs, fs->group_desc, n);
+ 	}
+ 	return errcode;
+ }
diff --git a/debian/patches/04_fix_frags_per_group_compile_error.patch b/debian/patches/04_fix_frags_per_group_compile_error.patch
new file mode 100644
index 0000000..55291ec
--- /dev/null
+++ b/debian/patches/04_fix_frags_per_group_compile_error.patch
@@ -0,0 +1,22 @@
+Description: fix compile error in insertionops.cc regarding rename of s_frags_per_group
+  Fixes:
+    insertionops.cc: In function 'std::ostream& operator<<(std::ostream&, const ext2_super_block*)':
+    insertionops.cc:66:47: error: 'const struct ext2_super_block' has no member named 's_frags_per_group'
+  See git commit 412376efff3c0e0c2fea00666c2457e6f2ae1878
+  "Add basic BIGALLOC support for cluster-based allocation" in
+  upstreams e2fsprogs repository
+Forwarded: yes
+Author: Michael Prokop <mika at debian.org>
+Last-Update: 2011-01-11
+
+--- a/src/insertionops.cc
++++ b/src/insertionops.cc
+@@ -63,7 +63,7 @@ std::ostream& operator<<(std::ostream& os, const ext2_super_block* const s_block
+   os << "Block size: " << EXT2_BLOCK_SIZE(s_block) << std::endl;
+   os << "Fragment size: " << EXT2_FRAG_SIZE(s_block) << std::endl;
+   os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl;
+-  os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl;
++  os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl;
+   os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl;
+   os << "Mount time: " << s_block->s_mtime << std::endl;
+   os << "Write time: " << s_block->s_wtime << std::endl;
diff --git a/debian/patches/series b/debian/patches/series
index 8388ca0..b89eb17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 01_output_dir.patch
+02_fix_reserved2_checksum_lo_compile_issue.patch
+03_fix_opaque_ext2_group_desc_compile_error.patch
+04_fix_frags_per_group_compile_error.patch

-- 
debian-forensics/extundelete