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

Christophe Monniez christophe.monniez at fccu.be
Thu Dec 13 07:24:19 UTC 2012


The following commit has been merged in the debian branch:
commit 2b2b330a0447e560e02122301a51c1bf354d0d33
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Wed Dec 12 14:51:27 2012 +0100

    Removing patch as linux2.l_i_reserved2 seems not to be used anymore.

diff --git a/debian/patches/02_fix_reserved2_checksum_lo_compile_issue.patch b/debian/patches/02_fix_reserved2_checksum_lo_compile_issue.patch
deleted file mode 100644
index 606e5f7..0000000
--- a/debian/patches/02_fix_reserved2_checksum_lo_compile_issue.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/series b/debian/patches/series
index b89eb17..95a25e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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



More information about the forensics-changes mailing list