[Forensics-changes] [gpart] 02/02: Imported Debian patch 2.1-1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Thu Mar 12 14:13:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository gpart.
commit 91db3162858eb749f1a6d5ccb46804877367da7b
Merge: caa8692 70e7841
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Wed Mar 11 16:46:50 2015 -0300
Imported Debian patch 2.1-1
.gitignore | 18 +
Changes | 12 +
Makefile | 23 -
Makefile.am | 6 +
README | 67 +--
autogen.sh | 7 +
configure.ac | 39 ++
debian/README.Debian | 59 +++
debian/changelog | 28 ++
debian/control | 2 +-
debian/copyright | 12 +-
debian/patches/01-conglomeration | 604 -------------------------
debian/patches/02-ntfs-winxp | 19 -
debian/patches/03-open-mode | 16 -
debian/patches/04-imagefile | 60 ---
debian/patches/05-add-hardening | 31 --
debian/patches/{06-fix-manpage => fix-manpage} | 36 +-
debian/patches/series | 8 +-
debian/rules | 5 +-
inst.defs | 9 -
make.defs | 12 -
man/Makefile | 26 --
man/Makefile.am | 1 +
man/{gpart.man => gpart.8.in} | 12 +-
src/Makefile | 61 ---
src/Makefile.am | 6 +
src/disku.c | 63 ++-
src/gm_ext2.c | 3 +-
src/gm_fat.h | 8 +-
src/gm_ntfs.c | 8 -
src/gm_ntfs.h | 36 +-
src/{gm_rfs.c => gm_reiserfs.c} | 25 +-
src/{gm_rfs.h => gm_reiserfs.h} | 30 +-
src/gmodules.c | 67 +--
src/gmodules.h | 33 +-
src/gpart.c | 68 +--
src/gpart.h | 64 +--
src/l64seek.c | 17 -
src/l64seek.h | 17 +-
39 files changed, 434 insertions(+), 1184 deletions(-)
diff --cc debian/README.Debian
index 0000000,0000000..cf968e1
new file mode 100644
--- /dev/null
+++ b/debian/README.Debian
@@@ -1,0 -1,0 +1,59 @@@
++GPart for Debian
++----------------
++
++This README file was specially written to make public all changes
++implemented by Baruch Even in GPart v2. These lines were compiled
++from each commit in GitHub[1].
++
++--- 0.2.1 version
++
++Fri Dec 6 21:20:35 2013 +0200 - Baruch Even: Updated changes file
++Fri Dec 6 21:20:03 2013 +0200 - Baruch Even: Update version to 0.2.1
++Fri Dec 6 21:19:01 2013 +0200 - Baruch Even: Fix missing files from distribution
++Sat Nov 2 20:28:54 2013 +0200 - Baruch Even: Remove mentions of shared modules from docs
++Sat Nov 2 20:24:20 2013 +0200 - Baruch Even: Fix bug introduced in 9a5fe0f91c4855cf85b2710f3f19b6eb1a6e430a
++Sat Nov 2 19:35:08 2013 +0200 - Baruch Even: Declare module list only once
++Sat Nov 2 19:29:40 2013 +0200 - Baruch Even: Fully remove dynamic module support
++Fri Nov 1 21:25:15 2013 +0200 - Baruch Even: Always be verbose about usage()
++Fri Nov 1 21:13:27 2013 +0200 - Baruch Even: Remove support for dynamic module loading
++
++--- 0.2 version
++
++Fri Nov 1 13:24:48 2013 +0200 - Baruch Even: Bump to version 0.2
++Fri Nov 1 13:16:32 2013 +0200 - Baruch Even: Prefer the reported number of sectors over calculation
++Fri Nov 1 12:14:26 2013 +0200 - Baruch Even: Default scan incremenet by sector
++Fri Nov 1 11:45:46 2013 +0200 - Baruch Even: Fix for FreeBSD size reads
++Thu Oct 31 21:56:55 2013 +0200 - Baruch Even: Reduce ifdefs and fix for 64bit
++Thu Oct 31 21:40:40 2013 +0200 - Baruch Even: Bump version to 0.1i
++Thu Oct 31 21:39:12 2013 +0200 - Baruch Even: Switch to autoconf/automake to make cross platform saner
++Thu Oct 31 21:00:55 2013 +0200 - Baruch Even: Use cross-platform little-endian conversion funcs
++Thu Oct 31 00:13:23 2013 +0200 - Baruch Even: Fix name of reiserfs struct
++Thu Oct 31 00:12:00 2013 +0200 - Baruch Even: Remove unused code
++Wed Oct 30 23:39:07 2013 +0200 - Baruch Even: Better handling for imagefile
++Wed Oct 30 23:37:56 2013 +0200 - Baruch Even: Fix for WinXP NTFS
++Wed Oct 30 23:36:41 2013 +0200 - Baruch Even: Use 64bit lseek
++Wed Oct 30 23:36:15 2013 +0200 - Baruch Even: Fix NTFS definitions to work on all arches
++Wed Oct 30 23:35:52 2013 +0200 - Baruch Even: Use errno.h header
++Wed Oct 30 23:35:03 2013 +0200 - Baruch Even: Fix fat struct packing
++Wed Oct 30 23:34:33 2013 +0200 - Baruch Even: Fix ext3 handling
++Wed Oct 30 23:32:59 2013 +0200 - Baruch Even: Rename rfs to reiserfs
++Wed Oct 30 23:31:38 2013 +0200 - Baruch Even: Proper build of large file support
++Wed Oct 30 23:30:48 2013 +0200 - Baruch Even: Fix install directories
++Wed Oct 30 23:29:20 2013 +0200 - Baruch Even: Fixup Makefile to split install target and proper PHONY
++Wed Oct 30 23:12:54 2013 +0200 - Baruch Even: Another fix for overflow in extended partitions
++Wed Oct 30 23:11:59 2013 +0200 - Baruch Even: Fix overflow in extended partitions
++Wed Oct 30 21:42:01 2013 +0200 - Baruch Even: Fix the permission on O_CREAT
++Wed Oct 30 21:40:46 2013 +0200 - Baruch Even: Set the permissions on O_CREAT call
++Wed Oct 30 21:39:07 2013 +0200 - Baruch Even: Fix compile on x86-64
++Wed Oct 30 21:38:31 2013 +0200 - Baruch Even: Do not strip executable on install
++Wed Oct 30 21:37:41 2013 +0200 - Baruch Even: Use large file support (LFS)
++Wed Oct 30 21:36:52 2013 +0200 - Baruch Even: Use the right llseek syscall in Linux
++Wed Oct 30 21:35:47 2013 +0200 - Baruch Even: errno.h is needed not only for FreeBSD
++Wed Oct 30 21:34:34 2013 +0200 - Baruch Even: Allow overriding cflags
++Wed Oct 30 21:33:19 2013 +0200 - Baruch Even: Change variable names
++Wed Oct 30 21:30:42 2013 +0200 - Baruch Even: Updated to 0.1h
++Wed Oct 30 21:26:38 2013 +0200 - Baruch Even: Import 0.1f
++
++[1] https://github.com/baruch/gpart
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Thu, 12 Mar 2015 09:24:50 -0300
diff --cc debian/changelog
index cdc7d3a,0000000..7428105
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,233 -1,0 +1,261 @@@
++gpart (2.1-1) experimental; urgency=medium
++
++ * New upstream release.
++ * Using dh-autoreconf.
++ * debian/copyright:
++ - Added Baruch Even to upstream copyright.
++ - Fixed the copyright and license for src/gm_bsddl.h file.
++ - Renamed (by upstream) the file src/gm_rfs.h to src/gm_reiserfs.h.
++ * debian/patches/:
++ - fix-manpage: added to fix some hyphens used as minus sign in new
++ manpage.
++ - Removed patches (the upstream fixed the source code - thanks!):
++ ~ 01-conglomeration
++ ~ 02-ntfs-winxp
++ ~ 03-open-mode
++ ~ 04-imagefile
++ ~ 05-add-hardening
++ - Renamed patch:
++ ~ 06-fix-manpage: renamed to fix-manpage and updated.
++ * debian/README.Debian: added to show the changes made by upstream to
++ create GPart v2.
++ * debian/rules: changed from DEB_CFLAGS_MAINT_APPEND and
++ DEB_LDFLAGS_MAINT_APPEND variables to DEB_BUILD_MAINT_OPTIONS,
++ to improve the GCC hardening. This version allow this variable
++ instead the last used.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Wed, 11 Mar 2015 16:46:50 -0300
++
+gpart (0.1h-12) experimental; urgency=medium
+
+ * New co-maintainer.
+ * Updated the upstream homepage. (Closes: #630336)
+ * Migrations:
+ - DebSrc to 3.0 version.
+ - DH level to 9.
+ * debian/control:
+ - Added the 'forensics' word to long description.
+ - Bumped Standards-Version to 3.9.6.
+ - Updated the Vcs-* fields.
+ * debian/copyright:
+ - Updated all copyright files, authors and dates.
+ - Updated the file header.
+ - Updated the GPL-2 license text.
+ * debian/gpart.docs: renamed to docs.
+ * debian/patches/:
+ - Added the 'Last-Update' field to 02-ntfs-winxp, 03-open-mode and
+ 04-imagefile patches.
+ - Added 05-add-hardening to implement the GCC hardening.
+ - Added 06-fix-manpage to fix some hyphens used as minus sign.
+ - Removed all .patch extensions.
+ - Tried to discover/describe each action, creating headers for all
+ authors and dates. However, is very hard say that the result is
+ 100% reliable.
+ * debian/rules:
+ - Full updated.
+ - Added DEB_CFLAGS_MAINT_APPEND and DEB_LDFLAGS_MAINT_APPEND to fix
+ issues shown by blhc command.
+ * debian/source.lintian-overrides: removed because produces an
+ undesirable action.
+ * debian/watch: added.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 01 Mar 2015 11:45:34 -0300
+
+gpart (0.1h-11) unstable; urgency=low
+
+ * Minimizing rules file.
+ * Adding forgotton seperator in build target of rules.
+ * Setting uploaders to Christophe.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 29 Jul 2009 21:14:51 +0200
+
+gpart (0.1h-10) 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:56:58 +0200
+
+gpart (0.1h-9) unstable; urgency=low
+
+ * Adding patch from Josef Spillner <2005 at kuarepoti-dju.net> to add
+ support for image files.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 May 2009 20:17:59 +0200
+
+gpart (0.1h-8) unstable; urgency=low
+
+ * Prefixing debhelper files with package name.
+ * Using correct rfc-2822 date formats in changelog.
+ * Upgrading package to standards 3.8.1.
+ * Updating year in copyright.
+ * Tidy rules file.
+ * Using quilt rather than dpatch.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 28 May 2009 21:21:14 +0200
+
+gpart (0.1h-7) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Replacing obsolete dh_clean -k with dh_prep.
+
+ [ Christophe Monniez ]
+ * Adding patch from James Westby to fix a call to open without
+ specifying a mode (Closes: #506816).
+
+ [ Daniel Baumann ]
+ * Actually adding the file 03-open-mode.dpatch.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 25 Nov 2008 08:35:00 +0100
+
+gpart (0.1h-6) unstable; urgency=low
+
+ * Using patch-stamp rather than patch in rules file.
+ * Adding patch from Trace Green <debian.y.h.xu at gmail.com> to add support for
+ NTFS of Windows XP (Closes: #474321).
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 06 Nov 2008 16:23:00 +0100
+
+gpart (0.1h-5) unstable; urgency=low
+
+ * New maintainer (Closes: #487731).
+ * Removing useless whitespaces at EOL and EOF in all debian files.
+ * Reverting debian changes to upstream, using dpatch to modify upstream.
+ * Upgrading package to debhelper 7.
+ * Upgrading package to standards 3.8.0.
+ * Adding homepage field in control file.
+ * Adding vcs fields in control file.
+ * Sorting fields in control file.
+ * Adding ${misc:Depends} to depends.
+ * Rewrapping package long-description in control file.
+ * Rewriting copyright file in machine-interpretable format.
+ * Removing not usefull README.Debian.
+ * Removing not usefull TODO.Debian.
+ * Updating author email address in copyright file.
+ * Removing not usefull LSM file from docs debhelper file.
+ * Removing patch left-over in debian directory.
+ * Rewriting rules file from scratch.
+ * Removing unused dirs debhelper file.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 19 Sep 2008 08:39:00 +0200
+
+gpart (0.1h-4.1) unstable; urgency=medium
+
+ * NMU from the Cambridge BSP
+ * Rather than attempt to use the syscall(!) interface for 64-bit lseek,
+ simply compile to use the 64-bit VFS interface and use the normal
+ lseek calls. Let libc deal with the issues...
+ Closes: #225578, #294836, #393039.
+ * Applied the reiserfs 3.6 recognition patch from
+ ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz
+ Closes: #246989, #322256
+ * Recogniise ext3 filesystems as well as ext2. Thanks to Xisco Calafat
+ for the patch. Closes: #212989
+
+ -- Steve McIntyre <93sam at debian.org> Sat, 28 Oct 2006 22:50:42 +0100
+
+gpart (0.1h-4) unstable; urgency=low
+
+ * recompile to resolve errno problem; no changes required
+ Closes: #225018: gpart binary is incorrectly built
+ * debian standards 3.5.10:
+ - support DEB_BUILD_OPTIONS "noopt"
+
+ -- David Coe <davidc at debian.org> Thu, 25 Dec 2003 01:31:30 -0500
+
+gpart (0.1h-3) unstable; urgency=low
+
+ * corrected punctuation in package description
+ Closes: #124692: Spelling error in description
+
+ -- David Coe <davidc at debian.org> Mon, 17 Dec 2001 21:06:11 -0500
+
+gpart (0.1h-2) unstable; urgency=low
+
+ * moved Build-Depends to the right place
+ Closes: #119348: malformed debian/control
+ * patched to build on ia64 (and others), thanks to Doug Porter
+ <dsp at debian.org>, and changed to Architecture: any.
+ Closes: #119347: fix to build on ia64
+ * standards version now 3.5.6; no changes needed.
+
+ -- David Coe <davidc at debian.org> Sun, 25 Nov 2001 23:08:43 -0500
+
+gpart (0.1h-1) unstable; urgency=low
+
+ * new upstream version:
+ v0.1h
+ - New support for BeOS, QNX 4.x & SGI XFS filesystems.
+ - Updated Reiser filesystem support.
+ - Updated LVM support.
+ - Several small fixes from contributors.
+ v0.1g
+ - For access via raw devices: made writing of guessed table also
+ aligned (reading has been aligned since 0.1f).
+ - Fixed stupid copy&paste bug in the partition table check routine.
+ Closes: #66894 "crashes immediately on Alpha [includes patch]
+ (the suggested patch was applied upstream)
+ Closes: #85151 "New upstream version available"
+ * patched gm_fat.h as suggested by Falk Hueffner <falk at debian.org>
+ Closes: #66893 "FAT detection broken on Alpha"
+ * debian standards 3.5.2 (support for DEB_BUILD_OPTIONS)
+
+ -- David Coe <david.coe at someotherplace.org> Sat, 24 Feb 2001 21:01:33 -0500
+
+gpart (0.1f-1) frozen unstable; urgency=medium
+
+ * new upstream version:
+ - Default scan increment is 'h' [head] again.
+ - Fixed wrong head-boundary condition. closes: #59147
+ - Introduced possibility to edit guessed partitions.
+ - Scan now starts on (sectors/head) unless -k <start> was given.
+ - Length of guessed NTFS partitions now includes NTFS backup boot
+ sector created by NT4.
+
+ -- David Coe <david.coe at someotherplace.org> Sun, 27 Feb 2000 22:02:45 -0500
+
+gpart (0.1e-2) frozen unstable; urgency=low
+
+ * added ARM architecture, thanks to Philip Blundell; closes: #58395
+
+ -- David Coe <david.coe at someotherplace.org> Fri, 18 Feb 2000 13:24:35 -0500
+
+gpart (0.1e-1) unstable; urgency=low
+
+ * new upstream version:
+ - Default scan increment now 's', extended partition table boundary
+ condition now depends on scan increment (head if 's', else cylinder
+ boundary).
+ - Added LVM physical volume module (LVM by Heinz Mauelshagen).
+ * Debian change to "Architecture: alpha i386", until upstream resolves
+ endianness and other architecture differences (closes: #46101);
+ forwarded various architecture/endianness suggestions upstream.
+ * Also improved upstream:
+ - A more detailed README.
+ * revised the man page (improved wording, format), at upstream
+ author's request; sent changes upstream.
+ * added TODO.Debian
+ * finished FHS transition; docs are now in /usr/share/doc/ with
+ appropriate compatibility symlink, thanks to debhelper.
+
+ -- David Coe <david.coe at someotherplace.org> Sun, 07 Nov 1999 04:18:14 +0000
+
+gpart (0.1d-1) unstable; urgency=low
+
+ * new upstream version
+ * changed for debian standards 3.0.1 and FHS (except for /usr/doc)
+
+ -- David L. Coe <david.coe at someotherplace.org> Fri, 20 Aug 1999 04:26:15 +0000
+
+gpart (0.1c-2) unstable; urgency=low
+
+ * install into /sbin rather than /usr/sbin (as explained in README.Debian)
+ * improved description
+
+ -- David L. Coe <david.coe at someotherplace.org> Tue, 01 Jun 1999 02:49:55 +0000
+
+gpart (0.1c-1) unstable; urgency=low
+
+ * initial debianization
+
+ -- David L. Coe <david.coe at someotherplace.org> Fri, 28 May 1999 22:49:11 +0000
diff --cc debian/control
index df9c50e,0000000..a56ac9b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,46 -1,0 +1,46 @@@
+Source: gpart
+Section: admin
+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)
++Build-Depends: debhelper (>= 9), dh-autoreconf
+Standards-Version: 3.9.6
+Homepage: https://github.com/baruch/gpart
+Vcs-Browser: http://anonscm.debian.org/cgit/forensics/gpart.git
+Vcs-Git: git://anonscm.debian.org/forensics/gpart.git
+
+Package: gpart
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Guess PC disk partition table, find lost partitions
+ Gpart is a tool which tries to guess the primary partition table of a PC-type
+ disk in case the primary partition table in sector 0 is damaged, incorrect or
+ deleted.
+ .
+ It is also good at finding and listing the types, locations, and sizes of
+ inadvertently-deleted partitions, both primary and logical. It gives you the
+ information you need to manually re-create them (using fdisk, cfdisk, sfdisk,
+ etc.).
+ .
+ The guessed table can also be written to a file or (if you firmly believe the
+ guessed table is entirely correct) directly to a disk device.
+ .
+ Currently supported (guessable) filesystem or partition types:
+ .
+ * BeOS filesystem type.
+ * FreeBSD/NetBSD/386BSD disklabel sub-partitioning scheme used on Intel
+ platforms.
+ * Linux second extended filesystem.
+ * MS-DOS FAT12/16/32 "filesystems".
+ * IBM OS/2 High Performance filesystem.
+ * Linux LVM physical volumes (LVM by Heinz Mauelshagen).
+ * Linux swap partitions (versions 0 and 1).
+ * The Minix operating system filesystem type.
+ * MS Windows NT/2000 filesystem.
+ * QNX 4.x filesystem.
+ * The Reiser filesystem (version 3.5.X, X > 11).
+ * Sun Solaris on Intel platforms uses a sub-partitioning scheme on PC hard
+ disks similar to the BSD disklabels.
+ * Silicon Graphics' journalling filesystem for Linux.
+ .
+ Gpart is useful in recovery actions and forensics investigations.
diff --cc debian/copyright
index 7a3786d,0000000..e0a8d9f
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,64 -1,0 +1,70 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gpart
+Source: https://github.com/baruch/gpart
+Comment: the original homepage (from initial upstream) was
+ http://www.brzitwa.de/mb/gpart.
+
+Files: *
+Copyright: 1999-2001 Michail Brzitwa <mb at ichabod.han.de>
++ 2013 Baruch Even <baruch at ev-en.org>
+License: GPL-2+
++Comment: Baruch Even didn't put his name into the source code yet.
++ However, Baruch did several changes in gpart and released
++ the 0.2 and 0.2.1 versions in GitHub. Baruch already was
++ a DD.
+
- Files: src/gm_rfs.h
++Files: src/gm_reiserfs.h
+Copyright: 1996-2000 Hans Reiser
+License: GPL-2+
+
+Files: src/gm_bsddl.h
- Copyright: FreeBSD
- License: BSD-2-Clause
++Copyright: ? FreeBSD
++ 1999-2001 Michail Brzitwa <mb at ichabod.han.de>
++License: GPL-2+ and BSD-2-Clause
+
+Files: debian/*
+Copyright: 1999-2003 David Coe <davidc at debian.org>
+ 2006 Steve McIntyre <93sam at debian.org>
+ 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 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 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
+ 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, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --cc debian/patches/fix-manpage
index 92e2217,0000000..659baff
mode 100644,000000..100644
--- a/debian/patches/fix-manpage
+++ b/debian/patches/fix-manpage
@@@ -1,120 -1,0 +1,112 @@@
+Description: fix some hyphens used as minus sign.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
- Last-Update: 2015-03-01
- Index: gpart-0.1h/man/gpart.man
++Last-Update: 2015-03-11
++Index: gpart-2.1/man/gpart.8.in
+===================================================================
- --- gpart-0.1h.orig/man/gpart.man
- +++ gpart-0.1h/man/gpart.man
++--- gpart-2.1.orig/man/gpart.8.in
+++++ gpart-2.1/man/gpart.8.in
+@@ -9,10 +9,10 @@ gpart \- guess PC-type hard disk partiti
+ [options]
+ .I device
+
+-Options: [-b <backup MBR>][-C c,h,s][-c][-d][-E][-e][-f]
+-[-g][-h][-i][-K <last-sector>][-k <# of sectors>] [-L]
+-[-l <log file>][-n <increment>] [-q][-s <sector-size>]
+-[-t <module-name>][-V][-v] [-W <device>][-w <module-name,
++Options: [\-b <backup MBR>][\-C c,h,s][\-c][\-d][\-E][\-e][\-f]
++[\-g][\-h][\-i][\-K <last-sector>][\-k <# of sectors>] [\-L]
++[\-l <log file>][\-n <increment>] [\-q][\-s <sector-size>]
++[\-t <module-name>][\-V][\-v] [\-W <device>][\-w <module-name,
+ weight>]
+ .SH DESCRIPTION
+ .B gpart
+@@ -187,7 +187,7 @@ geometry. For instance if a disk with th
+ should be called like
+
+ .RS
+-gpart -C 1028,255,63 <other options> <device>
++gpart \-C 1028,255,63 <other options> <device>
+ .RE
+
+ .SH PRECAUTIONS
- @@ -219,13 +219,13 @@ result in severe filesystem corruption.
- should be stored in a safe place like a floppy disk.
-
- .SH OPTIONS
- -.IP "-b backupfile"
- +.IP "\-b backupfile"
++@@ -223,7 +223,7 @@ should be stored in a safe place like a
+ If the guessed primary partition table seems consistent
+ and should be written (see the
+ .I
+--W
++\-W
+ option) backup the current MBR into the specified file.
- -.IP "-C c,h,s"
- +.IP "\-C c,h,s"
++ .IP "-C c,h,s"
+ Set the disk geometry (cylinders, heads, sectors) for
- the scan. This is useful if a disk should be scanned
- which was partitioned using a different geometry, if the
- @@ -364,7 +364,7 @@ are allowed.
++@@ -360,7 +360,7 @@ are allowed.
+
+
+ .PP
+-Default settings are "-n h".
++Default settings are "\-n h".
+
+ .SH EXAMPLES
+ \-\ To scan the first IDE hard disk under Linux using default
- @@ -378,7 +378,7 @@ gpart /dev/hda
++@@ -374,7 +374,7 @@ gpart /dev/hda
+ drive without starting the scan loop in FreeBSD type
+
+ .RS
+-gpart -vvd /dev/wd2
++gpart \-vvd /dev/wd2
+ .RE
+ .RE
+
- @@ -390,7 +390,7 @@ in a file called /boot/boot.<major/minor
++@@ -386,7 +386,7 @@ in a file called /boot/boot.<major/minor
+ the partitions contained in such a file type e.g.
+
+ .RS
+-gpart -vdg /boot/boot.0300
++gpart \-vdg /boot/boot.0300
+ .RE
+
+ If the partition table contains an extended partition,
- @@ -409,7 +409,7 @@ can be told to start the scan directly f
++@@ -405,7 +405,7 @@ can be told to start the scan directly f
+ of the disk, using the sector-wise scan mode:
+
+ .RS
+-gpart -k 1 -n s /dev/hdb
++gpart \-k 1 \-n s /dev/hdb
+ .RE
+
+ \-\ Suppose
- @@ -420,7 +420,7 @@ made the first module to be probed and g
++@@ -416,7 +416,7 @@ made the first module to be probed and g
+ weight higher than the usual weight of 1.0:
+
+ .RS
+-gpart -w ntfs,1.5 /dev/hdb
++gpart \-w ntfs,1.5 /dev/hdb
+ .RE
+
+ To list the available modules and their weights use
- @@ -434,7 +434,7 @@ at least thrice, the primary partition t
++@@ -430,7 +430,7 @@ at least thrice, the primary partition t
+ be written back to the device this way:
+
+ .RS
+-gpart -W /dev/sdc /dev/sdc
++gpart \-W /dev/sdc /dev/sdc
+ .RE
+
+ This of course may be extremely dangerous to your health
- @@ -445,7 +445,7 @@ steps of 63 sectors. To perform the scan
++@@ -441,7 +441,7 @@ steps of 63 sectors. To perform the scan
+ head while skipping the first 1008 sectors type
+
+ .RS
+-gpart -k 1008 -n 126 /dev/sda
++gpart \-k 1008 \-n 126 /dev/sda
+ .RE
+
+ \-\ If you want to see how easily
- @@ -455,7 +455,7 @@ are on a disk, search the whole disk rea
++@@ -451,7 +451,7 @@ are on a disk, search the whole disk rea
+ sector, writing all output to a logfile:
+
+ .RS
+-gpart -vvfn s -ql /tmp/gpart.log /dev/sd2 &
++gpart \-vvfn s \-ql /tmp/gpart.log /dev/sd2 &
+ .RE
+
+ Usually
diff --cc debian/patches/series
index 500385c,0000000..15e5320
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,1 @@@
-
- 01-conglomeration
- 02-ntfs-winxp
- 03-open-mode
- 04-imagefile
- 05-add-hardening
- 06-fix-manpage
++fix-manpage
diff --cc debian/rules
index 70f42d5,0000000..63844c9
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,0 +1,6 @@@
+#!/usr/bin/make -f
+
- export DEB_CFLAGS_MAINT_APPEND = -fPIE
- export DEB_LDFLAGS_MAINT_APPEND = -pie -Wl,-z,now
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
- dh $@
++ dh $@ --with autoreconf
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/gpart.git
More information about the forensics-changes
mailing list