[Forensics-changes] [magicrescue] 09/19: Imported Upstream version 1.1.6
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Nov 3 19:06:20 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 a88947bdfa0ffc53d2005bad3611715965daf500
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Nov 3 16:56:35 2014 -0200
Imported Upstream version 1.1.6
---
ChangeLog | 33 +++++++++++++++++++++++++++++++++
NEWS | 4 ++++
doc/dupemap.1 | 52 ++++++++++++++++++++++++++--------------------------
doc/magicrescue.1 | 18 +++++++++---------
doc/magicrescue.pod | 2 +-
doc/magicsort.1 | 12 ++++++------
recipes/nikon-raw | 7 +++++++
7 files changed, 86 insertions(+), 42 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b64483f..537cd05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,39 @@
For less detailed change information, see the NEWS file
------------------------------------------------------------------------
+r791 | jbj | 2009-02-15 21:58:09 +0100 (Sun, 15 Feb 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/new_NEWS
+ A /magicrescue/trunk/recipes/ppm
+
+Add PPM recipe from Daniel J Blueman
+------------------------------------------------------------------------
+r790 | jbj | 2009-02-15 21:38:46 +0100 (Sun, 15 Feb 2009) | 1 line
+Changed paths:
+ M /magicrescue/trunk/recipes/nikon-raw
+
+Modifications for the Nikon recipe from Daniel J Blueman
+------------------------------------------------------------------------
+r773 | jbj | 2008-10-29 08:12:57 +0100 (Wed, 29 Oct 2008) | 1 line
+Changed paths:
+ M /magicrescue/trunk/doc/magicrescue.pod
+
+typo
+------------------------------------------------------------------------
+r771 | jbj | 2008-10-06 18:55:59 +0200 (Mon, 06 Oct 2008) | 1 line
+Changed paths:
+ M /magicrescue/trunk/new_NEWS
+ A /magicrescue/trunk/recipes/nikon-raw
+
+Add recipe for Nikon raw photos
+------------------------------------------------------------------------
+r603 | jbj | 2008-01-17 14:04:15 +0100 (Thu, 17 Jan 2008) | 1 line
+Changed paths:
+ M /magicrescue/trunk/NEWS
+ M /magicrescue/trunk/new_NEWS
+
+Release 1.1.5
+------------------------------------------------------------------------
r602 | jbj | 2008-01-17 12:33:57 +0100 (Thu, 17 Jan 2008) | 1 line
Changed paths:
M /magicrescue/trunk/configure
diff --git a/NEWS b/NEWS
index c845da0..9299fa7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 1.1.6: Sun Feb 15 22:13:54 CET 2009
+- Recipe for Nikon raw photos
+- Recipe for large PPM files
+
Version 1.1.5: Thu Jan 17 14:03:49 CET 2008
- Recipe for Flac files
- Recipe for Canon CR2 RAW files
diff --git a/doc/dupemap.1 b/doc/dupemap.1
index 35b43eb..c834069 100644
--- a/doc/dupemap.1
+++ b/doc/dupemap.1
@@ -25,11 +25,11 @@
..
.\" Set up some character translations and predefined strings. \*(-- will
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. | will give a
-.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
.ie n \{\
. ds -- \(*W-
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "DUPEMAP 1"
-.TH DUPEMAP 1 "2007-12-31" "1.1.5" "Magic Rescue"
+.TH DUPEMAP 1 "2008-06-26" "1.1.6" "Magic Rescue"
.SH "NAME"
dupemap \- Creates a database of file checksums and uses it to eliminate
duplicates
@@ -216,7 +216,7 @@ The easiest operations to understand is when the \fB\-d\fR option is not given.
delete all duplicate files in \fI/tmp/recovered\-files\fR, do:
.PP
.Vb 1
-\& $ dupemap delete /tmp/recovered-files
+\& $ dupemap delete /tmp/recovered\-files
.Ve
.PP
Often, \fBdupemap scan\fR is run to produce a checksum database of all files in a
@@ -225,8 +225,8 @@ 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:
.PP
.Vb 2
-\& $ dupemap -d homedir.map scan $HOME
-\& $ dupemap -d homedir.map delete,report /tmp/recovered-files
+\& $ dupemap \-d homedir.map scan $HOME
+\& $ dupemap \-d homedir.map delete,report /tmp/recovered\-files
.Ve
.Sh "Usage with magicrescue"
.IX Subsection "Usage with magicrescue"
@@ -247,7 +247,7 @@ Windows partition, preferably read-only (especially with \s-1NTFS\s0), and creat
directories we will use.
.PP
.Vb 2
-\& $ mount -o ro /dev/hda1 /mnt/windows
+\& $ mount \-o ro /dev/hda1 /mnt/windows
\& $ mkdir healthy_docs rescued_docs
.Ve
.PP
@@ -260,25 +260,25 @@ inside other files, such as uncompressed zip archives or files with the wrong
extension.
.PP
.Vb 4
-\& $ find /mnt/windows -type f \e
-\& |magicrescue -I- -r msoffice -d healthy_docs
-\& $ dupemap -d healthy_docs.map scan healthy_docs
-\& $ rm -rf healthy_docs
+\& $ find /mnt/windows \-type f \e
+\& |magicrescue \-I\- \-r msoffice \-d healthy_docs
+\& $ dupemap \-d healthy_docs.map scan healthy_docs
+\& $ rm \-rf healthy_docs
.Ve
.PP
Now rescue all \f(CW\*(C`msoffice\*(C'\fR documents from the block device and get rid of
everything that's not a *.doc.
.PP
.Vb 2
-\& $ magicrescue -Mo -r msoffice -d rescued_docs /dev/hda1 \e
-\& |grep -v '\e.doc$'|xargs rm -f
+\& $ magicrescue \-Mo \-r msoffice \-d rescued_docs /dev/hda1 \e
+\& |grep \-v \(aq\e.doc$\(aq|xargs rm \-f
.Ve
.PP
Remove all the rescued documents that also appear on the file system, and
remove duplicates.
.PP
.Vb 2
-\& $ dupemap -d healthy_docs.map delete,report rescued_docs
+\& $ dupemap \-d healthy_docs.map delete,report rescued_docs
\& $ dupemap delete,report rescued_docs
.Ve
.PP
@@ -299,8 +299,8 @@ some free space on the disk image, so fsck has something to work with.
.Vb 6
\& $ cp diskimage diskimage.bak
\& $ dd if=/dev/zero bs=1M count=2048 >> diskimage
-\& $ reiserfsck --rebuild-tree diskimage
-\& $ mount -o loop diskimage /mnt
+\& $ reiserfsck \-\-rebuild\-tree diskimage
+\& $ mount \-o loop diskimage /mnt
\& $ ls /mnt/lost+found
\& (tons of files)
.Ve
@@ -311,14 +311,14 @@ backup after eliminating duplicates. Therefore we create a checksum database
of the directory we have unpacked the backup in.
.PP
.Vb 1
-\& $ dupemap -d backup.map scan ~/backup
+\& $ dupemap \-d backup.map scan ~/backup
.Ve
.PP
Next, we eliminate all the files from the rescued image that are also present
in the backup.
.PP
.Vb 1
-\& $ dupemap -d backup.map delete,report /mnt
+\& $ dupemap \-d backup.map delete,report /mnt
.Ve
.PP
We also want to remove duplicates from \fIlost+found\fR, and we want to get rid of
@@ -326,8 +326,8 @@ any files that are also present in the other directories in \fI/mnt\fR.
.PP
.Vb 3
\& $ dupemap delete,report /mnt/lost+found
-\& $ ls /mnt|grep -v lost+found|xargs dupemap -d mnt.map scan
-\& $ dupemap -d mnt.map delete,report /mnt/lost+found
+\& $ ls /mnt|grep \-v lost+found|xargs dupemap \-d mnt.map scan
+\& $ dupemap \-d mnt.map delete,report /mnt/lost+found
.Ve
.PP
This should leave only the files in \fI/mnt\fR that have changed since the last
@@ -342,7 +342,7 @@ the more exotic uses, and it's only included for inspiration.
First, you map the whole file system.
.PP
.Vb 1
-\& $ dupemap -d old.map scan /
+\& $ dupemap \-d old.map scan /
.Ve
.PP
Then you come back a few days/weeks later and run \fBdupemap report\fR. This will
@@ -351,8 +351,8 @@ need a list of the whole file system. You can get this list along with
preparing a new map easily. Both lists need to be sorted to be compared.
.PP
.Vb 2
-\& $ dupemap -d old.map report /|sort > unchanged_files
-\& $ dupemap -d current.map scan /|sort > current_files
+\& $ dupemap \-d old.map report /|sort > unchanged_files
+\& $ dupemap \-d current.map scan /|sort > current_files
.Ve
.PP
All that's left to do is comparing these files and preparing for next week.
diff --git a/doc/magicrescue.1 b/doc/magicrescue.1
index 622aabb..b0b0ff4 100644
--- a/doc/magicrescue.1
+++ b/doc/magicrescue.1
@@ -25,11 +25,11 @@
..
.\" Set up some character translations and predefined strings. \*(-- will
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. | will give a
-.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
.ie n \{\
. ds -- \(*W-
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "MAGICRESCUE 1"
-.TH MAGICRESCUE 1 "2007-12-31" "1.1.5" "Magic Rescue"
+.TH MAGICRESCUE 1 "2008-10-29" "1.1.6" "Magic Rescue"
.SH "NAME"
magicrescue \- Scans a block device and extracts known file types by looking at
magic bytes.
@@ -250,7 +250,7 @@ Make sure \s-1DMA\s0 and other optimizations are enabled on your disk, or it wil
hours. In Linux, use hdparm to set these options:
.PP
.Vb 1
-\& $ hdparm -d 1 -c 1 -u 1 /dev/hdb
+\& $ hdparm \-d 1 \-c 1 \-u 1 /dev/hdb
.Ve
.PP
Choose your output directory, somewhere with lots of disk space.
@@ -260,7 +260,7 @@ Choose your output directory, somewhere with lots of disk space.
.Ve
.PP
Look in the \fI/usr/local/share/magicrescue/recipes\fR directory for the recipes
-you want. Magic Rescue somes with recipes for some common file types, and you
+you want. Magic Rescue comes with recipes for some common file types, and you
can make your own too (see the next section). Open the recipes you want to use
in a text editor and read their comments. Most recipes require 3rd party
software to work, and you may want to modify some parameters (such as
@@ -269,7 +269,7 @@ software to work, and you may want to modify some parameters (such as
Then invoke \fBmagicrescue\fR
.PP
.Vb 1
-\& $ magicrescue -r jpeg-jfif -r jpeg-exif -d ~/output /dev/hdb1
+\& $ magicrescue \-r jpeg\-jfif \-r jpeg\-exif \-d ~/output /dev/hdb1
.Ve
.PP
It will scan through your entire hard disk, so it may take a while. You can
diff --git a/doc/magicrescue.pod b/doc/magicrescue.pod
index 1ae3a53..b77828d 100644
--- a/doc/magicrescue.pod
+++ b/doc/magicrescue.pod
@@ -144,7 +144,7 @@ Choose your output directory, somewhere with lots of disk space.
$ mkdir ~/output
Look in the F</usr/local/share/magicrescue/recipes> directory for the recipes
-you want. Magic Rescue somes with recipes for some common file types, and you
+you want. Magic Rescue comes with recipes for some common file types, and you
can make your own too (see the next section). Open the recipes you want to use
in a text editor and read their comments. Most recipes require 3rd party
software to work, and you may want to modify some parameters (such as
diff --git a/doc/magicsort.1 b/doc/magicsort.1
index 8ebc0d9..74fd4f6 100644
--- a/doc/magicsort.1
+++ b/doc/magicsort.1
@@ -25,11 +25,11 @@
..
.\" Set up some character translations and predefined strings. \*(-- will
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. | will give a
-.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
.ie n \{\
. ds -- \(*W-
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "MAGICSORT 1"
-.TH MAGICSORT 1 "2007-12-31" "1.1.5" "Magic Rescue"
+.TH MAGICSORT 1 "2008-06-26" "1.1.6" "Magic Rescue"
.SH "NAME"
magicsort \- Categorize files by their \fBfile\fR(1) magic
.SH "SYNOPSIS"
diff --git a/recipes/nikon-raw b/recipes/nikon-raw
new file mode 100644
index 0000000..3405940
--- /dev/null
+++ b/recipes/nikon-raw
@@ -0,0 +1,7 @@
+# Extract (at most 30 MB) Nikon NEF RAW files. These are used by Nikon dSLR
+# cameras.
+# Contributed by Brian E Lavender and refined by Daniel J Blueman.
+0 string MM\x00\x2a
+6 int32 00080019 ffffffff
+extension NEF
+command dd bs=1024k count=30 of="$1" 2>/dev/null; dcraw -i "$1" || rm -f "$1"
--
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