[Forensics-changes] [rsakeyfind] 01/01: Imported Debian patch 1:1.0-3

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Sat Jun 27 20:18:31 UTC 2015


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

eriberto pushed a commit to branch debian
in repository rsakeyfind.

commit 4678a31687e7e66fc0bb773021cbb3fcc20667e7
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Sat Jun 27 16:40:58 2015 -0300

    Imported Debian patch 1:1.0-3
---
 debian/changelog                 | 26 +++++++++++++++++++++++
 debian/compat                    |  2 +-
 debian/control                   | 12 ++++++-----
 debian/copyright                 | 39 +++++++++++++++++++---------------
 debian/patches/001_include.diff  | 17 ---------------
 debian/patches/002_gcc_4.7.diff  | 18 ----------------
 debian/patches/add-GCC-hardening | 21 +++++++++++++++++++
 debian/patches/fix-includes      | 19 +++++++++++++++++
 debian/patches/series            |  4 ++--
 debian/rules                     |  3 +++
 debian/upstream/signing-key.asc  | 45 ++++++++++++++++++++++++++++++++++++++++
 debian/watch                     |  3 ++-
 12 files changed, 148 insertions(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d751c98..ba1fb42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+rsakeyfind (1:1.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Acknowledge NMU. Thanks to Salvatore Bonaccorso <carnil at debian.org>.
+      (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 <eriberto at debian.org>  Sat, 27 Jun 2015 16:40:58 -0300
+
 rsakeyfind (1:1.0-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 477001d..d158ca2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Jacob Appelbaum <jacob at appelbaum.net>
-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 @@ Description: locates BER-encoded RSA private keys in memory images
  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 --git a/debian/copyright b/debian/copyright
index f39f926..63cd75b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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 <jacob at appelbaum.net>
+           2011      Daniel Baumann <daniel at debian.org>
+           2011      Julien Valroff <julien at debian.org>
+           2012      Salvatore Bonaccorso <carnil at debian.org>
+           2015      Joao Eriberto Mota Filho <eriberto at debian.org>
+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 @@ License: BSD-3-clause
  (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 <jacob at appelbaum.net>
-           2011 Julien Valroff <julien at debian.org>
 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
- 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/001_include.diff b/debian/patches/001_include.diff
deleted file mode 100644
index e2e7cd4..0000000
--- a/debian/patches/001_include.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix include
-Author: Jacob Appelbaum <jacob at appelbaum.net>
-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 <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
--#include <string>
-+#include <string.h>
- #include <iostream>
- 
- #ifdef __FreeBSD__
diff --git a/debian/patches/002_gcc_4.7.diff b/debian/patches/002_gcc_4.7.diff
deleted file mode 100644
index 88a7382..0000000
--- a/debian/patches/002_gcc_4.7.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS with gcc-4.7
- Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> include.
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/667360
-Forwarded: no
-Author: Cyril Brulebois <kibi at debian.org> 
-Last-Update: 2012-05-15
-
---- a/rsakeyfind.cpp
-+++ b/rsakeyfind.cpp
-@@ -10,6 +10,7 @@
- #include <sys/mman.h>
- #include <string.h>
- #include <iostream>
-+#include <unistd.h>
- 
- #ifdef __FreeBSD__
- #include <err.h>
diff --git a/debian/patches/add-GCC-hardening b/debian/patches/add-GCC-hardening
new file mode 100644
index 0000000..2ee5480
--- /dev/null
+++ b/debian/patches/add-GCC-hardening
@@ -0,0 +1,21 @@
+Description: fix Makefile to add GCC hardening.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+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 --git a/debian/patches/fix-includes b/debian/patches/fix-includes
new file mode 100644
index 0000000..386064b
--- /dev/null
+++ b/debian/patches/fix-includes
@@ -0,0 +1,19 @@
+Description: Fix includes
+Author: Jacob Appelbaum <jacob at appelbaum.net>
+Reviewed-by: Joao Eriberto Mota Filho <eriberto at debian.org>
+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 <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+-#include <string>
++#include <string.h>
+ #include <iostream>
++#include <unistd.h>
+ 
+ #ifdef __FreeBSD__
+ #include <err.h>
diff --git a/debian/patches/series b/debian/patches/series
index 268f74b..9d78cd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-001_include.diff
-002_gcc_4.7.diff
+fix-includes
+add-GCC-hardening
diff --git a/debian/rules b/debian/rules
index cbe925d..d8309f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..1f85097
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,45 @@
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=GKSC
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 1aa5189..188d24f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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)

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



More information about the forensics-changes mailing list