[Forensics-changes] [wipe] 01/01: Imported Debian patch 0.22-2
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Feb 23 02:14:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository wipe.
commit 610d12eefe62b421a35a985b825362d311f8c17a
Merge: 28f4ab5 a8ad9c1
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sun Feb 22 22:21:36 2015 -0300
Imported Debian patch 0.22-2
debian/changelog | 23 ++++++++++++++
debian/compat | 2 +-
debian/control | 17 +++++-----
debian/copyright | 63 ++++++++++++++++++++------------------
debian/dirs | 1 +
debian/{wipe.docs => docs} | 0
debian/{wipe.examples => examples} | 0
debian/{wipe.manpages => manpages} | 0
debian/patches/002-add-hardening | 25 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 4 ++-
debian/watch | 3 +-
debian/wipe.dirs | 1 -
13 files changed, 100 insertions(+), 40 deletions(-)
diff --cc debian/changelog
index ce3079c,0000000..958fb1b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,269 -1,0 +1,292 @@@
++wipe (0.22-2) experimental; urgency=medium
++
++ * New co-maintainer.
++ * Updated DH level to 9.
++ * Renaming:
++ - From: wipe.dirs, wipe.docs, wipe.examples, wipe.manpages.
++ - To: dirs, docs, examples, manpages.
++ * debian/control:
++ - Bumped Standards-Version to 3.9.6.
++ - Improved the long description (added the forensics word).
++ - Updated the Vcs-* fields.
++ * debian/copyright:
++ - Updated the copyright years and names.
++ - Updated the upstream email address.
++ * debian/patches/002-add-hardening: added to enable the GCC hardening.
++ * debian/rules:
++ - Added the DEB_BUILD_MAINT_OPTIONS variable to fix the issues
++ pointed by blhc.
++ - Little adjustment in CFLAGS.
++ * debian/watch: improved and added the GitHub as a future possibility.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 22 Feb 2015 22:21:36 -0300
++
+wipe (0.22-1) unstable; urgency=low
+
+ * Team upload.
+ * New upstream release
+ * Switch to debhelper 8
+ * Update to standards 3.9.2
+ * Switch to 3.0 (quilt) source package format
+ * Remove useless lintian overrides (use dch --team to avoid Lintian
+ warnings)
+ * Add patch to fix manpages syntax
+ * Update VCS-* fields
+ * Update copyright information and fix DEP-5 syntax
+
+ -- Julien Valroff <julien at debian.org> Sat, 17 Sep 2011 09:26:40 +0200
+
+wipe (0.21-9) unstable; urgency=low
+
+ * Minimizing rules file.
+ * Setting uploaders to Christophe.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 29 Jul 2009 21:12:43 +0200
+
+wipe (0.21-8) unstable; urgency=low
+
+ * Updating package to standards version 3.8.2.
+ * Updating upstream homepage.
+ * Adding lintian overrides.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 09 Jul 2009 12:55:00 +0200
+
+wipe (0.21-7) unstable; urgency=low
+
+ * Updating vcs fields.
+ * Replacing obsolete dh_clean -k with dh_prep.
+ * Prefixing debhelper files with package name.
+ * Updating to standards 3.8.1.
+ * Updating year in copyright file.
+ * Tidy rules file.
+ * Using correct rfc-2822 date formats in changelog.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 28 May 2009 22:58:30 +0200
+
+wipe (0.21-6) unstable; urgency=low
+
+ * Fixing git-dch email address misstake.
+ * Updating to standards 3.8.0.
+ * Upgrading package to debhelper 7.
+ * Sorting vcs fields in control file.
+ * Adding full license headers to copyright file.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 14 Sep 2008 10:18:43 +0200
+
+wipe (0.21-5) unstable; urgency=low
+
+ * Removing useless whitespaces.
+ * Bumping package to debhelper 6.
+ * Setting maintainer to Debian Forensics.
+ * Adding vcs fields in control.
+ * Rewritten copyright in machine readable form.
+ * Reordering rules.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 22 Feb 2008 10:03:00 +0100
+
+wipe (0.21-4) unstable; urgency=low
+
+ * Bumped to new policy.
+ * Using new homepage field in control.
+ * Don't hide make errors in clean target of rules.
+ * Removing non-existing distclean call in clean target of rules.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 23 Dec 2007 21:05:00 +0100
+
+wipe (0.21-3) unstable; urgency=low
+
+ * Minor cleanups.
+ * Bumped package to debhelper 5.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 01 May 2007 13:13:00 +0200
+
+wipe (0.21-2) unstable; urgency=low
+
+ * New maintainer.
+ * Adjusted debian/* to my own customs.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 16 Oct 2006 13:10:00 +0200
+
+wipe (0.21-1) unstable; urgency=low
+
+ * Acknowledge the changes made in the NMU 0.20-2.1. Thanks to Max Kellermann
+ for the patch and Alexander Wirt for the NMU!
+ Closes: Bug#383467
+ * The NMU patch for Bug#383467 are now incorporated upstream.
+ * debian/README.Debian: removed because upstream removed the files rc6.c,
+ rc6.h and secure_del.html from the tarball. Now the Debian tar.gz no
+ longer differs from the upstream .tar.gz.
+ * debian/control: Bumped Standards-Version to 3.7.2. No changes required.
+
+ -- Thomas Schoepf <schoepf at debian.org> Sat, 23 Sep 2006 13:02:56 +0200
+
+wipe (0.20-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fixes build-target detection, use off_t for length (Closes: #383467).
+ Thanks to Max Kellermann for the patches
+
+ -- Alexander Wirt <formorer at debian.org> Sat, 16 Sep 2006 19:03:59 +0200
+
+wipe (0.20-2) unstable; urgency=low
+
+ * Closes: #354734: typo in wipe.1 man page
+ * debian/control: Bumped Standards-Version to 3.6.2
+ * debian/control: build-depend on debhelper >= 4.0
+ * debian/rules: dh_compat = 4
+
+ -- Thomas Schoepf <schoepf at debian.org> Mon, 13 Mar 2006 11:14:46 +0100
+
+wipe (0.20-1) unstable; urgency=low
+
+ * New upstream version.
+ * This version includes the patch written by Jim Paris for large file
+ support. Thanks!
+ Closes: #190100: wipe 0.18-1 cannot overwrite files/block devices >4 GB
+ Closes: #252428: Only wipes beginning of a device.
+
+ -- Thomas Schoepf <schoepf at debian.org> Sun, 13 Jun 2004 11:50:12 +0200
+
+wipe (0.19.20030913-1) unstable; urgency=low
+
+ * New upstream version.
+ * Upgraded Standards-Version to 3.6.1. No changes required.
+ * Includes updates for Bug#190100: wipe 0.18-1 cannot overwrite files/block
+ devices >4 GB
+ I am unable to test them so I do not yet close the bug.
+
+ -- Thomas Schoepf <schoepf at debian.org> Sun, 28 Sep 2003 23:14:15 +0200
+
+wipe (0.18-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Thomas Schoepf <schoepf at debian.org> Sun, 02 Feb 2003 15:18:07 +0100
+
+wipe (0.17-2) unstable; urgency=low
+
+ * wipe has a new homepage and upstream a new email address.
+ * wipe.c: restored check for "." and ".." in recursive()
+ Closes: #179381: wipe: traverse parent directories check lost
+ in upgrade
+
+ -- Thomas Schoepf <schoepf at debian.org> Sun, 02 Feb 2003 12:17:17 +0100
+
+wipe (0.17-1) unstable; urgency=low
+
+ * New upstream version.
+ * Closes: #169910: wipe -k <symlink> does nothing
+ * Closes: #170099: Does not work properly on large devices
+
+ -- Thomas Schoepf <schoepf at debian.org> Fri, 17 Jan 2003 19:13:09 +0100
+
+wipe (0.16-9) unstable; urgency=low
+
+ * debian/control: Standards-Version: 3.5.7
+ * Makefile: move compilation options into debian/rules.
+ * no longer create /usr/doc -> /usr/share/doc symlink.
+
+ -- Thomas Schoepf <schoepf at debian.org> Fri, 15 Nov 2002 21:10:53 +0100
+
+wipe (0.16-8) unstable; urgency=low
+
+ * Compile with -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64.
+ Closes: Bug#145605: wipe: Wipe can't wipe files larger than 2Gig.
+
+ -- Thomas Schoepf <schoepf at debian.org> Fri, 03 May 2002 13:27:58 +0200
+
+wipe (0.16-7) unstable; urgency=low
+
+ * Closes: Bug#134416: doesn't compile on arm
+
+ -- Thomas Schoepf <schoepf at debian.org> Fri, 01 Mar 2002 22:34:36 +0100
+
+wipe (0.16-6) unstable; urgency=low
+
+ * Closes: Bug#126880: wipe: source URL appears incorrect
+
+ -- Thomas Schoepf <schoepf at debian.org> Sun, 30 Dec 2001 15:40:00 +0100
+
+wipe (0.16-5) unstable; urgency=low
+
+ * Closes: Bug#111583: "wipe" WARNING (it will delete parent files and
+ directories!)
+
+ -- Thomas Schoepf <schoepf at debian.org> Mon, 17 Sep 2001 10:36:24 +0200
+
+wipe (0.16-4) unstable; urgency=low
+
+ * Closes: Bug#101645: [hurd] doesn't build
+
+ -- Thomas Schoepf <schoepf at debian.org> Sun, 08 Jul 2001 16:39:43 +0200
+
+wipe (0.16-3) unstable; urgency=low
+
+ * Closes: Bug#85519: wipe: fails to build from source
+ Thanks Berke!
+
+ -- Thomas Schoepf <schoepf at debian.org> Sun, 18 Feb 2001 01:56:39 +0100
+
+wipe (0.16-2) unstable; urgency=low
+
+ * Updated download and email address.
+ * Switched to debhelper v2.
+ * Bumped Standards-Version to 3.2.0
+
+ -- Thomas Schoepf <schoepf at debian.org> Sat, 05 Aug 2000 01:10:37 +0200
+
+wipe (0.16-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Thomas Schoepf <schoepf at debian.org> Fri, 31 Dec 1999 00:07:52 +0100
+
+wipe (0.15-4) unstable; urgency=low
+
+ * Debhelper now takes care of the FHS. (closes: #44595)
+
+ -- Thomas Schoepf <schoepf at debian.org> Wed, 08 Sep 1999 18:22:36 +0200
+
+wipe (0.15-3) unstable; urgency=low
+
+ * debian/control: Standards-Version: 3.0.1.
+
+ -- Thomas Schoepf <schoepf at debian.org> Mon, 06 Sep 1999 16:24:59 +0200
+
+wipe (0.15-2) unstable; urgency=low
+
+ * Previous upload closes: #41108.
+
+ -- Thomas Schoepf <schoepf at debian.org> Fri, 30 Jul 1999 20:57:14 +0200
+
+wipe (0.15-1) unstable; urgency=low
+
+ * New upstream version. (closes: Bug #41108)
+
+ -- Thomas Schoepf <schoepf at debian.org> Tue, 27 Jul 1999 21:00:02 +0200
+
+wipe (0.14-3) unstable; urgency=low
+
+ * Added /usr/doc/wipe -> /usr/share/doc/wipe transition link.
+
+ -- Thomas Schoepf <schoepf at debian.org> Thu, 22 Jul 1999 12:09:35 +0200
+
+wipe (0.14-2) unstable; urgency=low
+
+ * Comply with FHS 2.0 (/usr/share/doc, /usr/share/man).
+ * debian/control: Standards-Version: 3.0.0.
+ * debian/copyright: licenses now in usr/share/common-licenses.
+
+ -- Thomas Schoepf <schoepf at debian.org> Fri, 09 Jul 1999 16:49:55 +0200
+
+wipe (0.14-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Thomas Schoepf <schoepf at debian.org> Sat, 03 Jul 1999 13:53:11 +0200
+
+wipe (0.12-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Thomas Schoepf <schoepf at debian.org> Thu, 17 Jun 1999 02:01:24 +0200
diff --cc debian/compat
index 45a4fb7,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 8
++9
diff --cc debian/control
index a4dba58,0000000..b56d89d
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,0 +1,24 @@@
+Source: wipe
+Section: utils
+Priority: extra
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
- Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
- Build-Depends: debhelper (>= 8.0.0)
- Standards-Version: 3.9.2
- Homepage: http://lambda-diode.com/software/wipe/
- Vcs-Browser: http://git.debian.org/?p=forensics/wipe.git;a=summary
- Vcs-Git: git://git.debian.org/forensics/wipe.git
++Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
++Build-Depends: debhelper (>= 9)
++Standards-Version: 3.9.6
++Homepage: http://lambda-diode.com/software/wipe
++Vcs-Browser: http://anonscm.debian.org/cgit/forensics/wipe.git
++Vcs-Git: git://anonscm.debian.org/forensics/wipe.git
+
+Package: wipe
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: Secure file deletion
++Description: secure file deletion
+ Recovery of supposedly erased data from magnetic media is easier than what many
+ people would like to believe. A technique called Magnetic Force Microscopy
+ (MFM) allows any moderately funded opponent to recover the last two or three
+ layers of data written to disk. Wipe repeatedly writes special patterns to the
+ files to be destroyed, using the fsync() call and/or the O_SYNC bit to force
+ disk access.
++ .
++ This program is useful in anti-forensics and security activities.
++
diff --cc debian/copyright
index 39b374d,0000000..d7cc3d1
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,50 -1,0 +1,55 @@@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
- Upstream-Contact: Berke Durak <berke at ouvaton.org>
- Source: http://lambda-diode.com/software/wipe/
++Upstream-Name: wipe
++Source: http://lambda-diode.com/software/wipe
+
+Files: *
- Copyright: 1998-2004 Berke Durak <berke at ouvaton.org>
- License: GPL-2+
++Copyright: 1998-2010 Berke Durak <berke at ouvaton.org, berke.durak at gmail.com>
++License: GPL-2
+
- Files: md5.*
++Files: md5.*
+Copyright: 1990 RSA Data Security, Inc. All rights reserved
- License: other
++License: RSA-md5
++
++Files: debian/*
++Copyright: 1999-2006 Thomas Schoepf <schoepf at debian.org>
++ 2006 Alexander Wirt <formorer at debian.org>
++ 2006-2009 Daniel Baumann <daniel at debian.org>
++ 2011 Julien Valroff <julien at debian.org>
++ 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
++License: GPL-2+
++
++License: GPL-2 and 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: RSA-md5
+ License to copy and use this software is granted provided that
+ it is identified as the "RSA Data Security, Inc. MD5 Message-
+ Digest Algorithm" in all material mentioning or referencing this
+ software or this function.
+ .
+ License is also granted to make and use derivative works
+ provided that such works are identified as "derived from the RSA
+ Data Security, Inc. MD5 Message-Digest Algorithm" in all
+ material mentioning or referencing the derived work.
+ .
+ RSA Data Security, Inc. makes no representations concerning
+ either the merchantability of this software or the suitability
+ of this software for any particular purpose. It is provided "as
+ is" without express or implied warranty of any kind.
+ .
+ These notices must be retained in any copies of any part of this
- documentation and/or software.
-
- Files: debian/*
- Copyright: 2006-2009 Daniel Baumann <daniel 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 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.
++ documentation and/or software.
diff --cc debian/dirs
index 0000000,0000000..e772481
new file mode 100644
--- /dev/null
+++ b/debian/dirs
@@@ -1,0 -1,0 +1,1 @@@
++usr/bin
diff --cc debian/docs
index 4326f0d,0000000..4326f0d
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
diff --cc debian/examples
index e39721e,0000000..e39721e
mode 100644,000000..100644
--- a/debian/examples
+++ b/debian/examples
diff --cc debian/manpages
index f7e585b,0000000..f7e585b
mode 100644,000000..100644
--- a/debian/manpages
+++ b/debian/manpages
diff --cc debian/patches/002-add-hardening
index 0000000,0000000..31219c8
new file mode 100644
--- /dev/null
+++ b/debian/patches/002-add-hardening
@@@ -1,0 -1,0 +1,25 @@@
++Description: add GCC hardening.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-02-11
++Index: wipe-0.22/Makefile
++===================================================================
++--- wipe-0.22.orig/Makefile
+++++ wipe-0.22/Makefile
++@@ -45,7 +45,7 @@ CC_LINUX=gcc
++ CCO_LINUX=-Wall -DHAVE_DEV_URANDOM -DHAVE_OSYNC -DHAVE_STRCASECMP -DHAVE_RANDOM -DWEAK_RC6 -DSYNC_WAITS_FOR_SYNC -DFIND_DEVICE_SIZE_BY_BLKGETSIZE -DSIXTYFOUR -D__USE_LARGEFILE -D_FILE_OFFSET_BITS=64
++ # default should be to turn off debugging and to turn on optimization.
++ #CCO_LINUX+=-O9 -pipe -fomit-frame-pointer -finline-functions -funroll-loops -fstrength-reduce
++-CCO_LINUX+=$(CFLAGS)
+++CCO_LINUX+=$(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
++ #CCO_LINUX+=-DDEBUG -g
++ CCOC_LINUX=-c
++
++@@ -71,7 +71,7 @@ CCOC_AIX=-c
++ #
++
++ CC_GENERIC=gcc
++-CCO_GENERIC=-Wall -O6 -pipe -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+++CCO_GENERIC=-Wall -O6 -pipe -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
++ CCOC_GENERIC=-c
++
++ # Thanks to Chris L. Mason <cmason at unixzone.com> for these:
diff --cc debian/patches/series
index 12e0bc1,0000000..6ee328a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
++002-add-hardening
+001_fix-manpages.diff
diff --cc debian/rules
index de11f52,0000000..a87d3a8
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,28 -1,0 +1,30 @@@
+#!/usr/bin/make -f
+
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++
+DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+
+ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ target = linux
+else
+ target = generic
+endif
+
- CFLAGS = -Wall -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS += -Wall -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -pipe -fomit-frame-pointer
+ ifeq ($(target), generic)
+ CFLAGS += -O6
+ else
+ CFLAGS += -O9 -finline-functions -funroll-loops -fstrength-reduce
+ endif
+endif
+
+%:
+ dh $@
+
+override_dh_auto_build:
+ dh_auto_build -- $(target) CFLAGS="$(CFLAGS)"
diff --cc debian/watch
index de849b4,0000000..aa15e12
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,3 @@@
+version=3
- http://lambda-diode.com/software/wipe/ /resources/wipe/wipe-(.+).tar.gz
++http://lambda-diode.com/software/wipe .*/wipe/wipe-(\d\S+)\.tar\.(?:bz2|gz|xz)
++https://github.com/berke/wipe/releases .*/archive/v?(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/wipe.git
More information about the forensics-changes
mailing list