[Forensics-changes] [magicrescue] 01/01: Imported Debian patch 1.1.9-3
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sun Aug 28 13:07:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository magicrescue.
commit d6e9383c83c17ba0aa562f10830d5f5168e06beb
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sat Aug 27 21:58:59 2016 -0300
Imported Debian patch 1.1.9-3
---
debian/README.Debian | 2 +-
debian/changelog | 23 ++++++++-
debian/control | 53 +++++++++------------
debian/copyright | 12 ++---
.../{fix-FTBFS-Hurd => 10_fix-FTBFS-Hurd.patch} | 0
.../{magicrescue.1 => 20_fix-manpage.patch} | 0
..._configure => 30_make-Makefile-compliant.patch} | 4 +-
.../{laola.pl => 40_add-Perl-preprocessor.patch} | 0
debian/patches/50_fix-failure-word.patch | 55 ++++++++++++++++++++++
debian/patches/series | 9 ++--
debian/watch | 2 +-
11 files changed, 113 insertions(+), 47 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index e8e146e..c2f2c1c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,6 +2,6 @@ magicrescue for Debian
----------------------
You can create new recipes and put them in /usr/share/magicrescue/recipes.
-See the manpage to more details.
+See the manpage for more details.
-- Joao Eriberto Mota Filho <eriberto at debian.org> Mon, 03 Nov 2014 10:01:09 -0200.
diff --git a/debian/changelog b/debian/changelog
index 88fd2dd..ac806da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+magicrescue (1.1.9-3) unstable; urgency=medium
+
+ * debian/control:
+ - Bumped Standards-Version to 3.9.8.
+ - Changed from libjpeg-progs to libjpeg-turbo-progs in Depends field.
+ Thanks to Ondřej Surý <ondrej at debian.org>. (Closes: #813391)
+ - Improved the long description.
+ - Updated the Vcs-* fields to use https instead of http and git.
+ * debian/copyright:
+ - Dropped dot-zero from GPL license short name.
+ - Updated the packaging copyright years.
+ * debian/patches/:
+ - fix-FTBFS-Hurd: renamed to 10_fix-FTBFS-Hurd.patch.
+ - magicrescue.1: renamed to 20_fix-manpage.patch.
+ - pre_configure: renamed to 30_make-Makefile-compliant.patch.
+ - laola.pl: renamed to 40_add-Perl-preprocessor.patch.
+ - 50_fix-failure-word.patch: added to fix a spelling error.
+ * debian/watch: bumped to version 4.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sat, 27 Aug 2016 21:58:59 -0300
+
magicrescue (1.1.9-2) unstable; urgency=medium
* debian/control: fixed the VCS fields.
@@ -28,7 +49,7 @@ magicrescue (1.1.9-1) unstable; urgency=medium
- Updated the upstream homepage.
- Updated the upstream and packaging copyright information.
* debian/docs: removed the README file. All useful information are in manpage.
- * debian/intall: created to install the new file debian/recipes/sqlite.
+ * debian/install: created to install the new file debian/recipes/sqlite.
* debian/lintian-overrides: added to override a false positive.
* debian/patches/:
- Added some fields in header of the pre_configure patch.
diff --git a/debian/control b/debian/control
index 0b8df1a..3d4b4be 100644
--- a/debian/control
+++ b/debian/control
@@ -4,46 +4,35 @@ Priority: optional
Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
Build-Depends: debhelper (>= 9), libgdbm-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://www.itu.dk/people/jobr/magicrescue
-Vcs-Git: git://anonscm.debian.org/forensics/magicrescue.git
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/magicrescue.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/magicrescue.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/magicrescue.git
Package: magicrescue
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dcraw, flac, libjpeg-progs,
- mpg123, sqlite3, unzip, zip
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ dcraw,
+ flac,
+ libjpeg-turbo-progs,
+ mpg123,
+ sqlite3,
+ unzip,
+ zip
Description: recovers files by looking for magic bytes
Magic Rescue scans a block device for file types it knows how to recover
and calls an external program to extract them. It looks at "magic bytes"
- in file contents, so it can be used both as an undelete utility and for
- recovering a corrupted drive or partition. As long as the file data is
- there, it will find it.
+ (file patterns) in file contents, so it can be used both as an undelete
+ utility and for recovering a corrupted drive or partition. As long as
+ the file data is there, it will find it.
.
Magic Rescue uses files called 'recipes'. These files have strings and
commands to identify and extract data from devices or forensics images.
- So, you can write your own recipes. Currently, there are these recipes:
+ So, you can write your own recipes. Currently, there are the following
+ recipes: avi, canon-cr2, elf, flac, gimp-xcf, gpl, gzip, jpeg-exif,
+ jpeg-jfif, mbox, mbox-mozilla-inbox, mbox-mozilla-sent, mp3-id3v1,
+ mp3-id3v2, msoffice, nikon-raw, perl, png, ppm, sqlite and zip.
.
- * avi
- * canon-cr2
- * elf
- * flac
- * gimp-xcf
- * gpl
- * gzip
- * jpeg-exif
- * jpeg-jfif
- * mbox
- * mbox-mozilla-inbox
- * mbox-mozilla-sent
- * mp3-id3v1
- * mp3-id3v2
- * msoffice
- * nikon-raw
- * perl
- * png
- * ppm
- * sqlite
- * zip
- .
- This program is useful in forensics investigations.
+ This package provides magicrescue, dupemap and magicsort commands.
+ magicrescue is a carver and is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index cd70d67..c816738 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,19 +4,19 @@ Source: http://www.itu.dk/people/jobr/magicrescue
Files: *
Copyright: 2004-2009 Jonas Jensen <jbj at knef.dk>
-License: GPL-2.0+
+License: GPL-2+
Files: tools/laola.pl
Copyright: 1996-1997 Martin Schwartz
-License: GPL-2.0+
+License: GPL-2+
Files: debian/*
Copyright: 2006-2009 Torsten Werner <twerner at debian.org>
- Varun Hiremath <varun at debian.org>
- 2014 Joao Eriberto Mota Filho <eriberto at debian.org>
-License: GPL-2.0+
+ 2006-2009 Varun Hiremath <varun at debian.org>
+ 2014-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
+License: GPL-2+
-License: GPL-2.0+
+License: GPL-2+
This package 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
diff --git a/debian/patches/fix-FTBFS-Hurd b/debian/patches/10_fix-FTBFS-Hurd.patch
similarity index 100%
rename from debian/patches/fix-FTBFS-Hurd
rename to debian/patches/10_fix-FTBFS-Hurd.patch
diff --git a/debian/patches/magicrescue.1 b/debian/patches/20_fix-manpage.patch
similarity index 100%
rename from debian/patches/magicrescue.1
rename to debian/patches/20_fix-manpage.patch
diff --git a/debian/patches/pre_configure b/debian/patches/30_make-Makefile-compliant.patch
similarity index 95%
rename from debian/patches/pre_configure
rename to debian/patches/30_make-Makefile-compliant.patch
index 05d154e..8b00204 100644
--- a/debian/patches/pre_configure
+++ b/debian/patches/30_make-Makefile-compliant.patch
@@ -22,7 +22,7 @@ Index: magicrescue-1.1.9/Makefile.in
- [ -d $(PREFIX) ]
+ mkdir -p $(DESTDIR)/usr/lib/magicrescue/tools \
+ $(DESTDIR)/usr/share/magicrescue/recipes \
-+ $(DESTDIR)/usr/bin
++ $(DESTDIR)/usr/bin
- mkdir -p $(PREFIX)/share/magicrescue/tools \
- $(PREFIX)/share/magicrescue/recipes \
@@ -33,7 +33,7 @@ Index: magicrescue-1.1.9/Makefile.in
- cp recipes/* $(PREFIX)/share/magicrescue/recipes/
- cp $(DOCS) $(PREFIX)/man/man1
+ cp magicrescue$(EXE) dupemap$(EXE) magicsort $(DESTDIR)/usr/bin/
-+ cp recipes/* $(DESTDIR)/usr/share/magicrescue/recipes/
++ cp recipes/* $(DESTDIR)/usr/share/magicrescue/recipes/
for f in tools/*; do \
if [ -x "$$f" ]; then \
diff --git a/debian/patches/laola.pl b/debian/patches/40_add-Perl-preprocessor.patch
similarity index 100%
rename from debian/patches/laola.pl
rename to debian/patches/40_add-Perl-preprocessor.patch
diff --git a/debian/patches/50_fix-failure-word.patch b/debian/patches/50_fix-failure-word.patch
new file mode 100644
index 0000000..a14927d
--- /dev/null
+++ b/debian/patches/50_fix-failure-word.patch
@@ -0,0 +1,55 @@
+Description: fix the word 'faliure'.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-08-27
+Index: magicrescue-1.1.9/doc/dupemap.1
+===================================================================
+--- magicrescue-1.1.9.orig/doc/dupemap.1
++++ magicrescue-1.1.9/doc/dupemap.1
+@@ -371,7 +371,7 @@ creates both a \fIdatabase\fR\fB.dir\fR
+ \&\fBdupecheck\fR depends on a database library for storing the checksums. It
+ currently requires the POSIX-standardized \fBndbm\fR library, which must be
+ present on XSI-compliant UNIXes. Implementations are not required to handle
+-hash key collisions, and a faliure to do that could make \fBdupecheck\fR delete
++hash key collisions, and a failure to do that could make \fBdupecheck\fR delete
+ too many files. I haven't heard of such an implementation, though.
+ .PP
+ The current checksum algorithm is the file's \s-1CRC32\s0 combined with its size.
+Index: magicrescue-1.1.9/doc/dupemap.pod
+===================================================================
+--- magicrescue-1.1.9.orig/doc/dupemap.pod
++++ magicrescue-1.1.9/doc/dupemap.pod
+@@ -246,7 +246,7 @@ creates both a I<database>B<.dir> and I<
+ B<dupecheck> depends on a database library for storing the checksums. It
+ currently requires the POSIX-standardized B<ndbm> library, which must be
+ present on XSI-compliant UNIXes. Implementations are not required to handle
+-hash key collisions, and a faliure to do that could make B<dupecheck> delete
++hash key collisions, and a failure to do that could make B<dupecheck> delete
+ too many files. I haven't heard of such an implementation, though.
+
+ The current checksum algorithm is the file's CRC32 combined with its size.
+Index: magicrescue-1.1.9/src/magicrescue.c
+===================================================================
+--- magicrescue-1.1.9.orig/src/magicrescue.c
++++ magicrescue-1.1.9/src/magicrescue.c
+@@ -424,7 +424,7 @@ static int parse_recipe(const char *reci
+ To add more operations:
+ - Add another type to union param if you have to.
+ - Define a test function like op_string that returns 1 on
+- success and 0 on faliure.
++ success and 0 on failure.
+ - Add another "else if" clause here. It must assign to
+ op->func and to len.
+ - The value assigned to len should be the maximum number of
+Index: magicrescue-1.1.9/tools/mp3extract.pl
+===================================================================
+--- magicrescue-1.1.9.orig/tools/mp3extract.pl
++++ magicrescue-1.1.9/tools/mp3extract.pl
+@@ -2,7 +2,7 @@
+ use strict;
+
+ # This script tries to decode the first part of the mp3 with mpg123, and if
+-# that fails it will truncate the mp3 at that faliure point.
++# that fails it will truncate the mp3 at that failure point.
+ # I could also use mp3_check, perhaps it is more correct. However, users are
+ # not likely to have it installed.
+
diff --git a/debian/patches/series b/debian/patches/series
index cf660e0..c3bd7ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-fix-FTBFS-Hurd
-magicrescue.1
-pre_configure
-laola.pl
+10_fix-FTBFS-Hurd.patch
+20_fix-manpage.patch
+30_make-Makefile-compliant.patch
+40_add-Perl-preprocessor.patch
+50_fix-failure-word.patch
diff --git a/debian/watch b/debian/watch
index 651085e..0d504bb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
http://www.itu.dk/people/jobr/magicrescue release/magicrescue-(\d\S+)\.tar\.(?:bz2|gz|xz)
--
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