diff -Nru rsakeyfind-1.0/debian/changelog rsakeyfind-1.0/debian/changelog --- rsakeyfind-1.0/debian/changelog 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/changelog 2015-06-27 20:13:02.000000000 +0000 @@ -1,3 +1,29 @@ +rsakeyfind (1:1.0-3) unstable; urgency=medium + + * Team upload. + * Acknowledge NMU. Thanks to Salvatore Bonaccorso . + (Closes: #667360) + * Migrations: + - debian/copyright to 1.0 format. + - DH level to 9. + * New upstream homepage. + * debian/control: + - Added the 'forensics' word in long description. + - Bumped Standards-Version to 3.9.6. + - Updated the Vcs-* fields. + * debian/copyright: updated all information. + * debian/patches/: + - Added add-GCC-hardening to fix the upstream Makefile. + - 001_include.diff: renamed to fix-includes. + - 002_gcc_4.7.diff: removed. The content was added to fix-includes. + * debian/rules: added DEB_BUILD_MAINT_OPTIONS variable to improve the GCC + hardening. + * debian/watch: + - Added a check for GPG signature. + - Updated the rule to search for files. + + -- Joao Eriberto Mota Filho Sat, 27 Jun 2015 16:40:58 -0300 + rsakeyfind (1:1.0-2.1) unstable; urgency=low * Non-maintainer upload. diff -Nru rsakeyfind-1.0/debian/compat rsakeyfind-1.0/debian/compat --- rsakeyfind-1.0/debian/compat 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/compat 2015-06-27 19:47:17.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru rsakeyfind-1.0/debian/control rsakeyfind-1.0/debian/control --- rsakeyfind-1.0/debian/control 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/control 2015-06-27 19:47:50.000000000 +0000 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Debian Forensics Uploaders: Jacob Appelbaum -Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.9.2 -Homepage: http://citp.princeton.edu/memory/code/ -Vcs-Browser: http://git.debian.org/?p=forensics/rsakeyfind.git -Vcs-Git: git://git.debian.org/git/forensics/rsakeyfind.git +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.6 +Homepage: https://citp.princeton.edu/research/memory/code +Vcs-Browser: http://anonscm.debian.org/cgit/forensics/rsakeyfind.git +Vcs-Git: git://anonscm.debian.org/forensics/rsakeyfind.git Package: rsakeyfind Architecture: any @@ -16,3 +16,5 @@ rsakeyfind is a tool that locates BER-encoded RSA private keys in MEMORY-IMAGE. If a MODULUS-FILE is specified, it will locate private and public keys matching the hex-encoded modulus read from this file. + . + This package is useful to several activities, as forensics investigations. diff -Nru rsakeyfind-1.0/debian/copyright rsakeyfind-1.0/debian/copyright --- rsakeyfind-1.0/debian/copyright 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/copyright 2015-06-27 19:44:27.000000000 +0000 @@ -1,12 +1,21 @@ -Format: http://dep.debian.net/deps/dep5/ -Upstream-Contact: Nadia Heninger - J. Alex Halderman -Source: http://citp.princeton.edu/memory/code/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: RSAKeyFinder +Source: https://citp.princeton.edu/research/memory/code Files: * Copyright: 2008 Nadia Heninger 2008 J. Alex Halderman License: BSD-3-clause + +Files: debian/* +Copyright: 2009-2011 Jacob Appelbaum + 2011 Daniel Baumann + 2011 Julien Valroff + 2012 Salvatore Bonaccorso + 2015 Joao Eriberto Mota Filho +License: GPL-2+ + +License: BSD-3-clause Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -36,23 +45,19 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: debian/* -Copyright: 2008-2009 Jacob Appelbaum - 2011 Julien Valroff 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 . - 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 -Nru rsakeyfind-1.0/debian/patches/001_include.diff rsakeyfind-1.0/debian/patches/001_include.diff --- rsakeyfind-1.0/debian/patches/001_include.diff 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/patches/001_include.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Fix include -Author: Jacob Appelbaum -Last-Update: 2011-07-22 - -diff --git a/rsakeyfind.cpp b/rsakeyfind.cpp -index 8e45686..c875c4d 100644 ---- a/rsakeyfind.cpp -+++ b/rsakeyfind.cpp -@@ -8,7 +8,7 @@ - #include - #include - #include --#include -+#include - #include - - #ifdef __FreeBSD__ diff -Nru rsakeyfind-1.0/debian/patches/002_gcc_4.7.diff rsakeyfind-1.0/debian/patches/002_gcc_4.7.diff --- rsakeyfind-1.0/debian/patches/002_gcc_4.7.diff 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/patches/002_gcc_4.7.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Fix FTBFS with gcc-4.7 - Fix FTBFS with gcc 4.7 by fixing missing include. -Origin: vendor -Bug-Debian: http://bugs.debian.org/667360 -Forwarded: no -Author: Cyril Brulebois -Last-Update: 2012-05-15 - ---- a/rsakeyfind.cpp -+++ b/rsakeyfind.cpp -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #ifdef __FreeBSD__ - #include diff -Nru rsakeyfind-1.0/debian/patches/add-GCC-hardening rsakeyfind-1.0/debian/patches/add-GCC-hardening --- rsakeyfind-1.0/debian/patches/add-GCC-hardening 1970-01-01 00:00:00.000000000 +0000 +++ rsakeyfind-1.0/debian/patches/add-GCC-hardening 2015-06-27 19:57:45.000000000 +0000 @@ -0,0 +1,21 @@ +Description: fix Makefile to add GCC hardening. +Author: Joao Eriberto Mota Filho +Last-Update: 2015-06-27 +Index: rsakeyfind-1.0/Makefile +=================================================================== +--- rsakeyfind-1.0.orig/Makefile ++++ rsakeyfind-1.0/Makefile +@@ -1,11 +1,10 @@ +-CXXFLAGS= -Wall -O4 ++CXXFLAGS += -Wall -O4 + OBJS=rsakeyfind.o + + all: rsakeyfind + + rsakeyfind: $(OBJS) +- $(CXX) -o rsakeyfind $(OBJS) ++ $(CXX) -o rsakeyfind $(OBJS) $(LDFLAGS) + + clean: + @rm -f rsakeyfind *~ \#* $(OBJS) +- diff -Nru rsakeyfind-1.0/debian/patches/fix-includes rsakeyfind-1.0/debian/patches/fix-includes --- rsakeyfind-1.0/debian/patches/fix-includes 1970-01-01 00:00:00.000000000 +0000 +++ rsakeyfind-1.0/debian/patches/fix-includes 2015-06-27 19:57:45.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix includes +Author: Jacob Appelbaum +Reviewed-by: Joao Eriberto Mota Filho +Last-Update: 2015-06-27 +Index: rsakeyfind-1.0/rsakeyfind.cpp +=================================================================== +--- rsakeyfind-1.0.orig/rsakeyfind.cpp ++++ rsakeyfind-1.0/rsakeyfind.cpp +@@ -8,8 +8,9 @@ + #include + #include + #include +-#include ++#include + #include ++#include + + #ifdef __FreeBSD__ + #include diff -Nru rsakeyfind-1.0/debian/patches/series rsakeyfind-1.0/debian/patches/series --- rsakeyfind-1.0/debian/patches/series 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/patches/series 2015-06-27 19:57:45.000000000 +0000 @@ -1,2 +1,2 @@ -001_include.diff -002_gcc_4.7.diff +fix-includes +add-GCC-hardening diff -Nru rsakeyfind-1.0/debian/rules rsakeyfind-1.0/debian/rules --- rsakeyfind-1.0/debian/rules 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/rules 2015-06-27 19:55:17.000000000 +0000 @@ -1,3 +1,6 @@ #!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ diff -Nru rsakeyfind-1.0/debian/upstream/signing-key.asc rsakeyfind-1.0/debian/upstream/signing-key.asc --- rsakeyfind-1.0/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ rsakeyfind-1.0/debian/upstream/signing-key.asc 2011-10-01 03:27:18.000000000 +0000 @@ -0,0 +1,45 @@ + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=GKSC +-----END PGP PUBLIC KEY BLOCK----- diff -Nru rsakeyfind-1.0/debian/watch rsakeyfind-1.0/debian/watch --- rsakeyfind-1.0/debian/watch 2012-05-15 18:57:16.000000000 +0000 +++ rsakeyfind-1.0/debian/watch 2015-06-27 19:55:32.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -http://citp.princeton.edu/memory-content/src/rsakeyfind-(.*)\.tar\.gz debian +opts="pgpsigurlmangle=s/$/.asc/" \ +https://citp.princeton.edu/research/memory/code .*/src/rsakeyfind-(\d\S+)\.tar\.(?:bz2|gz|xz)