From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- ...3grep-0.10.2-include-unistd_h-for-sysconf.patch | 4 +-- .../files/ext3grep-0.10.2-new-e2fsprogs.diff | 34 ---------------------- .../files/ext3grep-0.10.2-new-e2fsprogs.patch | 34 ++++++++++++++++++++++ .../files/ext3grep-0.10.2-newer-e2fsprogs.patch | 22 ++++++++++++++ 4 files changed, 58 insertions(+), 36 deletions(-) delete mode 100644 sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff create mode 100644 sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch create mode 100644 sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch (limited to 'sys-fs/ext3grep/files') diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch index bf38c27e7095..42588f71d6e5 100644 --- a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch +++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/422789 ---- src/init_consts.cc -+++ src/init_consts.cc +--- a/src/init_consts.cc ++++ b/src/init_consts.cc @@ -27,6 +27,10 @@ #include "debug.h" #endif diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff deleted file mode 100644 index 45b54b807bd7..000000000000 --- a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur ext3grep-0.10.1/src/ext3.h ext3grep-0.10.1.new/src/ext3.h ---- ext3grep-0.10.1/src/ext3.h 2008-04-09 11:20:31.000000000 +0000 -+++ ext3grep-0.10.1.new/src/ext3.h 2011-12-10 07:00:50.000000000 +0000 -@@ -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 // 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/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch new file mode 100644 index 000000000000..45b54b807bd7 --- /dev/null +++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch @@ -0,0 +1,34 @@ +diff -ur ext3grep-0.10.1/src/ext3.h ext3grep-0.10.1.new/src/ext3.h +--- ext3grep-0.10.1/src/ext3.h 2008-04-09 11:20:31.000000000 +0000 ++++ ext3grep-0.10.1.new/src/ext3.h 2011-12-10 07:00:50.000000000 +0000 +@@ -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 // 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/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch new file mode 100644 index 000000000000..8a029f9916b6 --- /dev/null +++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch @@ -0,0 +1,22 @@ +--- a/src/ext3.h 2008-04-09 13:20:31.000000000 +0200 ++++ b/src/ext3.h 2018-05-07 23:16:35.413754674 +0200 +@@ -106,7 +106,7 @@ + __u32 const* block(void) const { return i_block; } + __u32 generation(void) const { return i_generation; } + __u32 file_acl(void) const { return i_file_acl; } +- __u32 dir_acl(void) const { return i_dir_acl; } ++ __u32 size_high(void) const { return i_size_high; } + __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; } +--- a/src/print_inode_to.cc 2008-10-17 03:27:15.000000000 +0200 ++++ b/src/print_inode_to.cc 2018-05-07 23:16:54.379754601 +0200 +@@ -118,7 +118,7 @@ + os << '\n'; + } + //os << "File ACL: " << inode.file_acl() << '\n'; +- //os << "Directory ACL: " << inode.dir_acl() << '\n'; ++ //os << "Directory ACL: " << inode.size_high() << '\n'; + //os << "Fragment address: " << inode.faddr() << '\n'; + //os << "Fragment number: " << (int)inode.osd2.linux2.l_i_frag << '\n'; + //os << "Fragment size: " << (int)inode.osd2.linux2.l_i_fsize << '\n'; -- cgit v1.2.3