[Forensics-changes] [nasty] 01/01: Imported Debian patch 0.6-3

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Tue Jul 21 00:45:51 UTC 2015


This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository nasty.

commit 8bb3f4395f7f8c437f07ac781ed2ef816a8f6e8b
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Sun Jul 12 17:58:14 2015 -0300

    Imported Debian patch 0.6-3
---
 debian/README.source                             |  5 --
 debian/changelog                                 | 29 +++++++++++-
 debian/compat                                    |  2 +-
 debian/control                                   | 14 +++---
 debian/copyright                                 | 35 +++++++-------
 debian/patches/00list                            |  2 -
 debian/patches/01_add_destdir_to_makefile.dpatch | 28 -----------
 debian/patches/01_add_destdir_to_makefile.patch  | 25 ++++++++++
 debian/patches/02_add_largefile_support.dpatch   | 19 --------
 debian/patches/02_add_largefile_support.patch    | 22 +++++++++
 debian/patches/series                            |  2 +
 debian/rules                                     | 60 ++----------------------
 debian/source/format                             |  1 +
 13 files changed, 109 insertions(+), 135 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f05f712..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This source package uses dpatch for the modifications of the upstream source.
-If you want to change something it is best to use the dpatch approach as
-documented in /usr/share/doc/dpatch/README.source.gz
-
- -- Tiago Bortoletto Vaz <tiago at debian.org>  Sat, 26 Sep 2009 23:15:23 -0300
diff --git a/debian/changelog b/debian/changelog
index ddd9545..9ac9568 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,33 @@
+nasty (0.6-3) unstable; urgency=medium
+
+  * Team upload.
+  * Migrations:
+      - debian/rules to new (reduced) format.
+      - DebSrc to 3.0 format.
+      - DH level to 9.
+  * debian/control:
+      - Added the word 'forensics' to long description.
+      - Bumped Standards-Version to 3.9.6.
+      - Fixed a typo in long description.
+      - Removed dpatch from Build-Depends field. Using quilt now.
+      - Removed the leading article from short description.
+      - Updated the Vcs-* fields.
+  * debian/copyright:
+      - Updated the copyright information for packaging.
+      - Updated the GPL-2 license text.
+      - Using 1.0 format in header.
+  * debian/patches/:
+      - Converted all patches (01 and 02) to quilt.
+      - Renamed all patches from *.dpatch to *.patch.
+      - 02_add_largefile_support.patch: added a change for LDFLAGS in upstream
+        Makefile to support GCC hardening.
+  * debian/README.source: remove because this file is no longer required.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sun, 12 Jul 2015 17:58:14 -0300
+
 nasty (0.6-2) unstable; urgency=low
 
-  * Change VCS adddress.
+  * Change VCS address.
   * Change maintainer to Debian Forensics
   * Add a new session in the manual page regarding the issue with gpg-agent.
     Thanks to Gavin Westwood. (Closes: #568231)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 13df577..d2737c1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,21 @@ Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Tiago Bortoletto Vaz <tiago at debian.org>
-Build-Depends: debhelper (>= 7), dpatch, libgpgme11-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), libgpgme11-dev
+Standards-Version: 3.9.6
 Homepage: http://www.vanheusden.com/nasty/
-Vcs-Browser: http://git.debian.org/?p=forensics/nasty.git
-Vcs-Git: git://git.debian.org/forensics/nasty.git
+Vcs-Browser: https://anonscm.debian.org/cgit/forensics/nasty.git
+Vcs-Git: git://anonscm.debian.org/forensics/nasty.git
 
 Package: nasty
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libgpgme11
-Description: A tool which helps you to recover your GPG passphrase
+Description: tool which helps you to recover your GPG passphrase
  Nasty is a program that helps you to recover the passphrase of your PGP or
  GPG-key in case you forget or lost it. The following features will make things
  easier:
-  - set minimum/maximun length of the passphrase
+  - set minimum/maximum length of the passphrase
   - incremental mode, random mode or reads a file for guessing
   - charset filter
+ .
+ This package is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index 25c59b2..58c4541 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,29 @@
-Name: nasty
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nasty
 Source: http://www.vanheusden.com/nasty/
 
 Files: *
 Copyright: 2009, Folkert van Heusden <folkert at vanheusden.com>
 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; version 2
- of the License.
+
+Files: debian/*
+Copyright: 2009-2010, Tiago Bortoletto Vaz <tiago at debian.org>
+           2015,      Joao Eriberto Mota Filho <eriberto at debian.org
+License: GPL-2+
+
+License: GPL-2 or 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 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 <https://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.
-
-Files: debian/*
-Copyright: 2009, Tiago Bortoletto Vaz <tiago at debian.org>
-License: GPL-2+
- 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/patches/00list b/debian/patches/00list
deleted file mode 100644
index 38aa38c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_add_destdir_to_makefile
-02_add_largefile_support
diff --git a/debian/patches/01_add_destdir_to_makefile.dpatch b/debian/patches/01_add_destdir_to_makefile.dpatch
deleted file mode 100644
index 95e998b..0000000
--- a/debian/patches/01_add_destdir_to_makefile.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_add_destdir_to_makefile.dpatch by Tiago Bortoletto Vaz <tiago at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add DESTDIR to send the binary to the right place in Makefile
-
- at DPATCH@
-diff -urNad nasty-0.6~/Makefile nasty-0.6/Makefile
---- nasty-0.6~/Makefile	2009-09-27 19:12:55.000000000 -0300
-+++ nasty-0.6/Makefile	2009-09-27 19:14:15.000000000 -0300
-@@ -3,6 +3,7 @@
- DEBUG=-g # -pg
- CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
- LDFLAGS=-lgpgme $(DEBUG)
-+BINDIR=/usr/bin
- 
- OBJS=nasty.o
- 
-@@ -12,7 +13,8 @@
- 	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o nasty
- 
- install: nasty
--	cp nasty /usr/bin
-+	mkdir -p $(DESTDIR)/$(BINDIR)
-+	cp nasty $(DESTDIR)/$(BINDIR)
- 
- clean:
- 	rm -f $(OBJS) nasty core
diff --git a/debian/patches/01_add_destdir_to_makefile.patch b/debian/patches/01_add_destdir_to_makefile.patch
new file mode 100644
index 0000000..16c0180
--- /dev/null
+++ b/debian/patches/01_add_destdir_to_makefile.patch
@@ -0,0 +1,25 @@
+Description: add DESTDIR to send the binary to the right place in Makefile.
+Author: Tiago Bortoletto Vaz <tiago at debian.org>
+Last-Update: 2009-09-27
+Index: nasty-0.6/Makefile
+===================================================================
+--- nasty-0.6.orig/Makefile
++++ nasty-0.6/Makefile
+@@ -3,6 +3,7 @@ VERSION=0.6
+ DEBUG=-g # -pg
+ CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
+ LDFLAGS=-lgpgme $(DEBUG)
++BINDIR=/usr/bin
+ 
+ OBJS=nasty.o
+ 
+@@ -12,7 +13,8 @@ nasty: $(OBJS)
+ 	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o nasty
+ 
+ install: nasty
+-	cp nasty /usr/bin
++	mkdir -p $(DESTDIR)/$(BINDIR)
++	cp nasty $(DESTDIR)/$(BINDIR)
+ 
+ clean:
+ 	rm -f $(OBJS) nasty core
diff --git a/debian/patches/02_add_largefile_support.dpatch b/debian/patches/02_add_largefile_support.dpatch
deleted file mode 100644
index ce80fda..0000000
--- a/debian/patches/02_add_largefile_support.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_add_largefile_support.dpatch by  <tiago at thinkpad.debian-ba.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support large files in order to avoid problems in chroot builds
-
- at DPATCH@
-diff -urNad nasty~/Makefile nasty/Makefile
---- nasty~/Makefile	2009-09-28 02:08:00.000000000 -0300
-+++ nasty/Makefile	2009-09-28 02:08:00.000000000 -0300
-@@ -1,7 +1,7 @@
- VERSION=0.6
- 
- DEBUG=-g # -pg
--CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
-+CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) -D_FILE_OFFSET_BITS=64
- LDFLAGS=-lgpgme $(DEBUG)
- BINDIR=/usr/bin
- 
diff --git a/debian/patches/02_add_largefile_support.patch b/debian/patches/02_add_largefile_support.patch
new file mode 100644
index 0000000..de7cc33
--- /dev/null
+++ b/debian/patches/02_add_largefile_support.patch
@@ -0,0 +1,22 @@
+Description: support large files in order to avoid problems in chroot builds
+Author: Tiago Bortoletto Vaz <tiago at debian.org>
+Last-Update: 2009-09-28
+
+Description: change LDFLAGS in upstream Makefile to support GCC hardening.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-07-12
+Index: nasty-0.6/Makefile
+===================================================================
+--- nasty-0.6.orig/Makefile
++++ nasty-0.6/Makefile
+@@ -1,8 +1,8 @@
+ VERSION=0.6
+ 
+ DEBUG=-g # -pg
+-CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
+-LDFLAGS=-lgpgme $(DEBUG)
++CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) -D_FILE_OFFSET_BITS=64
++LDFLAGS+=-lgpgme $(DEBUG)
+ BINDIR=/usr/bin
+ 
+ OBJS=nasty.o
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f64bbb7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_add_destdir_to_makefile.patch
+02_add_largefile_support.patch
diff --git a/debian/rules b/debian/rules
index 762c830..6d86462 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,10 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-clean: clean-patched unpatch
+%:
+	dh $@
 
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	[ ! -f Makefile ] || $(MAKE) clean
-
-	dh_clean
-
-patch: patch-stamp
-
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
-build-stamp: patch
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-build: build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-	$(MAKE) DESTDIR=$(CURDIR)/debian/nasty install
-
-binary: binary-arch
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs debian/README.source
+override_dh_installman:
 	dh_installman debian/nasty.1
-	dh_lintian
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-
-.PHONY: clean build install binary binary-arch binary-indep
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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/nasty.git



More information about the forensics-changes mailing list