From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch | 197 +++++++++++++++++++++ ...3grep-0.10.2-include-unistd_h-for-sysconf.patch | 15 ++ .../files/ext3grep-0.10.2-new-e2fsprogs.diff | 34 ++++ 3 files changed, 246 insertions(+) create mode 100644 sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch create mode 100644 sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch create mode 100644 sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff (limited to 'sys-fs/ext3grep/files') diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch b/sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch new file mode 100644 index 000000000000..a7a668c783b9 --- /dev/null +++ b/sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch @@ -0,0 +1,197 @@ +diff -Naur ext3grep-0.10.1-orig/src/commandline.cc ext3grep-0.10.1/src/commandline.cc +--- ext3grep-0.10.1-orig/src/commandline.cc 2008-12-14 16:25:53.000000000 +0100 ++++ ext3grep-0.10.1/src/commandline.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -32,6 +32,8 @@ + #include "globals.h" + #include "restore.h" + #include "accept.h" ++#include ++#include + + // Commandline options. + bool commandline_superblock = false; +diff -Naur ext3grep-0.10.1-orig/src/custom.cc ext3grep-0.10.1/src/custom.cc +--- ext3grep-0.10.1-orig/src/custom.cc 2008-10-23 00:20:32.000000000 +0200 ++++ ext3grep-0.10.1/src/custom.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -42,6 +42,9 @@ + #include "get_block.h" + #include "init_consts.h" + #include "print_inode_to.h" ++#include ++#include ++#include + + // The first part of this file was written and used for custom job: + // recovering emails on a 40 GB partition that had no information +diff -Naur ext3grep-0.10.1-orig/src/debug.h ext3grep-0.10.1/src/debug.h +--- ext3grep-0.10.1-orig/src/debug.h 2008-06-27 17:01:19.000000000 +0200 ++++ ext3grep-0.10.1/src/debug.h 2009-08-04 00:25:07.000000000 +0200 +@@ -31,6 +31,7 @@ + + #include + #include // std::exit, EXIT_FAILURE ++#include + + #define AllocTag1(p) + #define AllocTag2(p, desc) +diff -Naur ext3grep-0.10.1-orig/src/directories.cc ext3grep-0.10.1/src/directories.cc +--- ext3grep-0.10.1-orig/src/directories.cc 2008-10-16 00:45:31.000000000 +0200 ++++ ext3grep-0.10.1/src/directories.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -33,6 +33,9 @@ + #include "indirect_blocks.h" + #include "get_block.h" + #include "directories.h" ++#include ++#include ++#include + + //----------------------------------------------------------------------------- + // +diff -Naur ext3grep-0.10.1-orig/src/dir_inode_to_block.cc ext3grep-0.10.1/src/dir_inode_to_block.cc +--- ext3grep-0.10.1-orig/src/dir_inode_to_block.cc 2008-06-28 15:40:06.000000000 +0200 ++++ ext3grep-0.10.1/src/dir_inode_to_block.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -40,6 +40,8 @@ + #include "print_inode_to.h" + #include "directories.h" + #include "journal.h" ++#include ++#include + + //----------------------------------------------------------------------------- + // +diff -Naur ext3grep-0.10.1-orig/src/histogram.cc ext3grep-0.10.1/src/histogram.cc +--- ext3grep-0.10.1-orig/src/histogram.cc 2008-06-28 16:13:31.000000000 +0200 ++++ ext3grep-0.10.1/src/histogram.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -29,6 +29,7 @@ + #endif + + #include "commandline.h" ++#include + + //----------------------------------------------------------------------------- + // +diff -Naur ext3grep-0.10.1-orig/src/indirect_blocks.cc ext3grep-0.10.1/src/indirect_blocks.cc +--- ext3grep-0.10.1-orig/src/indirect_blocks.cc 2008-10-20 20:45:29.000000000 +0200 ++++ ext3grep-0.10.1/src/indirect_blocks.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -54,6 +54,7 @@ + #include "forward_declarations.h" + #include "endian_conversion.h" + #include "superblock.h" ++#include + + //----------------------------------------------------------------------------- + // +diff -Naur ext3grep-0.10.1-orig/src/init_directories.cc ext3grep-0.10.1/src/init_directories.cc +--- ext3grep-0.10.1-orig/src/init_directories.cc 2008-06-29 21:08:31.000000000 +0200 ++++ ext3grep-0.10.1/src/init_directories.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -39,6 +39,7 @@ + #include "get_block.h" + #include "journal.h" + #include "dir_inode_to_block.h" ++#include + + all_directories_type all_directories; + inode_to_directory_type inode_to_directory; +diff -Naur ext3grep-0.10.1-orig/src/init_files.cc ext3grep-0.10.1/src/init_files.cc +--- ext3grep-0.10.1-orig/src/init_files.cc 2008-06-29 04:39:33.000000000 +0200 ++++ ext3grep-0.10.1/src/init_files.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -33,6 +33,7 @@ + #include "globals.h" + #include "forward_declarations.h" + #include "journal.h" ++#include + + //----------------------------------------------------------------------------- + // +diff -Naur ext3grep-0.10.1-orig/src/inode.cc ext3grep-0.10.1/src/inode.cc +--- ext3grep-0.10.1-orig/src/inode.cc 2008-06-29 04:44:39.000000000 +0200 ++++ ext3grep-0.10.1/src/inode.cc 2009-08-04 00:25:41.000000000 +0200 +@@ -33,6 +33,7 @@ + #include "globals.h" + #include "conversion.h" + #include "inode.h" ++#include + + #if USE_MMAP + void inode_unmap(int group) +diff -Naur ext3grep-0.10.1-orig/src/is_blockdetection.h ext3grep-0.10.1/src/is_blockdetection.h +--- ext3grep-0.10.1-orig/src/is_blockdetection.h 2008-07-11 02:23:37.000000000 +0200 ++++ ext3grep-0.10.1/src/is_blockdetection.h 2009-08-04 00:25:40.000000000 +0200 +@@ -31,6 +31,8 @@ + + #include "inode.h" // Needed for InodePointer + ++#include ++ + // Return type of is_directory. + enum is_directory_type { + isdir_no = 0, // Block is not a directory. +diff -Naur ext3grep-0.10.1-orig/src/journal.cc ext3grep-0.10.1/src/journal.cc +--- ext3grep-0.10.1-orig/src/journal.cc 2008-10-18 03:06:35.000000000 +0200 ++++ ext3grep-0.10.1/src/journal.cc 2009-08-04 00:25:40.000000000 +0200 +@@ -37,6 +37,8 @@ + #include "indirect_blocks.h" + #include "get_block.h" + #include "commandline.h" ++#include ++#include + + //----------------------------------------------------------------------------- + // +diff -Naur ext3grep-0.10.1-orig/src/last_undeleted_directory_inode_refering_to_block.cc ext3grep-0.10.1/src/last_undeleted_directory_inode_refering_to_block.cc +--- ext3grep-0.10.1-orig/src/last_undeleted_directory_inode_refering_to_block.cc 2008-07-11 19:18:57.000000000 +0200 ++++ ext3grep-0.10.1/src/last_undeleted_directory_inode_refering_to_block.cc 2009-08-04 00:25:41.000000000 +0200 +@@ -29,6 +29,7 @@ + #include "is_blockdetection.h" + #include "inode_refers_to.h" + #include "journal.h" ++#include + + // Return std::numeric_limits::max() if the inode is still allocated + // and refering to the given block, otherwise return the Journal sequence +diff -Naur ext3grep-0.10.1-orig/src/ostream_operators.cc ext3grep-0.10.1/src/ostream_operators.cc +--- ext3grep-0.10.1-orig/src/ostream_operators.cc 2008-10-20 20:45:29.000000000 +0200 ++++ ext3grep-0.10.1/src/ostream_operators.cc 2009-08-04 00:25:41.000000000 +0200 +@@ -31,6 +31,7 @@ + #include "endian_conversion.h" + #include "superblock.h" + #include "globals.h" ++#include + + //----------------------------------------------------------------------------- + // +diff -Naur ext3grep-0.10.1-orig/src/print_inode_to.cc ext3grep-0.10.1/src/print_inode_to.cc +--- ext3grep-0.10.1-orig/src/print_inode_to.cc 2008-10-17 03:27:15.000000000 +0200 ++++ ext3grep-0.10.1/src/print_inode_to.cc 2009-08-04 00:25:41.000000000 +0200 +@@ -30,6 +30,7 @@ + #include "FileMode.h" + #include "globals.h" + #include "print_symlink.h" ++#include + + void print_inode_to(std::ostream& os, Inode const& inode) + { +diff -Naur ext3grep-0.10.1-orig/src/restore.cc ext3grep-0.10.1/src/restore.cc +--- ext3grep-0.10.1-orig/src/restore.cc 2008-10-18 17:30:54.000000000 +0200 ++++ ext3grep-0.10.1/src/restore.cc 2009-08-04 00:25:41.000000000 +0200 +@@ -44,6 +44,9 @@ + #include "FileMode.h" + #include "indirect_blocks.h" + #include "print_symlink.h" ++#include ++#include ++#include + + #ifdef CPPGRAPH + void iterate_over_all_blocks_of__with__restore_file_action(void) { restore_file_action(0, 0, NULL); } +diff -Naur ext3grep-0.10.1-orig/src/show_journal_inodes.cc ext3grep-0.10.1/src/show_journal_inodes.cc +--- ext3grep-0.10.1-orig/src/show_journal_inodes.cc 2008-10-18 03:06:35.000000000 +0200 ++++ ext3grep-0.10.1/src/show_journal_inodes.cc 2009-08-04 00:25:41.000000000 +0200 +@@ -30,6 +30,7 @@ + + #include "journal.h" + #include "print_inode_to.h" ++#include + + void show_journal_inodes(int inodenr) + { 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 new file mode 100644 index 000000000000..bf38c27e7095 --- /dev/null +++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/422789 + +--- src/init_consts.cc ++++ src/init_consts.cc +@@ -27,6 +27,10 @@ + #include "debug.h" + #endif + ++#if USE_MMAP ++#include /* sysconf */ ++#endif ++ + #include "globals.h" + #include "superblock.h" + #include "forward_declarations.h" 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 new file mode 100644 index 000000000000..45b54b807bd7 --- /dev/null +++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff @@ -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; } -- cgit v1.2.3