[Forensics-changes] [aesfix] 01/01: Imported Debian patch 1.0.1-3

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Mon Feb 23 12:24:25 UTC 2015 

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

eriberto pushed a commit to branch debian
in repository aesfix.

commit 8fb4033c6b712ce83ff8098be24bae5a61fa2285
Merge: 15fc3ca 88013fd
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Mon Feb 23 07:57:57 2015 -0300

    Imported Debian patch 1.0.1-3

 debian/changelog                | 30 ++++++++++++++++++++++++++-
 debian/compat                   |  2 +-
 debian/control                  | 16 ++++++++-------
 debian/copyright                | 37 +++++++++++++++++----------------
 debian/patches/add-hardening    | 20 ++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  3 +++
 debian/upstream/signing-key.asc | 45 +++++++++++++++++++++++++++++++++++++++++
 debian/watch                    |  6 +++++-
 9 files changed, 133 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index 9127d9e,0000000..c9de2af
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,0 +1,64 @@@
++aesfix (1.0.1-3) experimental; urgency=medium
++
++  * Team upload.
++  * Updated the DH level to 9.
++  * debian/control:
++      - Added the 'forensics' word to long description.
++      - Bumped Standards-version to 3.9.6.
++      - Changed from aeskeyfinder to aeskeyfind in Recommends field and long
++        description. Thanks to Christoph Anton Mitterer <calestyo at scientia.net>.
++        (Closes: #713931)
++      - Updated the Homepage field.
++      - Updated the VCS fields.
++  * debian/copyright:
++      - Moved the licenses text to end of file.
++      - Updated the packaging copyright dates and names.
++      - Updated the text of the GPL-2 license.
++      - Updated the upstream homepage address.
++  * debian/upstream/signing-key.asc: added to allow the GPG signature check by
++      uscan.
++  * debian/rules: added the DEB_BUILD_MAINT_OPTIONS variable to fix the issues
++      pointed by blhc.
++  * debian/watch:
++      - Added a check to GPG signature.
++      - Added a second way to search for files.
++      - Improved the regex rule.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Mon, 23 Feb 2015 07:57:57 -0300
++
 +aesfix (1.0.1-2) unstable; urgency=low
 +
 +  * Team upload.
 +
 +  [ Daniel Baumann ]
 +  * Prefixing debhelper files with package name.
 +  * Rewriting copyright file in machine-interpretable form.
 +  * Tidy rules file.
 +  * Adding lintian overrides.
 +  * Using debhelper install file rather than adding install target in upstream
 +    Makefile.
 +  * Removing now useless dirs debhelper file.
 +  * Minimizing rules file.
 +
 +  [ Julien Valroff ]
 +  * Bump debhelper compat to 8 
 +  * Bump standards version to 3.9.2 (no changes needed) 
 +  * Switch to 3.0 (quilt) source package format 
 +  * Fix VCS-* fields 
 +  * Add watch file 
 +  * Move to `utils' section as per the override 
 +  * Complete long description 
 +  * Add samples to the package 
 +  * Remove useless lintian override: use Team Upload changelog entry 
 +  * Recommends aeskeyfinder as suggested by the documentation
 +  * Update copyright file as per current DEP-5 
 +
-  -- Julien Valroff <julien at debian.org>  Sun, 18 Sep 2011 14:39:17 +0200
++ -- Julien Valroff <julien at debian.org>  Sat, 23 Jul 2011 13:56:09 +0200
 +
 +aesfix (1.0.1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #495419)
 +  * Adjusted the Makefile to add $DESTDIR
 +  * Added a man page.
 +
 + -- Jacob Appelbaum <jacob at appelbaum.net>  Sun, 17 Aug 2008 21:02:09 -0300
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 1704d6d,0000000..81d1379
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,22 -1,0 +1,24 @@@
 +Source: aesfix
 +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/aesfix.git
- Vcs-Git: git://git.debian.org/git/forensics/aesfix.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/aesfix.git
++Vcs-Git: git://anonscm.debian.org/forensics/aesfix.git
 +
 +Package: aesfix
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: aeskeyfinder
++Recommends: aeskeyfind
 +Description: tool for correcting bit errors in an AES key schedule
 + This program illustrates a technique for correcting bit errors in an AES
-  key schedule. It should be used with the output of the aeskeyfinder program.
++ key schedule. It should be used with the output of the aeskeyfind program.
 + .
 + It is limited to AES-128 key schedules, and it can only correct unidirectional
 + 1->0 bit errors.  For the most part it has been optimized for readability
 + rather than performance.
++ .
++ This package is useful to several activities, as forensics investigations.
diff --cc debian/copyright
index 99724d6,0000000..0281296
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,58 -1,0 +1,61 @@@
- Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
- 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: AESFix
++Source: https://citp.princeton.edu/research/memory/code
 +
 +Files: *
 +Copyright: 2008 Nadia Heninger
 +           2008 J. Alex Halderman
 +License: BSD-3-clause
++
++Files: debian/*
++Copyright: 2008-2009 Jacob Appelbaum <jacob at appelbaum.net>
++           2011 Julien Valroff <julien 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:
 + .
 + * Redistributions of source code must retain the above
 +   copyright notice, this list of conditions and the
 +   following disclaimer.
 + .
 + * 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.
 + .
 + * Neither the names of the authors nor the names of their institutions
 +   may be used to endorse or promote products derived from this
 +   software without specific prior written permission.
 + .
 + 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 COPYRIGHT
 + OWNER 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.
 +
- 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 --cc debian/patches/add-hardening
index 0000000,0000000..56ee40a
new file mode 100644
--- /dev/null
+++ b/debian/patches/add-hardening
@@@ -1,0 -1,0 +1,20 @@@
++Description: add GCC hardening.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-02-23
++Index: aesfix-1.0.1/Makefile
++===================================================================
++--- aesfix-1.0.1.orig/Makefile
+++++ aesfix-1.0.1/Makefile
++@@ -1,10 +1,10 @@
++-CXXFLAGS= -Wall -O4 -funroll-loops
+++CXXFLAGS += -Wall -O4 -funroll-loops
++ OBJS= aesfix.o errvect.o
++ 
++ all: aesfix
++ 
++ aesfix: $(OBJS)
++-	$(CXX) -o aesfix $(OBJS)
+++	$(CXX) $(LDFLAGS) -o aesfix $(OBJS)
++ 
++ clean:
++ 	@rm -f aesfix *~ \#* $(OBJS)
diff --cc debian/patches/series
index 0000000,0000000..346557c
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++add-hardening
diff --cc debian/rules
index cbe925d,0000000..d8309f6
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,3 -1,0 +1,6 @@@
 +#!/usr/bin/make -f
++
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++
 +%:
 +	dh $@
diff --cc debian/upstream/signing-key.asc
index 0000000,0000000..1f85097
new file mode 100644
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@@ -1,0 -1,0 +1,45 @@@
++
++-----BEGIN PGP PUBLIC KEY BLOCK-----
++
++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
++=GKSC
++-----END PGP PUBLIC KEY BLOCK-----
diff --cc debian/watch
index 3edfa9e,0000000..a786c5f
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,6 @@@
 +version=3
- http://citp.princeton.edu/memory-content/src/aesfix-(.*)\.tar\.gz debian
++opts="pgpsigurlmangle=s/$/.asc/" \
++https://citp.princeton.edu/memory-content/src/aesfix-(\d\S+)\.tar\.(?:bz2|gz|xz)
++
++opts="pgpsigurlmangle=s/$/.asc/" \
++https://citp.princeton.edu/research/memory/code .*/src/aesfix-(\d\S+)\.tar\.(?:bz2|gz|xz)

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

More information about the forensics-changes mailing list