[Forensics-changes] [gpart] 01/01: Imported Debian patch 0.1h-12
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Sun Mar 1 20:47:39 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 caa8692d3cef09e5d48f1ea9b069defae106ee0d
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sun Mar 1 11:45:34 2015 -0300
Imported Debian patch 0.1h-12
---
debian/changelog | 35 +++++
debian/compat | 2 +-
debian/control | 14 +-
debian/copyright | 82 ++++++----
debian/{gpart.docs => docs} | 0
.../{01-conglomeration.patch => 01-conglomeration} | 165 +++++++++++++++------
.../patches/{02-ntfs-winxp.patch => 02-ntfs-winxp} | 11 +-
.../patches/{03-open-mode.patch => 03-open-mode} | 11 +-
.../patches/{04-imagefile.patch => 04-imagefile} | 21 +--
debian/patches/05-add-hardening | 31 ++++
debian/patches/06-fix-manpage | 120 +++++++++++++++
debian/patches/series | 11 +-
debian/rules | 8 +-
debian/source.lintian-overrides | 3 -
debian/source/format | 1 +
debian/watch | 4 +
16 files changed, 403 insertions(+), 116 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e9b8fb6..cdc7d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+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.
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 1269d42..df9c50e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: gpart
Section: admin
Priority: optional
Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
-Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 7.0.50~), quilt
-Standards-Version: 3.8.4
-Homepage: http://www.brzitwa.de/mb/gpart/
-Vcs-Browser: http://git.debian.net/?p=debian-forensics/gpart.git
-Vcs-Git: git://git.debian.net/git/debian-forensics/gpart.git
+Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
+Build-Depends: debhelper (>= 9)
+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
@@ -42,3 +42,5 @@ Description: Guess PC disk partition table, find lost partitions
* 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 --git a/debian/copyright b/debian/copyright
index 5606e54..7a3786d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,42 +1,64 @@
-Download: http://www.brzitwa.de/mb/gpart/
-Author: Michail Brzitwa <michail at brzitwa.de>
+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: (C) 1999-2001 Michail Brzitwa <mb at ichabod.han.de>
+Copyright: 1999-2001 Michail Brzitwa <mb at ichabod.han.de>
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: src/gm_rfs.h
+Copyright: 1996-2000 Hans Reiser
+License: GPL-2+
+
+Files: src/gm_bsddl.h
+Copyright: FreeBSD
+License: BSD-2-Clause
Files: debian/*
-Copyright: (C) 2008-2009 Daniel Baumann <daniel at debian.org>
+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 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 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.
.
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ 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 --git a/debian/gpart.docs b/debian/docs
similarity index 100%
rename from debian/gpart.docs
rename to debian/docs
diff --git a/debian/patches/01-conglomeration.patch b/debian/patches/01-conglomeration
similarity index 76%
rename from debian/patches/01-conglomeration.patch
rename to debian/patches/01-conglomeration
index 2228d12..a38903f 100644
--- a/debian/patches/01-conglomeration.patch
+++ b/debian/patches/01-conglomeration
@@ -1,9 +1,64 @@
-Author: n/a
-Description: Needs to be broken out (FIXME).
+Description: make install compliant with Debian.
+Author: David Coe <davidc at debian.org>
+Comment: files inst.defs and Makefile.
+Last-Update: ?
-diff -Naurp gpart.orig/Makefile gpart/Makefile
---- gpart.orig/Makefile 2000-12-13 22:45:49.000000000 +0000
-+++ gpart/Makefile 2008-09-19 06:13:18.000000000 +0000
+
+Description: fix build in arm.
+Author: Philip Blundell <pb at futuretv.com>
+Comment: file src/l64seek.h. Closes #58395
+Last-Update: 2000-02-18
+
+
+Description: fix FAT detection on Alpha.
+Author: Falk Hueffner <falk at debian.org>
+Comment: file src/gm_fat.h. Closes: #66893
+Last-Update: 2000-07-08
+
+
+Description: fix build on ia64 and other.
+Author: Doug Porter <dsp at debian.org, dsp at waterspout.com>
+Comment: file src/gm_ntfs.h. Closes: #119347
+Last-Update: 2001-11-12
+
+
+Description: reiserfs 3.6 recognition patch from ftp://ftp.namesys.com/\
+ pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz.
+Author: Namesys (the dead company Namesys.com).
+Comment: files README, man/gpart.man, src/Makefile, src/gm_reiserfs.c,
+ src/gm_reiserfs.h, src/gm_rfs.c, src/gm_rfs.h, src/godules.c,
+ src/gmodules.h. Closes: #246989, #322256
+ Original patch available at http://www.filewatcher.com, under name
+ gpart-0.1h-reiserfs-3.6.patch.gz.
+Last-Update: 2003-01-10
+
+
+Description: recognise Ext3 filesystems as well as Ext2.
+Author: Xisco Calafat <fcalafat at ono.com>.
+Comment: file src/gm_ext2.c. Closes: #212989
+Last-Update: 2003-09-27
+
+
+Description: solve errno problem.
+Author: David Coe <davidc at debian.org>
+ Wladimir Mutel <mwg at fluffy.isd.dp.ua>
+Comment: file src/disku.c. Closes: #225018
+Last-Update: 2006-10-28
+
+
+Description: add large file support. 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...
+Author: Ted Percival <ted at midg3t.net>
+Comment: files src/l64seek.c. Closes: #225578, #294836, #393039
+Last-Update: 2006-10-28
+
+
+Index: gpart-0.1h/Makefile
+===================================================================
+--- gpart-0.1h.orig/Makefile
++++ gpart-0.1h/Makefile
@@ -10,8 +10,12 @@ gpart:
$(MAKE) -C src
$(MAKE) -C man
@@ -24,9 +79,10 @@ diff -Naurp gpart.orig/Makefile gpart/Makefile
$(MAKE) -C man clean
+
+.PHONY: all gpart install install-object install-man uninstall clean
-diff -Naurp gpart.orig/README gpart/README
---- gpart.orig/README 2001-02-07 17:58:12.000000000 +0000
-+++ gpart/README 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/README
+===================================================================
+--- gpart-0.1h.orig/README
++++ gpart-0.1h/README
@@ -24,25 +24,25 @@
- Currently recognized partitions/filesystems types ---------------------
@@ -72,9 +128,10 @@ diff -Naurp gpart.orig/README gpart/README
-diff -Naurp gpart.orig/inst.defs gpart/inst.defs
---- gpart.orig/inst.defs 2000-12-13 22:45:49.000000000 +0000
-+++ gpart/inst.defs 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/inst.defs
+===================================================================
+--- gpart-0.1h.orig/inst.defs
++++ gpart-0.1h/inst.defs
@@ -1,9 +1,23 @@
#
# installation directories for gpart
@@ -104,9 +161,10 @@ diff -Naurp gpart.orig/inst.defs gpart/inst.defs
+
+# Not used -D. Coe:
+#sharedir=$(prefix)/share
-diff -Naurp gpart.orig/man/gpart.man gpart/man/gpart.man
---- gpart.orig/man/gpart.man 2001-02-07 17:54:18.000000000 +0000
-+++ gpart/man/gpart.man 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/man/gpart.man
+===================================================================
+--- gpart-0.1h.orig/man/gpart.man
++++ gpart-0.1h/man/gpart.man
@@ -63,8 +63,8 @@ MS Windows NT/2000 filesystem.
.I qnx4
QNX 4.x filesystem.
@@ -118,9 +176,10 @@ diff -Naurp gpart.orig/man/gpart.man gpart/man/gpart.man
.TP
.I s86dl
Sun Solaris on Intel platforms uses a sub-partitioning
-diff -Naurp gpart.orig/src/Makefile gpart/src/Makefile
---- gpart.orig/src/Makefile 2001-01-30 17:01:08.000000000 +0000
-+++ gpart/src/Makefile 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/Makefile
+===================================================================
+--- gpart-0.1h.orig/src/Makefile
++++ gpart-0.1h/src/Makefile
@@ -7,6 +7,8 @@ include ../make.defs
CFLAGS+=-DVERSION=\"$(version)\"
ifeq ($(shell uname),Linux)
@@ -139,9 +198,10 @@ diff -Naurp gpart.orig/src/Makefile gpart/src/Makefile
modobj=$(foreach m,$(mod),gm_$(m).o)
obj=gpart.o gmodules.o disku.o l64seek.o $(modobj)
src=$(obj:.o=.c)
-diff -Naurp gpart.orig/src/disku.c gpart/src/disku.c
---- gpart.orig/src/disku.c 2001-02-07 19:04:07.000000000 +0000
-+++ gpart/src/disku.c 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/disku.c
+===================================================================
+--- gpart-0.1h.orig/src/disku.c
++++ gpart-0.1h/src/disku.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <string.h>
@@ -150,9 +210,10 @@ diff -Naurp gpart.orig/src/disku.c gpart/src/disku.c
#include "gpart.h"
#if defined(__linux__)
-diff -Naurp gpart.orig/src/gm_ext2.c gpart/src/gm_ext2.c
---- gpart.orig/src/gm_ext2.c 2001-02-07 18:08:08.000000000 +0000
-+++ gpart/src/gm_ext2.c 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/gm_ext2.c
+===================================================================
+--- gpart-0.1h.orig/src/gm_ext2.c
++++ gpart-0.1h/src/gm_ext2.c
@@ -121,9 +121,10 @@ int ext2_gfun(disk_desc *d,g_module *m)
/*
@@ -165,9 +226,10 @@ diff -Naurp gpart.orig/src/gm_ext2.c gpart/src/gm_ext2.c
return (1);
/*
-diff -Naurp gpart.orig/src/gm_fat.h gpart/src/gm_fat.h
---- gpart.orig/src/gm_fat.h 2000-12-13 22:54:51.000000000 +0000
-+++ gpart/src/gm_fat.h 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/gm_fat.h
+===================================================================
+--- gpart-0.1h.orig/src/gm_fat.h
++++ gpart-0.1h/src/gm_fat.h
@@ -60,6 +60,10 @@ struct fat_boot_sector {
__u16 info_sector; /* filesystem info sector */
__u16 backup_boot; /* backup boot sector */
@@ -181,9 +243,10 @@ diff -Naurp gpart.orig/src/gm_fat.h gpart/src/gm_fat.h
+ Fri Jul 07 18:04:15 2000
+ in debian bug report #66893 "FAT detection broken on Alpha" */
#endif /* _GM_FAT_H */
-diff -Naurp gpart.orig/src/gm_ntfs.h gpart/src/gm_ntfs.h
---- gpart.orig/src/gm_ntfs.h 2001-01-29 20:33:58.000000000 +0000
-+++ gpart/src/gm_ntfs.h 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/gm_ntfs.h
+===================================================================
+--- gpart-0.1h.orig/src/gm_ntfs.h
++++ gpart-0.1h/src/gm_ntfs.h
@@ -14,6 +14,9 @@
*
*/
@@ -255,9 +318,10 @@ diff -Naurp gpart.orig/src/gm_ntfs.h gpart/src/gm_ntfs.h
+ (int)(NTFS_GETU24(p) - 0x1000000))
#endif /* _GM_NTFS_H */
-diff -Naurp gpart.orig/src/gm_reiserfs.c gpart/src/gm_reiserfs.c
---- gpart.orig/src/gm_reiserfs.c 1970-01-01 00:00:00.000000000 +0000
-+++ gpart/src/gm_reiserfs.c 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/gm_reiserfs.c
+===================================================================
+--- /dev/null
++++ gpart-0.1h/src/gm_reiserfs.c
@@ -0,0 +1,91 @@
+/*
+ * gm_reiserfs.c -- gpart ReiserFS guessing module
@@ -350,9 +414,10 @@ diff -Naurp gpart.orig/src/gm_reiserfs.c gpart/src/gm_reiserfs.c
+ }
+ return (1);
+}
-diff -Naurp gpart.orig/src/gm_reiserfs.h gpart/src/gm_reiserfs.h
---- gpart.orig/src/gm_reiserfs.h 1970-01-01 00:00:00.000000000 +0000
-+++ gpart/src/gm_reiserfs.h 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/gm_reiserfs.h
+===================================================================
+--- /dev/null
++++ gpart-0.1h/src/gm_reiserfs.h
@@ -0,0 +1,82 @@
+/*
+ * gm_reiserfs.h -- gpart ReiserFS guessing module header
@@ -436,9 +501,10 @@ diff -Naurp gpart.orig/src/gm_reiserfs.h gpart/src/gm_reiserfs.h
+#define SB_V36_SIZE (sizeof(struct reiserfs_super_block_v36))
+
+#endif /* _GM_REISERFS_H */
-diff -Naurp gpart.orig/src/gmodules.c gpart/src/gmodules.c
---- gpart.orig/src/gmodules.c 2001-01-30 17:01:00.000000000 +0000
-+++ gpart/src/gmodules.c 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/gmodules.c
+===================================================================
+--- gpart-0.1h.orig/src/gmodules.c
++++ gpart-0.1h/src/gmodules.c
@@ -154,7 +154,7 @@ void g_mod_addinternals()
GMODINS(bsddl);
GMODINS(lswap);
@@ -448,9 +514,10 @@ diff -Naurp gpart.orig/src/gmodules.c gpart/src/gmodules.c
GMODINS(ntfs);
GMODINS(hpfs);
GMODINS(minix);
-diff -Naurp gpart.orig/src/gmodules.h gpart/src/gmodules.h
---- gpart.orig/src/gmodules.h 2001-01-30 17:00:47.000000000 +0000
-+++ gpart/src/gmodules.h 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/gmodules.h
+===================================================================
+--- gpart-0.1h.orig/src/gmodules.h
++++ gpart-0.1h/src/gmodules.h
@@ -63,7 +63,7 @@ g_module *g_mod_setweight(char *,float);
GMODDECL(bsddl); GMODDECL(ext2); GMODDECL(fat);
@@ -460,9 +527,10 @@ diff -Naurp gpart.orig/src/gmodules.h gpart/src/gmodules.h
GMODDECL(hmlvm); GMODDECL(qnx4); GMODDECL(beos);
GMODDECL(xfs);
-diff -Naurp gpart.orig/src/l64seek.c gpart/src/l64seek.c
---- gpart.orig/src/l64seek.c 2000-12-13 22:54:11.000000000 +0000
-+++ gpart/src/l64seek.c 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/l64seek.c
+===================================================================
+--- gpart-0.1h.orig/src/l64seek.c
++++ gpart-0.1h/src/l64seek.c
@@ -25,30 +25,11 @@ static struct
} ostck[OSTACKLEN];
static int osptr = -1;
@@ -494,9 +562,10 @@ diff -Naurp gpart.orig/src/l64seek.c gpart/src/l64seek.c
return (ret);
}
-diff -Naurp gpart.orig/src/l64seek.h gpart/src/l64seek.h
---- gpart.orig/src/l64seek.h 2000-12-13 22:56:07.000000000 +0000
-+++ gpart/src/l64seek.h 2008-09-19 06:13:18.000000000 +0000
+Index: gpart-0.1h/src/l64seek.h
+===================================================================
+--- gpart-0.1h.orig/src/l64seek.h
++++ gpart-0.1h/src/l64seek.h
@@ -17,6 +17,8 @@
#ifndef _L64SEEK_H
#define _L64SEEK_H
@@ -527,7 +596,7 @@ diff -Naurp gpart.orig/src/l64seek.h gpart/src/l64seek.h
typedef off64_t s64_t;
off64_t l64seek(int fd, off64_t offset, int whence);
-@@ -45,5 +35,4 @@ off64_t l64seek(int fd, off64_t offset,
+@@ -45,5 +35,4 @@ off64_t l64seek(int fd, off64_t offset,
int l64opush(int);
s64_t l64opop(int);
diff --git a/debian/patches/02-ntfs-winxp.patch b/debian/patches/02-ntfs-winxp
similarity index 67%
rename from debian/patches/02-ntfs-winxp.patch
rename to debian/patches/02-ntfs-winxp
index 21f9d31..fab0689 100644
--- a/debian/patches/02-ntfs-winxp.patch
+++ b/debian/patches/02-ntfs-winxp
@@ -1,9 +1,10 @@
-Author: Trace Green <debian.y.h.xu at gmail.com>
Description: Support for NTFS of Windows XP (Closes: #474321).
-
-diff -Naurp gpart.orig/src/gm_ntfs.c gpart/src/gm_ntfs.c
---- gpart.orig/src/gm_ntfs.c 2001-02-07 18:08:08.000000000 +0000
-+++ gpart/src/gm_ntfs.c 2008-11-06 15:20:09.000000000 +0000
+Author: Trace Green <debian.y.h.xu at gmail.com>
+Last-Update: 2008-11-06
+Index: gpart-0.1h/src/gm_ntfs.c
+===================================================================
+--- gpart-0.1h.orig/src/gm_ntfs.c
++++ gpart-0.1h/src/gm_ntfs.c
@@ -73,9 +73,11 @@ int ntfs_gfun(disk_desc *d,g_module *m)
return (1);
size = NTFS_GETU64(d->d_sbuf + 0x28);
diff --git a/debian/patches/03-open-mode.patch b/debian/patches/03-open-mode
similarity index 69%
rename from debian/patches/03-open-mode.patch
rename to debian/patches/03-open-mode
index 6f85271..480fb54 100644
--- a/debian/patches/03-open-mode.patch
+++ b/debian/patches/03-open-mode
@@ -1,9 +1,10 @@
-Author: James Westby <james.westby at canonical.com>
Description: Specify a mode to open(2) as required (Closes: #506816).
-
-diff -Naurp gpart.orig/src/gpart.c gpart/src/gpart.c
---- gpart.orig/src/gpart.c 2008-10-19 15:06:06.000000000 +0000
-+++ gpart/src/gpart.c 2008-11-25 07:34:47.000000000 +0000
+Author: James Westby <james.westby at canonical.com>
+Last-Update: 2008-11-25
+Index: gpart-0.1h/src/gpart.c
+===================================================================
+--- gpart-0.1h.orig/src/gpart.c
++++ gpart-0.1h/src/gpart.c
@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d,
{
int fd, ret = 0;
diff --git a/debian/patches/04-imagefile.patch b/debian/patches/04-imagefile
similarity index 79%
rename from debian/patches/04-imagefile.patch
rename to debian/patches/04-imagefile
index e6a1942..72c4c63 100644
--- a/debian/patches/04-imagefile.patch
+++ b/debian/patches/04-imagefile
@@ -1,10 +1,11 @@
-Author: Josef Spillner <2005 at kuarepoti-dju.net>
Description: Adding support for image files.
-
-diff -Naurp gpart.orig/src/disku.c gpart/src/disku.c
---- gpart.orig/src/disku.c 2009-05-28 23:02:25.000000000 +0200
-+++ gpart/src/disku.c 2009-05-30 20:15:58.000000000 +0200
-@@ -31,6 +31,7 @@
+Author: Josef Spillner <2005 at kuarepoti-dju.net>
+Last-Update: 2009-05-30
+Index: gpart-0.1h/src/disku.c
+===================================================================
+--- gpart-0.1h.orig/src/disku.c
++++ gpart-0.1h/src/disku.c
+@@ -32,6 +32,7 @@
#include <sys/disklabel.h>
#endif
@@ -12,7 +13,7 @@ diff -Naurp gpart.orig/src/disku.c gpart/src/disku.c
/*
-@@ -41,11 +42,35 @@
+@@ -42,11 +43,35 @@
struct disk_geom *disk_geometry(disk_desc *d)
{
static struct disk_geom g;
@@ -25,7 +26,7 @@ diff -Naurp gpart.orig/src/disku.c gpart/src/disku.c
+#if defined(__FreeBSD__)
+ struct disklabel dl;
+#endif
-
++
+ struct stat st;
+ int ret;
+ long lba;
@@ -44,12 +45,12 @@ diff -Naurp gpart.orig/src/disku.c gpart/src/disku.c
+ return (&g);
+ }
+ }
-+
+
+#if defined(__linux__)
if (ioctl(d->d_fd,HDIO_GETGEO,&hg) == -1)
pr(FATAL,EM_IOCTLFAILED,"HDIO_GETGEO",strerror(errno));
#ifdef BLKGETSIZE
-@@ -61,7 +86,6 @@ struct disk_geom *disk_geometry(disk_des
+@@ -62,7 +87,6 @@ struct disk_geom *disk_geometry(disk_des
#endif
#if defined(__FreeBSD__)
diff --git a/debian/patches/05-add-hardening b/debian/patches/05-add-hardening
new file mode 100644
index 0000000..e50d205
--- /dev/null
+++ b/debian/patches/05-add-hardening
@@ -0,0 +1,31 @@
+Description: add GCC hardening.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-03-01
+Index: gpart-0.1h/src/Makefile
+===================================================================
+--- gpart-0.1h.orig/src/Makefile
++++ gpart-0.1h/src/Makefile
+@@ -29,7 +29,7 @@ allsrc=Makefile $(src) $(hdr)
+ all: $(prg)
+
+ $(prg): $(obj)
+- $(CC) -o $@ $(LDFLAGS) $(obj) $(LIBS)
++ $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $(obj) $(LIBS)
+
+ install: $(prg)
+ $(INSTALL) -d $(bindir)
+Index: gpart-0.1h/make.defs
+===================================================================
+--- gpart-0.1h.orig/make.defs
++++ gpart-0.1h/make.defs
+@@ -2,8 +2,8 @@
+ #
+ #
+ CC = gcc
+-CFLAGS = -Wall -O2 -pedantic
+-LDFLAGS =
++CFLAGS += -Wall -O2 -pedantic
++LDFLAGS +=
+ MAKEDEP = gcc -M
+ INSTALL = install
+ RM = rm -f
diff --git a/debian/patches/06-fix-manpage b/debian/patches/06-fix-manpage
new file mode 100644
index 0000000..92e2217
--- /dev/null
+++ b/debian/patches/06-fix-manpage
@@ -0,0 +1,120 @@
+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
+===================================================================
+--- gpart-0.1h.orig/man/gpart.man
++++ gpart-0.1h/man/gpart.man
+@@ -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"
+ 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"
+ 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.
+
+
+ .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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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 --git a/debian/patches/series b/debian/patches/series
index 1998baa..500385c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,7 @@
-01-conglomeration.patch
-02-ntfs-winxp.patch
-03-open-mode.patch
-04-imagefile.patch
+
+01-conglomeration
+02-ntfs-winxp
+03-open-mode
+04-imagefile
+05-add-hardening
+06-fix-manpage
diff --git a/debian/rules b/debian/rules
index ef6db51..70f42d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
-%:
- dh ${@} --with quilt
+export DEB_CFLAGS_MAINT_APPEND = -fPIE
+export DEB_LDFLAGS_MAINT_APPEND = -pie -Wl,-z,now
-override_dh_auto_build:
- dh_auto_build -- DEBUG=1
+%:
+ dh $@
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 7a391e9..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Avoid warnings if non-uploaders to uploads.
-gpart source: changelog-should-mention-nmu
-gpart 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
new file mode 100644
index 0000000..97ed300
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://www.brzitwa.de/mb/gpart gpart-(\d\S+)\.tar\.(?:bz2|gz|xz)
+http://www.brzitwa.de/mb/gpart/gpart-(\d\S+)\.tar\.(?:bz2|gz|xz)
+https://github.com/baruch/gpart/releases .*/archive/v?(\d\S+)\.tar\.(?:bz2|gz|xz)
--
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