[Forensics-changes] [magicrescue] 12/19: Imported Upstream version 1.1.7
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Nov 3 19:06:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository magicrescue.
commit 651d4935c6de5805a501d9aa2097169343b98d1e
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Nov 3 16:57:56 2014 -0200
Imported Upstream version 1.1.7
---
ChangeLog | 20 ++++++++++++++++++++
NEWS | 4 ++++
doc/dupemap.1 | 49 ++++++++++++++++++++++++-------------------------
doc/magicrescue.1 | 39 +++++++++++++++++++--------------------
doc/magicsort.1 | 35 +++++++++++++++++------------------
recipes/ppm | 8 ++++++++
recipes/zip | 4 ++--
7 files changed, 94 insertions(+), 65 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 537cd05..a9a93f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,26 @@
For less detailed change information, see the NEWS file
------------------------------------------------------------------------
+r817 | jbj | 2009-09-04 19:44:36 +0200 (Fri, 04 Sep 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/new_NEWS
+ M /magicrescue/trunk/recipes/zip
+
+Apply patch to fix problems in zip recipe
+------------------------------------------------------------------------
+r794 | jbj | 2009-02-15 22:20:29 +0100 (Sun, 15 Feb 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/release.sh
+
+Update release script to point to new server
+------------------------------------------------------------------------
+r792 | jbj | 2009-02-15 22:14:04 +0100 (Sun, 15 Feb 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/NEWS
+ M /magicrescue/trunk/new_NEWS
+
+Release 1.1.6
+------------------------------------------------------------------------
r791 | jbj | 2009-02-15 21:58:09 +0100 (Sun, 15 Feb 2009) | 1 line
Changed paths:
M /magicrescue/trunk/new_NEWS
diff --git a/NEWS b/NEWS
index 9299fa7..597f81a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 1.1.7: Fri Sep 4 19:48:14 CEST 2009
+- Update zip recipe to work with latest version of Zip and latest
+ OpenOffice.org file formats (thanks to Fernando)
+
Version 1.1.6: Sun Feb 15 22:13:54 CET 2009
- Recipe for Nikon raw photos
- Recipe for large PPM files
diff --git a/doc/dupemap.1 b/doc/dupemap.1
index c834069..ecb7217 100644
--- a/doc/dupemap.1
+++ b/doc/dupemap.1
@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
.\"
.\" Standard preamble:
.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
@@ -48,22 +40,25 @@
. ds R" ''
'br\}
.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.if \nF \{\
+.ie \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. nr % 0
. rr F
.\}
-.\"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+. de IX
+..
+.\}
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -129,7 +124,11 @@
.\" ========================================================================
.\"
.IX Title "DUPEMAP 1"
-.TH DUPEMAP 1 "2008-06-26" "1.1.6" "Magic Rescue"
+.TH DUPEMAP 1 "2008-06-26" "1.1.7" "Magic Rescue"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
.SH "NAME"
dupemap \- Creates a database of file checksums and uses it to eliminate
duplicates
@@ -142,7 +141,7 @@ duplicates
Directories are searched through in no particular order. Its actions depend on
whether the \fB\-d\fR option is given, and on the \fIoperation\fR parameter, which
must be a comma-seperated list of \fBscan\fR, \fBreport\fR, \fBdelete\fR:
-.Sh "Without \fB\-d\fP"
+.SS "Without \fB\-d\fP"
.IX Subsection "Without -d"
\&\fBdupemap\fR will take action when it sees the same checksum repeated more than
once, i.e. it simply finds duplicates recursively. The action depends on
@@ -160,7 +159,7 @@ Delete files that are encountered more than once. Print their names if
.Sp
\&\fI\s-1WARNING:\s0\fR You are advised to make a backup of the target first, e.g. with
\&\f(CW\*(C`cp \-al\*(C'\fR (for \s-1GNU\s0 cp) to create hard links recursively.
-.Sh "With \fB\-d\fP"
+.SS "With \fB\-d\fP"
.IX Subsection "With -d"
The \fIdatabase\fR argument to \fB\-d\fR will denote a database file (see the
\&\*(L"\s-1DATABASE\s0\*(R" section in this manual for details) to read from or write to. In
@@ -210,7 +209,7 @@ Ignore files below this size.
Ignore files above this size.
.SH "USAGE"
.IX Header "USAGE"
-.Sh "General usage"
+.SS "General usage"
.IX Subsection "General usage"
The easiest operations to understand is when the \fB\-d\fR option is not given. To
delete all duplicate files in \fI/tmp/recovered\-files\fR, do:
@@ -222,13 +221,13 @@ delete all duplicate files in \fI/tmp/recovered\-files\fR, do:
Often, \fBdupemap scan\fR is run to produce a checksum database of all files in a
directory tree. Then \fBdupemap delete\fR is run on another directory, possibly
following \fBdupemap report\fR. For example, to delete all files in
-\&\fI/tmp/recovered\-files\fR that already exist in \fI$HOME\fR, do this:
+\&\fI/tmp/recovered\-files\fR that already exist in \fI\f(CI$HOME\fI\fR, do this:
.PP
.Vb 2
\& $ dupemap \-d homedir.map scan $HOME
\& $ dupemap \-d homedir.map delete,report /tmp/recovered\-files
.Ve
-.Sh "Usage with magicrescue"
+.SS "Usage with magicrescue"
.IX Subsection "Usage with magicrescue"
The main application for \fBdupemap\fR is to take some pain out of performing
undelete operations with \fBmagicrescue\fR(1). The reason is that \fBmagicrescue\fR
@@ -271,7 +270,7 @@ everything that's not a *.doc.
.PP
.Vb 2
\& $ magicrescue \-Mo \-r msoffice \-d rescued_docs /dev/hda1 \e
-\& |grep \-v \(aq\e.doc$\(aq|xargs rm \-f
+\& |grep \-v \*(Aq\e.doc$\*(Aq|xargs rm \-f
.Ve
.PP
Remove all the rescued documents that also appear on the file system, and
@@ -285,7 +284,7 @@ remove duplicates.
The \fIrescued_docs\fR folder should now contain only a few files. This will be
the undeleted files and some documents that were not stored in contiguous
blocks (use that defragger ;\-)).
-.Sh "Usage with fsck"
+.SS "Usage with fsck"
.IX Subsection "Usage with fsck"
In this scenario (based on a true story), you have a hard disk that's gone bad.
You have managed to \fIdd\fR about 80% of the contents into the file \fIdiskimage\fR,
@@ -334,7 +333,7 @@ This should leave only the files in \fI/mnt\fR that have changed since the last
backup or got corrupted. Particularly, the contents of \fI/mnt/lost+found\fR
should now be reduced enough to manually sort through them (or perhaps use
\&\fBmagicsort\fR(1)).
-.Sh "Primitive intrusion detection"
+.SS "Primitive intrusion detection"
.IX Subsection "Primitive intrusion detection"
You can use \fBdupemap\fR to see what files change on your system. This is one of
the more exotic uses, and it's only included for inspiration.
diff --git a/doc/magicrescue.1 b/doc/magicrescue.1
index b0b0ff4..c2e4eb4 100644
--- a/doc/magicrescue.1
+++ b/doc/magicrescue.1
@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
.\"
.\" Standard preamble:
.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
@@ -48,22 +40,25 @@
. ds R" ''
'br\}
.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.if \nF \{\
+.ie \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. nr % 0
. rr F
.\}
-.\"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+. de IX
+..
+.\}
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -129,7 +124,11 @@
.\" ========================================================================
.\"
.IX Title "MAGICRESCUE 1"
-.TH MAGICRESCUE 1 "2008-10-29" "1.1.6" "Magic Rescue"
+.TH MAGICRESCUE 1 "2008-10-29" "1.1.7" "Magic Rescue"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
.SH "NAME"
magicrescue \- Scans a block device and extracts known file types by looking at
magic bytes.
@@ -300,7 +299,7 @@ If that's not enough, you can use use \fBmagicsort\fR(1) to get a better overvie
.Ve
.SH "RECIPES"
.IX Header "RECIPES"
-.Sh "Creating recipe files"
+.SS "Creating recipe files"
.IX Subsection "Creating recipe files"
A recipe file is a relatively simple file of 3\-5 lines of text. It describes
how to recognise the beginning of the file and what to do when a file is
@@ -351,7 +350,7 @@ This means that you may have to write your own tool or wrap an existing program
in some scripts that make it behave better. For example, this could be to
extract the first 10MB into a temporary file and let the program work on that.
Or perhaps you can use \fItools/safecat\fR if the file may be very large.
-.Sh "Recipe format reference"
+.SS "Recipe format reference"
.IX Subsection "Recipe format reference"
Empty lines and lines starting with \f(CW\*(C`#\*(C'\fR will be skipped. A recipe contains a
series of match operations to find the content and a series of directives to
@@ -374,7 +373,7 @@ The parameter is a single character (byte), or an escape sequence.
Both \fIvalue\fR and \fIbitmask\fR are expressed as 8\-character hex strings.
\&\fIbitmask\fR will be ANDed with the data, and the result will be compared
to \fIvalue\fR. The byte order is as you see it in the hex editor,
-i.e. big\-endian.
+i.e. big-endian.
.PP
The first match operation in a recipe is special, it will be used to scan
through the file. Only the \fBchar\fR and \fBstring\fR operations can be used there.
diff --git a/doc/magicsort.1 b/doc/magicsort.1
index 74fd4f6..cd67f50 100644
--- a/doc/magicsort.1
+++ b/doc/magicsort.1
@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
.\"
.\" Standard preamble:
.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
@@ -48,22 +40,25 @@
. ds R" ''
'br\}
.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.if \nF \{\
+.ie \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. nr % 0
. rr F
.\}
-.\"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+. de IX
+..
+.\}
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -129,7 +124,11 @@
.\" ========================================================================
.\"
.IX Title "MAGICSORT 1"
-.TH MAGICSORT 1 "2008-06-26" "1.1.6" "Magic Rescue"
+.TH MAGICSORT 1 "2008-06-26" "1.1.7" "Magic Rescue"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
.SH "NAME"
magicsort \- Categorize files by their \fBfile\fR(1) magic
.SH "SYNOPSIS"
@@ -138,7 +137,7 @@ magicsort \- Categorize files by their \fBfile\fR(1) magic
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
Invokes the system's \fBfile\fR utility on all files in \fIdirectory\fR
-non\-recursively. For each different string that \fBfile\fR outputs it will create
+non-recursively. For each different string that \fBfile\fR outputs it will create
a sub-directory of that name and move the file in there.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
diff --git a/recipes/ppm b/recipes/ppm
new file mode 100644
index 0000000..7b0f059
--- /dev/null
+++ b/recipes/ppm
@@ -0,0 +1,8 @@
+# Extract (at most 36 MB) 8-bit PPM image file. Assumes dimensions greater
+# or equal to 1000 by 1000 pixels. May not match PPM files that contain
+# comments in the header or unusual whitespace.
+# Contributed by Daniel J Blueman
+0 string P6\n
+13 string 255\n
+extension ppm
+command dd bs=1024k count=36 of="$1" 2>/dev/null
diff --git a/recipes/zip b/recipes/zip
index 5d378dd..5075fcf 100644
--- a/recipes/zip
+++ b/recipes/zip
@@ -9,14 +9,14 @@
# high byte of "version made by"
5 char \x00
# high byte of "version needed to extract"
-7 char \x00
+#7 char \x00
extension zip
# This command takes a 50MB chunk of the file and tries to repair it. If the
# zip files you are looking for are less than 50MB, you can lower the value of
# the count= parameter for performance.
-command dd bs=1024k count=50 of="$1" 2>/dev/null; zip -qF "$1" || rm -f "$1"
+command dd bs=1024k count=10 of="$1.tmp" 2>/dev/null; zip -qF "$1.tmp" --out "$1" ; rm -f "$1.tmp"
# Try to guess if it's a JAR archive or an OpenOffice.org file, and rename
# accordingly
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/magicrescue.git
More information about the forensics-changes
mailing list