[Forensics-changes] [myrescue] 01/01: Imported Debian patch 0.9.4-6
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Tue Mar 31 02:09:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository myrescue.
commit c0e39b4b3dc4b35974472d452df7fca591397d03
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Mar 30 21:44:38 2015 -0300
Imported Debian patch 0.9.4-6
---
debian/changelog | 30 +++++++++++
debian/clean | 1 +
debian/compat | 2 +-
debian/control | 22 ++++----
debian/copyright | 55 +++++++------------
debian/{myrescue.docs => docs} | 0
debian/{myrescue.install => install} | 0
debian/manpages | 1 +
debian/myrescue.manpages | 1 -
debian/patches/add-hardening | 12 +++++
debian/patches/fix-gcc-warnings | 27 ++++++++++
debian/patches/fix-manpages | 102 +++++++++++++++++++++++++++++++++++
debian/patches/series | 3 ++
debian/rules | 13 ++---
debian/source.lintian-overrides | 3 --
debian/source/format | 1 +
debian/watch | 2 +-
17 files changed, 215 insertions(+), 60 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 26f1313..643f46c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+myrescue (0.9.4-6) experimental; urgency=medium
+
+ * Team upload.
+ * Migrations:
+ - debian/copyright to 1.0 format.
+ - debian/rules to new (reduced) format.
+ - DebSrc to 3.0 version.
+ - DH level to 9.
+ - Renaming:
+ ~ myrescue.docs to docs.
+ ~ myrescue.install to install.
+ ~ myrescue.manpages to manpages.
+ * debian/clean: created to remove the final binary built in upstream place.
+ * debian/control:
+ - Bumped Standards-Version to 3.9.6.
+ - Improved the long description. Also added the word 'forensics'.
+ - Updated the Vcs-* fields.
+ * debian/copyright: updated all information.
+ * debian/install: did a little change to avoid future mistakes.
+ * debian/patches/:
+ - add-hardening: added to provide GCC hardening.
+ - fix-gcc-warnings: added to avoid some GCC warnings.
+ - fix-manpages: added to fix some hyphens used as minus sign and a
+ spelling error in manpages. Thanks to A. Costa" <agcosta at gis.net>
+ for some tips. (Closes: #690922)
+ * debian/source.lintian-overrides: removed. Currently, this file is useless.
+ * debian/watch: added.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Mon, 30 Mar 2015 21:44:38 -0300
+
myrescue (0.9.4-5) unstable; urgency=low
* Updating package to standards version 3.8.2.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f8fe534
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+src/myrescue
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 236887f..c110198 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,21 @@ Section: utils
Priority: optional
Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-Homepage: http://myrescue.sourceforge.net/
-Vcs-Browser: http://git.debian.org/?p=forensics/myrescue.git
-Vcs-Git: git://git.debian.org/forensics/myrescue.git
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.6
+Homepage: http://myrescue.sf.net
+Vcs-Browser: http://anonscm.debian.org/cgit/forensics/myrescue.git
+Vcs-Git: git://anonscm.debian.org/forensics/myrescue.git
Package: myrescue
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: rescue data from damaged harddisks
+Description: rescue data from damaged disks
myrescue is a program to rescue the still-readable data from a damaged
- harddisk. It is similar in purpose to dd_rescue, but it tries to quickly get
- out of damaged areas to first handle the not yet damaged part of the disk and
- return later.
+ harddisk, CD-ROM, DVD, flash drives, etc. It is similar in purpose to
+ dd_rescue (or ddrescue), but it tries to quickly get out of damaged
+ areas to first handle the not yet damaged part of the disk and return
+ later.
+ .
+ This package is useful to recover data from any midia and for forensics
+ investigations.
diff --git a/debian/copyright b/debian/copyright
index 1ec912a..d8ef2f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,48 +1,31 @@
-Authors:
- Kristof Koehler <kristofk at users.sourceforge.net>
- Peter Schlaile <schlaile at users.sourceforge.net>
-Download: http://sourceforge.net/project/showfiles.php?group_id=68256
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: myrescue
+Source: http://myrescue.sf.net
Files: *
-Copyright:
- (C) 2000-2007 Kristof Koehler <kristofk at users.sourceforge.net>
- (C) 2000-2007 Peter Schlaile <schlaile at users.sourceforge.net>
+Copyright: 2000-2007 Kristof Koehler <kristofk at users.sourceforge.net>
+ 2000-2007 Peter Schlaile <schlaile at users.sourceforge.net>
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.
Files: debian/*
-Copyright:
- (C) 2008 Christophe Monniez <christophe.monniez at fccu.be>
- (C) 2008-2009 Daniel Baumann <daniel at debian.org>
+Copyright: 2008 Christophe Monniez <christophe.monniez at fccu.be>
+ 2008-2009 Daniel Baumann <daniel at debian.org>
+ 2015 Joao Eriberto Mota Filho <eriberto 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 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
+ (at your option) any later version.
.
- This program is distributed in the hope that it will be useful,
+ This package 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
+ 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.
+ along with this program. If not, see <http://www.gnu.org/licenses/>
.
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/myrescue.docs b/debian/docs
similarity index 100%
rename from debian/myrescue.docs
rename to debian/docs
diff --git a/debian/myrescue.install b/debian/install
similarity index 100%
rename from debian/myrescue.install
rename to debian/install
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..43e261f
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+doc/*.1
diff --git a/debian/myrescue.manpages b/debian/myrescue.manpages
deleted file mode 100644
index 30d29de..0000000
--- a/debian/myrescue.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/*
diff --git a/debian/patches/add-hardening b/debian/patches/add-hardening
new file mode 100644
index 0000000..50cafae
--- /dev/null
+++ b/debian/patches/add-hardening
@@ -0,0 +1,12 @@
+Description: add GCC hardening.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-03-30
+Index: myrescue-0.9.4/src/Makefile
+===================================================================
+--- myrescue-0.9.4.orig/src/Makefile
++++ myrescue-0.9.4/src/Makefile
+@@ -1,3 +1,3 @@
+-CFLAGS = -Wall
++#CFLAGS = -Wall
+ all: myrescue
+ myrescue: myrescue.c
diff --git a/debian/patches/fix-gcc-warnings b/debian/patches/fix-gcc-warnings
new file mode 100644
index 0000000..c894461
--- /dev/null
+++ b/debian/patches/fix-gcc-warnings
@@ -0,0 +1,27 @@
+Description: fix some GCC warnings.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-03-30
+Index: myrescue-0.9.4/src/myrescue.c
+===================================================================
+--- myrescue-0.9.4.orig/src/myrescue.c
++++ myrescue-0.9.4/src/myrescue.c
+@@ -97,7 +97,8 @@ int copy_block( int src_fd, int dst_fd,
+ perror("src read failed");
+ return errno;
+ } else {
+- fprintf(stderr,"short read: %d of %d\n",
++// [FIX] myrescue.c:101:5: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘ssize_t’ [-Wformat=]
++ fprintf(stderr,"short read: %zu of %d\n",
+ src_count, block_size);
+ return -1;
+ }
+@@ -109,7 +110,8 @@ int copy_block( int src_fd, int dst_fd,
+ perror("dst write failed");
+ return errno;
+ } else {
+- fprintf(stderr,"short write: %d of %d\n",
++// [FIX] myrescue.c:113:5: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘ssize_t’ [-Wformat=]
++ fprintf(stderr,"short write: %zu of %d\n",
+ dst_count, block_size);
+ return -1;
+ }
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
new file mode 100644
index 0000000..f8d7997
--- /dev/null
+++ b/debian/patches/fix-manpages
@@ -0,0 +1,102 @@
+Description: fix some hyphens used as minus sign and a spelling error
+ in manpages.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org> and
+ A. Costa" <agcosta at gis.net> (see #690922)
+Last-Update: 2015-03-30
+Index: myrescue-0.9.4/doc/myrescue.1
+===================================================================
+--- myrescue-0.9.4.orig/doc/myrescue.1
++++ myrescue-0.9.4/doc/myrescue.1
+@@ -29,7 +29,7 @@ myrescue \- Harddisc Rescue
+ .I output-file
+ .SH DESCRIPTION
+ myrescue is a program to rescue the still-readable data from a
+-damaged harddisk. It is similiar in purpose to dd_rescue, but it
++damaged harddisk. It is similar in purpose to dd_rescue, but it
+ tries to quickly get out of damaged areas to first handle the not
+ yet damaged part of the disk and return later.
+ .PP
+@@ -74,7 +74,7 @@ For the future consider a routinely back
+ .TP
+ .BI -b " block-size"
+ The size of the blocks (in bytes). Set this to your
+-harddiscs error detection/correction unit size. Usually
++harddisks error detection/correction unit size. Usually
+ this is 4096, which happens to be the default.
+ .TP
+ .BI -B " bitmap-file"
+@@ -122,24 +122,24 @@ Only try to read blocks within
+ blocks from an already successfully read block.
+ .TP
+ .BI -F " failed-range"
+-Extends -f to also skip any block within
++Extends \-f to also skip any block within
+ .I failed-range
+-blocks of a block to be skipped as specified by -f.
++blocks of a block to be skipped as specified by \-f.
+ .TP
+ .BI -J " jump-after-blocks"
+ Randomly jump across the disc after reading
+ .I jump-after-blocks
+ blocks. This might be useful to scan discs with scattered defects.
+-In jump mode -S causes myrescue to jump to a new block upon the first
++In jump mode \-S causes myrescue to jump to a new block upon the first
+ failed sector or upon hitting a sector to be skipped as specified by
+--f, -G or -F.
++\-f, \-G or \-F.
+ .TP
+ .BR -h ", " -?
+ Display usage information.
+ .SH RECOMMENDED PROCEDURE
+ .IP \(bu
+ Make sure you have sufficient disk space to copy the whole
+-partition (not just the used ammount of data) to plus some
++partition (not just the used amount of data) to plus some
+ space for the block bitmap (1 byte per block).
+ .IP \(bu
+ Determine the hardware block size (CRC/ECC unit) of your
+@@ -152,7 +152,7 @@ Start a skip mode run with one retry per
+ the undamaged area.
+ .IP \(bu
+ Start a normal run with one retry per block to copy the
+-remaining skipped blocks. You may try to use -f 1 to skip the
++remaining skipped blocks. You may try to use \-f 1 to skip the
+ damaged blocks from the first run.
+ .IP \(bu
+ Repeat until the number of errors seems to have converged.
+Index: myrescue-0.9.4/doc/myrescue.de.1
+===================================================================
+--- myrescue-0.9.4.orig/doc/myrescue.de.1
++++ myrescue-0.9.4/doc/myrescue.de.1
+@@ -120,18 +120,18 @@ Es werden nur Bloecke gelesen, die hoech
+ Bloecke von einem schon erfolgreich gelesenen Block entfernt liegen.
+ .TP
+ .BI -F " failed-range"
+-Erweitert die Wirkung von -f: Es werden auch Bloecke uebersprungen,
++Erweitert die Wirkung von \-f: Es werden auch Bloecke uebersprungen,
+ die bis zu
+ .I failed-range
+-Bloecke von einem laut -f zu ueberspringenden Block entfernt liegen.
++Bloecke von einem laut \-f zu ueberspringenden Block entfernt liegen.
+ .TP
+ .BI -J " jump-after-blocks"
+ Jeweils nachdem
+ .I jump-after-blocks
+ Bloecke gelesen wurden, wird zufaellig zu einem anderen Block gesprungen.
+ Sinnvoll, um Platten mit verstreuten Defektbereichen zunaechst zu
+-scannen. In diesem Modus bewirkt -S das Weiterspringen beim ersten
+-Defekt oder beim Antreffen eines Blocks, der laut -f, -G or -F zu
++scannen. In diesem Modus bewirkt \-S das Weiterspringen beim ersten
++Defekt oder beim Antreffen eines Blocks, der laut \-f, \-G or \-F zu
+ ueberspringen ist.
+ .TP
+ .BR -h ", " -?
+@@ -180,7 +180,7 @@ Festplatte Zeit gibt, sich zu rekalibrie
+ Die Programmierer freuen sich (vor allem wenn alles glatt geht) von Ihnen und Ihren
+ Erfahrungen hoeren, insbesondere im
+ .B Experiences
+--Forum auf der Sourceforge Project Seite. Vielen Dank!
++\-Forum auf der Sourceforge Project Seite. Vielen Dank!
+ .SH BEKANNTE FEHLER
+ Das Handling der
+ .I bitmap-file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b16a539
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+fix-manpages
+fix-gcc-warnings
+add-hardening
diff --git a/debian/rules b/debian/rules
index ba13def..7065c7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
-%:
- dh ${@} --sourcedirectory=src
-
-override_dh_auto_clean:
- dh_auto_clean
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
- rm -f src/myrescue
-
-override_dh_auto_install:
- # nothing to be done
+%:
+ dh $@ --sourcedirectory=src
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index f64d760..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Avoid warnings if non-uploaders to uploads.
-myrescue source: changelog-should-mention-nmu
-myrescue source: source-nmu-has-incorrect-version-number
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
index 4f325f1..9ab8e2a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/myrescue/myrescue-(.+)\.tar\.gz
+http://sf.net/myrescue/myrescue-(.*)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/myrescue.git
More information about the forensics-changes
mailing list