[Forensics-changes] [ext3grep] 02/03: Imported Debian patch 0.10.2-1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sun Mar 8 06:45:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository ext3grep.
commit 6150141b945dd12240629c07ada0a033b275baeb
Author: Julien Valroff <julien at debian.org>
Date: Sat Dec 10 08:54:47 2011 +0100
Imported Debian patch 0.10.2-1
---
debian/changelog | 130 +++++++++++++++++++++
debian/compat | 1 +
debian/control | 18 +++
debian/copyright | 35 ++++++
debian/ext3grep.docs | 1 +
debian/ext3grep.manpages | 1 +
debian/manpages/ext3grep.8 | 117 +++++++++++++++++++
.../001_fix-ftbfs-e2fsprogs_1.42-WIP-702.diff | 40 +++++++
debian/patches/series | 1 +
debian/rules | 14 +++
debian/source/format | 1 +
debian/watch | 2 +
12 files changed, 361 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2ddcc27
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,130 @@
+ext3grep (0.10.2-1) unstable; urgency=low
+
+ * Team Upload.
+
+ [ Daniel Baumann ]
+ * Removing old lintian overrides leftover.
+ * Minimizing rules file.
+ * Adding autotools handling in rules that doesn't get done by dh
+ automatically.
+
+ [ Christophe Monniez ]
+ * Fixing debian watch file.
+
+ [ Julien Valroff ]
+ * New upstream release (Closes: #589372)
+ * Remove useless lintian override: use Team Upload changelog entry
+ * Use autotools-dev
+ * Bump standards version to 3.9.2 (no changes needed)
+ * Bump debhelper compat to 8
+ * Fix VCS-* fields
+ * Switch to 3.0 (quilt) source package format
+ * Update copyright file as per current DEP-5
+ * 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 <peter.green at postgrad.manchester.ac.uk>
+
+ -- Julien Valroff <julien at debian.org> Sat, 10 Dec 2011 08:54:47 +0100
+
+ext3grep (0.10.1-3.1) unstable; urgency=low
+
+ * NMU, added armhf to arch list. (Closes: #604656)
+
+ -- Konstantinos Margaritis <markos at debian.org> Thu, 24 Feb 2011 17:16:07 +0000
+
+ext3grep (0.10.1-3) unstable; urgency=low
+
+ * Updating package to standards version 3.8.2.
+ * Adding lintian overrides.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 09 Jul 2009 11:50:30 +0200
+
+ext3grep (0.10.1-2) unstable; urgency=low
+
+ * Passing flags to configure as arguments.
+ * Prefixing debhelper files with package name.
+ * Adding myself to copyright.
+ * Upgrading package to standards 3.8.1.
+ * Tidy rules file.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 28 May 2009 21:08:53 +0200
+
+ext3grep (0.10.1-1) unstable; urgency=low
+
+ * Merging upstream version 0.10.1.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 19 Dec 2008 23:21:00 +0100
+
+ext3grep (0.10.0-1) unstable; urgency=low
+
+ * Merging upstream version 0.10.0.
+ * Replacing obsolete dh_clean -k with dh_prep.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 28 Nov 2008 09:16:00 +0100
+
+ext3grep (0.9.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Rewording author section in the manpage, also adding reference to
+ ext3grep upstream author.
+ * Removing imported whitespace at EOL in changelog.
+ * Removing imported whitespace at EOF in control.
+ * Polishing formating of the manpage.
+ * Using package long description in manpage.
+ * Updating vcs fields.
+ * Regenerating changelog for 0.6.0-1 and 0.8.0-1 from git commit log.
+ * Updating download url in copyright file.
+ * Merging upstream version 0.9.0. (Closes: #501018)
+
+ -- Luca Bruno <lucab at debian.org> Fri, 17 Oct 2008 21:54:42 +0200
+
+ext3grep (0.8.0-1) unstable; urgency=low
+
+ [ Luca Bruno ]
+ * Imported Upstream version 0.7.0:
+
+ [ Rich Ercolani ]
+ * Imported Upstream version 0.8.0
+ - Allow inode_size_ to be larger than sizeof(Inode) (Closes: #491621)
+ * Config --disable-optimization changed to --disable-optimize in this version
+
+ [ Luca Bruno ]
+ * Removed all big-endian arch, as ext3grep won't work there
+
+ -- Rich Ercolani <rercola at acm.jhu.edu> Fri, 15 Aug 2008 01:41:12 -0400
+
+ext3grep (0.6.0-1) unstable; urgency=low
+
+ [ Rich Ercolani ]
+ * Initial release (Closes: #470813).
+
+ [ Luca Bruno ]
+ * Now maintained within the Debian Forensics team
+ * Added the Vcs-Git related tag
+
+ [ Daniel Baumann ]
+ * Updating package to debhelper 7.
+ * Sorting control fields.
+ * Removing unneded build-dependencies to essential packages.
+ * Adding soname independent build-depends alternative for libncurses5-dev.
+ * Updating to standards 3.8.0.
+ * Using punct rather than double-backslash for empty lines in package
+ long-description.
+ * Removing cruft from watch file.
+ * Reordering rules file.
+ * Moving manpage into sub-directory of debian/.
+ * Rewriting copyright file in machine-interpretable format.
+ * Using NEWS file as changelog.
+ * Removing unused dirs debhelper file.
+ * Forgot to remove manpage file in old location.
+ * Rewrapping and reformating manpage.
+ * Adding copyright notice for src/kernel-jbd.h to copyright file.
+ * Sorting vcs fields in control.
+
+ [ Luca Bruno ]
+ * Added missing pkg-config build-dep
+ * Removing -dbg package (for now)
+
+ -- Rich Ercolani <rercola at acm.jhu.edu> Fri, 14 Mar 2008 22:19:59 -0400
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..3589edd
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: ext3grep
+Section: admin
+Priority: extra
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Uploaders: Luca Bruno <lucab at debian.org>, Rich Ercolani <rercola at acm.jhu.edu>
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, e2fslibs-dev, libncurses5 | libncurses-dev, pkg-config
+Standards-Version: 3.9.2
+Homepage: http://code.google.com/p/ext3grep/
+Vcs-Browser: http://git.debian.org/?p=forensics/ext3grep.git
+Vcs-Git: git://git.debian.org/git/forensics/ext3grep.git
+
+Package: ext3grep
+Architecture: alpha amd64 arm armel armhf i386 ia64 mipsel sh4
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Tool to help recover deleted files on ext3 filesystems
+ ext3grep is a simple tool intended to aid anyone who accidentally deletes a
+ file on an ext3 filesystem, only to find that they wanted it shortly
+ thereafter.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..c8b3780
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Contact: Carlo Wood <carlo at alinoe.com>
+Source: http://code.google.com/p/ext3grep/downloads/list
+
+Files: *
+Copyright: 2008 Carlo Wood <carlo at alinoe.com>
+License: GPL-2+
+
+Files: src/kernel-jbd.h
+Copyright: 1998-2000 Red Hat, Inc
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2008-2009 Rich Ercolani <rercola at acm.jhu.edu>
+ 2008-2009 Daniel Baumann <daniel at debian.org>
+ 2011 Julien Valroff <julien at debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/ext3grep.docs b/debian/ext3grep.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/ext3grep.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/ext3grep.manpages b/debian/ext3grep.manpages
new file mode 100644
index 0000000..2fb19fb
--- /dev/null
+++ b/debian/ext3grep.manpages
@@ -0,0 +1 @@
+debian/manpages/*
diff --git a/debian/manpages/ext3grep.8 b/debian/manpages/ext3grep.8
new file mode 100644
index 0000000..182a0f7
--- /dev/null
+++ b/debian/manpages/ext3grep.8
@@ -0,0 +1,117 @@
+.TH EXT3GREP 8 "2008-09-14" "0.8.0" "recover files on ext3 filesystems"
+
+.SH NAME
+ext3grep \- ext3 file recovery tool
+
+.SH SYNOPSIS
+\fBext3grep\fR [\fIOPTIONS\fR] \fIFILE\fR \&...
+
+.SH DESCRIPTION
+ext3grep is a simple tool intended to aid anyone who accidentally deletes a file on an ext3 filesystem, only to find that they wanted it shortly thereafter.
+
+.SH OPTIONS
+.IP "\fB\-\-superblock\fR" 4
+Print contents of superblock in addition to the rest. If no action is specified then this option is implied.
+.IP "\fB\-\-print\fR" 4
+Print contents of block or inode, if any.
+.IP "\fB\-\-ls\fR" 4
+Print directories, one line per entry. See the \fBFILTERS\fR section for details on filtering this output.
+.IP "\fB\-\-accept\fR \fIFILE\fR" 4
+Accepts 'file' as a legal filename. Can be used multiple times. If you change any \fB\-\-accept\fR you must remove BOTH stage* files!
+.IP "\fB\-\-journal\fR" 4
+Prints the contents of the journal.
+.IP "\fB\-\-show\-path\-inodes\fR" 4
+Show the inode of each directory component in paths.
+.PP
+.SS "Filters:"
+.IP "\fB\-\-group\fR \fIgid\fR" 4
+Only show/process files owned by process group \fIgid\fR.
+.IP "\fB\-\-directory\fR" 4
+Only show/process process directory inodes.
+.IP "\fB\-\-after\fR \fIdtime\fR" 4
+Only show/process entries deleted on or after \fIdtime\fR.
+.IP "\fB\-\-before\fR \fIdtime\fR" 4
+Only show/process entries deleted before \fIdtime\fR.
+.IP "\fB\-\-deleted\fR" 4
+Only show/process deleted entries.
+.IP "\fB\-\-allocated\fR" 4
+Only show/process allocated inodes/blocks.
+.IP "\fB\-\-unallocated\fR" 4
+Only show/process unallocated inodes/blocks.
+.IP "\fB\-\-reallocated\fR" 4
+Do not suppress entries with reallocated inodes. Inodes are considered 'reallocated' if the entry is deleted but the inode is allocated, but also when the file type in the dir entry and the inode are different.
+.IP "\fB\-\-zeroed\-inodes\fR" 4
+Do not suppress entries with zeroed inodes. Linked entries are always shown, regardless of this option.
+.IP "\fB\-\-depth\fR depth"
+Process directories recursively up till a depth of 'depth'.
+.PP
+.SS "Actions:"
+.IP "\fB\-\-inode\-to\-block\fR \fIinode_num\fR" 4
+Print the block that contains inode \fIinode_num\fR.
+.IP "\fB\-\-inode\fR \fIinode_num\fR" 4
+Show info on inode \fIinode_num\fR. If \fB\-\-ls\fR is used and the inode is a directory, then the filters apply to the entries of the directory. If you do not use \fB\-\-ls\fR then \fB\-\-print\fR is implied.
+.IP "\fB\-\-block\fR \fIblock_num\fR" 4
+Show info on block \fIblock_num\fR. If \fB\-\-ls\fR is used and the block is the first block of a directory, then the filters apply to entries of the directory. If you do not use \fB\-\-ls\fR then \fB\-\-print\fR is implied.
+.IP "\fB\-\-histogram\fR=[\fIatime\fR|\fIctime\fR|\fImtime\fR|\fIdtime\fR|\fIgroup\fR]" 4
+Generate a histogram based on the given specs. Using atime, ctime or mtime will change the meaning of \fB\-\-after\fR and \fB\-\-before\fR to those times.
+.IP "\fB\-\-journal\-block\fR \fIblock_num\fR" 4
+Show info on journal block \fIblock_num\fR.
+.IP "\fB\-\-journal\-transaction\fR \fIseq\fR" 4
+Show info on transaction with sequence number \fIseq\fR.
+.IP "\fB\-\-dump\-names\fR" 4
+Write the paths of files to stdout. This implies \fB\-\-ls\fR but suppresses its output.
+.IP "\fB\-\-search\-start\fR \fIstr\fR" 4
+Find blocks that start with the fixed string \fIstr\fR.
+.IP "\fB\-\-search\fR \fIstr\fR" 4
+Find blocks that contain the fixed string \fIstr\fR.
+.IP "\fB\-\-search\-inode\fR \fIblock_num\fR" 4
+Find inodes that refer to block \fIblock_num\fR.
+.IP "\fB\-\-search\-zeroed\-inodes\fR" 4
+Return allocated inode table entries that are zeroed.
+.IP "\fB\-\-inode\-dirblock\-table\fR \fIdir\fR" 4
+Print a table for directory path \fIdir\fR of directory block numbers found and the inodes used for each file.
+.IP "\fB\-\-show\-journal\-inodes\fR \fIinode_num\fR" 4
+Show copies of inode \fIinode_num\fR still in the journal.
+.IP "\fB\-\-restore\-file\fR \fIpath\fR" 4
+Will restore file \fIpath\fR. \fIpath\fR is relative to root of the partition and does not start with a '/' (it must be one of the paths returned by \fB\-\-dump\-names\fR). The restored directory, file or symbolic link is created in the current directory as ./\fIpath\fR.
+.IP "\fB\-\-restore\-all\fR" 4
+As \fB\-\-restore\-file\fR but attempts to restore everything. The use of \fB\-\-after\fR is highly recommended because the attempt to restore very old files will only result in them being hard linked to a more recently deleted file and as such pollute the output.
+.IP "\fB\-\-show\-hardlinks\fR" 4
+Show all inodes that are shared by two or more files.
+.IP "\fB\-\-version\fR, \fB\-[vV]\fR" 4
+Prints the version information and exits.
+.IP "\fB\-\-help\fR," 4
+Prints a help message and exits.
+
+.SH EXAMPLES
+\fBRestoring all files from the ext3 partition/file /backup/sda1:\fR
+.nf
+ext3grep \-\-restore-all /backup/sda1
+.fi
+\fBListing the files owned by GID 1000 on /backup/sda1:\fR
+.nf
+ext3grep \-\-ls \-\-group 1000 /backup/sda1
+.fi
+\fBFinding all files containing the string Critical_report in their name on /backup/sda1:\fR
+.nf
+ext3grep \-\-dump-names /backup/sda1 | grep 'Critical_report'
+.fi
+
+.SH LIMITATIONS
+Do not attempt to use ext3grep for recovery from a mounted filesystem. Ever.
+.PP
+No, not even then.
+.PP
+ext3grep sometimes runs out of memory spare on 32-bit architectures and crashes. It is highly recommended that you run ext3grep in a 64-bit environment when dealing with large filesystems, though this is seen as a bug.
+.PP
+ext3grep cannot recover files if there are no remnants of them.
+.PP
+Some files that ext3grep recovers may have trailing null bytes - just scrape them off like the burnt bits on toast.
+
+.SH SEE ALSO
+\fIdebugfs\fR(8)
+
+.SH AUTHOR
+ext3grep was written by Carlo Wood <\fIcarlo at alinoe.com\fR>.
+.PP
+This manual page was written by Rich Ercolani <\fIrercola at acm.jhu.edu\fR>, for the Debian project (but may be used by others). It may be distributed under the same terms as ext3grep, the GNU General Public License, either version 2 or (at your option) any later version.
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..beb18f6
--- /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_reserved2
++ //i_reserved2 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
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..93165f3
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ EXTRA += --enable-debug --disable-optimize
+endif
+
+%:
+ dh $@ --with autotools_dev
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(EXTRA) LDFLAGS="-Wl,-z,defs"
+
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..40684fb
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://code.google.com/p/ext3grep/downloads/list detail\?name=ext3grep-(.*).tar.gz.*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/ext3grep.git
More information about the forensics-changes
mailing list