[Forensics-changes] [hashdeep] 02/02: Imported Debian patch 4.4-1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Jun 15 00:59:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository hashdeep.
commit 3f5b50fec7a635cd679f7fa74cc4ee35db33aa36
Merge: a8c6de6 423d9ef
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Fri Jun 12 11:45:32 2015 -0300
Imported Debian patch 4.4-1
.gitignore | 30 +
CONFIGURE_FC.sh | 110 +-
ChangeLog | 387 +-
Makefile.am | 2 -
Makefile.in | 801 -
NEWS | 84 +-
README | 167 -
README => README.md | 110 +-
aclocal.m4 | 951 -
bootstrap.sh | 7 +
config.h.in | 316 -
configure | 8424 -
configure.ac | 7 +-
debian/changelog | 31 +
debian/clean | 2 +
debian/control | 36 +-
debian/copyright | 4 +-
debian/hashdeep.README.Debian | 8 +
debian/{docs => hashdeep.docs} | 2 +-
debian/hashdeep.install | 2 +
debian/patches/fix-FTBFS-Hurd | 39 +-
debian/patches/fix-manpages | 234 +-
debian/rules | 15 +-
debian/watch | 2 +-
dist/pthreads-w32-2-8-0-release.tar.gz | Bin 0 -> 331327 bytes
doc/Makefile | 31 +
NEWS => doc/changes.txt | 0
doc/faq.html | 189 +
doc/hashdeep.html | 329 +
doc/index.html | 1601 +
doc/md5deep.html | 374 +
doc/start-hashdeep.html | 505 +
doc/start-md5deep.html | 540 +
doc/style.css | 20 +
man/Makefile.am | 5 +-
man/Makefile.in | 427 -
man/hashdeep.1 | 41 +-
man/md5deep.1 | 12 +-
man/sha1deep.1 | 12 +-
man/sha256deep.1 | 12 +-
man/{md5deep.1 => sha3deep.1} | 12 +-
man/tigerdeep.1 | 12 +-
man/whirlpooldeep.1 | 12 +-
missing | 455 +-
sample-hashes/hashdeep.txt | 7 +
sample-hashes/hashkeeper/Z00236.hke | 2 +
sample-hashes/hashkeeper/Z00236.hsh | 6996 +
sample-hashes/hashkeeper/Z00236.zip | Bin 0 -> 222727 bytes
sample-hashes/hashkeeper/sample-hashkeeper | 1 +
sample-hashes/ilookv3.hsh | 6 +
sample-hashes/ilookv4.hsh | 6 +
sample-hashes/md5deep-size.txt | 4 +
sample-hashes/md5deep.txt | 4 +
...a-Formats-of-the-NSRL-Reference-Data-Set-12.pdf | Bin 0 -> 30165 bytes
sample-hashes/nsrl/NSRL-1.5.txt | 219 +
sample-hashes/nsrl/NSRL-2.0.txt | 219 +
sample-hashes/nsrl/RDS-000001-15.zip | Bin 0 -> 11278 bytes
sample-hashes/nsrl/RDS-000001-20.zip | Bin 0 -> 11127 bytes
sample-hashes/sample.c | 9 +
sample-hashes/sample.jpg | Bin 0 -> 5632 bytes
src/Makefile.am | 2 +-
src/Makefile.in | 565 -
src/common.h | 12 +-
src/dig.cpp | 100 +-
src/display.cpp | 79 +-
src/files.cpp | 2 +-
src/hash.cpp | 64 +-
src/hashlist.cpp | 292 +-
src/helpers.cpp | 2 +-
src/main.cpp | 444 +-
src/main.h | 103 +-
src/md5.h | 2 +-
src/multihash.cpp | 6 -
src/sha256.c | 2 +-
src/sha256.h | 2 +-
src/threadpool.cpp | 10 +-
src/tiger.h | 2 +-
src/whirlpool.c | 2 +-
src/whirlpool.h | 2 +-
src/winpe.cpp | 2 +-
src/winpe.h | 2 +-
src/xml.cpp | 2 +-
src/xml.h | 2 +-
tests/Makefile.in | 441 -
tests/WISHLIST | 81 +
tests/bugs.txt | 278 +
tests/md5deep-3.9.2.zip | Bin 0 -> 476788 bytes
tests/testfiles/1072-at.txt | 7 +
tests/testfiles/1072-plus.txt | 6 +
tests/testfiles/Makefile.in | 364 -
tests/testfiles/bsd-hashes.txt | 5 +
tests/testfiles/copying.txt | 368 +
tests/testfiles/deadbeef.txt | 1 +
tests/testfiles/dir_a/dir_b/web2a | 76205 +++
tests/testfiles/dir_a/web2 | 235886 ++++++++
tests/testfiles/dir_c/words1 | 549474 ++++++++++++++++++
tests/testfiles/foo.txt | 3 +
tests/testfiles/ilookv4.hsh | 7 +
tests/testfiles/install.txt | 229 +
tests/testfiles/known.txt | 2 +
tests/testfiles/nsrlfile.txt | 3 +
tests/testfiles/one-byte-file.txt | 1 +
tests/testfiles/symlinktest/dir1/badlink.txt | 1 +
tests/testfiles/symlinktest/dir1/dir1 | 1 +
tests/testfiles/symlinktest/dir1/dir1.txt | 1 +
tests/testfiles/symlinktest/dir1/dir2/dir1 | 1 +
.../testfiles/symlinktest/dir1/dir2/dir1-dir2.txt | 1 +
tests/testfiles/symlinktest/dir1/dir2/dir2 | 1 +
tests/testfiles/symlinktest/dir1/dir2/dir3/dir1 | 1 +
.../symlinktest/dir1/dir2/dir3/dir1-dir2-dir3.txt | 1 +
tests/testfiles/symlinktest/dir1/dir2/dir3/dir2 | 1 +
tests/testfiles/symlinktest/dir1/dir2/dir3/dir3 | 1 +
tests/testfiles/symlinktest/dir1/dir3 | 1 +
tests/testfiles/testfiles.zip | Bin 1103063 -> 0 bytes
.../unicode_circled_bullet_\342\246\277.txt" | Bin 0 -> 22 bytes
"tests/testfiles/unicode_snowman_\342\230\203.txt" | 4 +
tests/testfiles/zero-byte-file.txt | 0
tests/tests.sh | 14 +-
118 files changed, 875046 insertions(+), 13878 deletions(-)
diff --cc debian/changelog
index 84ca09f,0000000..bd9e101
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,186 -1,0 +1,217 @@@
++hashdeep (4.4-1) unstable; urgency=medium
++
++ * Team upload.
++ * New package name (the upstream changed the source code name from md5deep
++ to hashdeep).
++ * New upstream release.
++ * Upload to unstable.
++ * debian/clean: added tests/{ref,tst}/*.
++ * debian/control:
++ - Removed the unnecessary packages autotools-dev, rdfind and symlinks
++ from Build-Depends field.
++ - Reorganized the long description.
++ - Updated the Vcs-* fields.
++ * debian/copyright:
++ - Updated the Source field in header.
++ - Updated the upstream copyright years.
++ * debian/docs:
++ - Renamed to hashdeep.docs.
++ - Added the README.md file and removed README.
++ * debian/hashdeep.install: added to install the files.
++ * debian/hashdeep.README.Debian: added to explain about the new situation of
++ the executables.
++ * debian/patches/: updated all patches.
++ * debian/rules:
++ - Added the GOOD_BIN variable, used by tests. However, the tests will
++ still disabled because are issues.
++ - Removed the override_dh_install target.
++ * debian/watch: improved.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Fri, 12 Jun 2015 11:45:32 -0300
++
+md5deep (4.3-3) experimental; urgency=medium
+
+ * Team upload.
+ * debian/patches/fix-FTBFS-Hurd: added a new fix in another file.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Mon, 30 Mar 2015 23:24:16 -0300
+
+md5deep (4.3-2) experimental; urgency=medium
+
+ * Team upload.
+ * Migrations:
+ - DH level to 9.
+ - Using dh-autoreconf now.
+ * debian/clean: created to remove files created by upstream.
+ * debian/control:
+ - Added rdfind and symlinks to Build-Depends field.
+ - Added the 'forensics' word to long description.
+ - Updated the Standards-Version to 3.9.6.
+ - Updated the Vcs-* fields.
+ * debian/copyright:
+ - Modernized the header.
+ - Updated all information.
+ * debian/patches/
+ - fix-FTBFS-Hurd: added to fix a FTBFS in Hurd.
+ - fix-manpages: added to fix some issues in manpages.
+ * debian/rules:
+ - Added the DEB_BUILD_MAINT_OPTIONS variable to fix the issues
+ pointed by blhc.
+ - Removed an arbitrary LDFLAGS definition to avoid a non hardening
+ action.
+ * debian/watch:
+ - Added a new source to download new versions.
+ - Added an override to use rdfind and symlinks to avoid duplicated files.
+ - Improved the current rule.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 29 Mar 2015 22:55:25 -0300
+
+md5deep (4.3-1) UNRELEASED; urgency=low
+
+ [ Christophe Monniez ]
+ * Imported Upstream version 4.3
+
+ -- Michael Prokop <mika at debian.org> Thu, 13 Dec 2012 09:49:19 +0100
+
+md5deep (4.2-1) unstable; urgency=low
+
+ [ Christophe Monniez ]
+ * [ef64dec] Removing man pages patch.
+ * [bddcf44] Disabling tests.
+
+ [ Michael Prokop ]
+ * [beb4f6a] Merging upstream version 4.2
+ * [f6d6370] Bump Standards-Version to 3.9.3.
+ * Importing upstream version 4.2
+
+ -- Michael Prokop <mika at debian.org> Thu, 14 Jun 2012 18:00:02 +0200
+
+md5deep (4.1-1) unstable; urgency=low
+
+ [ Julien Valroff ]
+ * Update DEP-5 uri
+
+ [ Christophe Monniez ]
+ * Imported Upstream version 4.1
+
+ -- Christophe Monniez <christophe.monniez at fccu.be> Fri, 24 Feb 2012 11:19:16 +0100
+
+md5deep (3.9.2-1) unstable; urgency=low
+
+ * Team upload.
+ * New upstream release
+ * Update DEP-5 uri
+
+ -- Julien Valroff <julien at debian.org> Sun, 18 Sep 2011 14:50:00 +0200
+
+md5deep (3.9.1-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Christophe Monniez ]
+ * Merging upstream version 3.9 (Closes: #626014)
+
+ [ Julien Valroff ]
+ * New upstream release 3.9.1
+ * Switch to 3.0 (quilt) package source format
+ * Use dh-autoreconf (Closes: #539420)
+ * Bump debhelper compat to 8
+ * Bump Standards-Version to 3.9.2 (no changes needed)
+
+ -- Julien Valroff <julien at debian.org> Fri, 03 Jun 2011 08:07:40 +0200
+
+md5deep (3.7-1) unstable; urgency=low
+
+ [ Christophe Monniez ]
+ * Bumping Standards-Version to 3.9.1.
+ * Merging upstream version 3.7.
+ * Updating quilt patch.
+
+ -- Michael Prokop <mika at debian.org> Mon, 21 Feb 2011 23:34:49 +0100
+
+md5deep (3.6-1) unstable; urgency=low
+
+ * Bump version number to address new upstream version.
+
+ -- Michael Prokop <mika at debian.org> Wed, 28 Jul 2010 15:54:33 -0400
+
+md5deep (3.4-4) unstable; urgency=low
+
+ [ Christophe Monniez ]
+ * Adding a README.source.
+ * Merging upstream version 3.6.
+ * Updating quilt build depends.
+ * Added a watch file.
+ * Bumping standards version to 3.9.0.
+
+ -- Michael Prokop <mika at debian.org> Wed, 28 Jul 2010 11:51:41 -0400
+
+md5deep (3.4-3) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding stuff in rules that doesn't get done by dh automatically.
+
+ [ Michael Prokop ]
+ * Update VCS headers (moved to alioth).
+ * Bump Standards-Version to 3.8.3.
+ * Build-Depend on debhelper (>= 7.0.50~).
+ * Drop config.guess + config.sub from debian package / git tree.
+
+ -- Michael Prokop <mika at debian.org> Fri, 02 Oct 2009 11:09:16 +0200
+
+md5deep (3.4-2) unstable; urgency=low
+
+ * Minimizing rules file.
+ * Adding patch from Franck Joncourt <franck.mail at dthconnex.com> to fix
+ lintian warnings in manpage (Closes: #538911).
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 29 Jul 2009 10:23:42 +0200
+
+md5deep (3.4-1) unstable; urgency=low
+
+ [ Christophe Monniez ]
+ * Merging upstream version 3.4.
+
+ [ Daniel Baumann ]
+ * Updating package to standards version 3.8.2.
+ * Adding lintian overrides.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 09 Jul 2009 12:06:16 +0200
+
+md5deep (3.3-1) unstable; urgency=low
+
+ * Merging upstream version 3.3.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 28 May 2009 23:24:20 +0200
+
+md5deep (3.1-2) unstable; urgency=low
+
+ * Adding myself to copyright file.
+ * Replacing obsolete dh_clean -k with dh_prep.
+ * Prefixing debhelper files with package name.
+ * Passing flags directly to configure.
+ * Updating package to standards 3.8.1.
+ * Tidy rules file.
+ * Updating year in copyright file.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 28 May 2009 21:40:44 +0200
+
+md5deep (3.1-1) unstable; urgency=low
+
+ [ Christophe Monniez ]
+ * Initial release (Closes: #469063).
+
+ [ Daniel Baumann ]
+ * Removing useless empty line from changelog file.
+ * Correcting typo in uploaders field of control file.
+ * Updating vcs fields in control file.
+ * Rewrapping package long-description in control file.
+ * Sticking to upstream license text in copyright file.
+ * Some cosmetic corrections in rules file.
+ * Correct wrong binary targets in rules file.
+ * Removing useless debhelper calls in binary-arch target of rules file.
+ * Removing useless --infodir from configure call in rules file.
+ * Adding NEWS and TODO file to docs.
+ * Adding copyright information for hashdeep/lib-strsep.c to copyright file.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 18 Sep 2008 18:55:00 +0200
diff --cc debian/clean
index da935bc,0000000..da5ec3c
mode 100644,000000..100644
--- a/debian/clean
+++ b/debian/clean
@@@ -1,1 -1,0 +1,3 @@@
+src/*.d
++tests/ref/*
++tests/tst/*
diff --cc debian/control
index 0539dc2,0000000..6a1945b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,24 -1,0 +1,38 @@@
- Source: md5deep
++Source: hashdeep
+Section: utils
+Priority: optional
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
- Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, rdfind, symlinks
++Build-Depends: debhelper (>= 9), dh-autoreconf
+Standards-Version: 3.9.6
+Homepage: http://md5deep.sf.net
- Vcs-Browser: http://anonscm.debian.org/cgit/forensics/md5deep.git
- Vcs-Git: git://anonscm.debian.org/forensics/md5deep.git
++Vcs-Browser: http://anonscm.debian.org/cgit/forensics/hashdeep.git
++Vcs-Git: git://anonscm.debian.org/forensics/hashdeep.git
+
- Package: md5deep
++Package: hashdeep
+Architecture: any
++Provides: md5deep
++Replaces: md5deep (<< 4.3-3~)
++Breaks: md5deep (<< 4.3-3~)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: recursively compute hashsums or piecewise hashings
- Md5deep is a set of tools to compute md5, sha-1, sha-256, tiger, whirlpool
- hashsums of arbitrary number of files recursively.
++ hashdeep is a set of tools to compute MD5, SHA1, SHA256, tiger
++ and whirlpool hashsums of arbitrary number of files recursively.
++ .
++ The main hashdeep features are:
+ .
- It can also compare those hashsums with a list of known hashes. The tools
- can display those that match the list or those that does not match. It can
- display a time estimation when processing large files. It can do piecewise
- hashing (hashing input files in arbitrary sized blocks).
++ * It can compare those hashsums with a list of known hashes;
++ * The tools can display those that match the list or those that
++ does not match;
++ * It can display a time estimation when processing large files.
++ * It can do piecewise hashing (hashing input files in arbitrary
++ sized blocks).
+ .
+ This package is useful in forensics investigations.
++
++Package: md5deep
++Architecture: all
++Depends: ${misc:Depends}, hashdeep
++Priority: extra
++Description: transitional dummy package for hashdeep
++ This is a transitional dummy package. It can safely be removed.
diff --cc debian/copyright
index 0aaf262,0000000..9adce46
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,137 -1,0 +1,137 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Upstream-Name: md5deep
++Upstream-Name: hashdeep
+Source: http://md5deep.sf.net
+
+Files: *
+Copyright: ? US Government work: public domain
- 2007-2012 Jesse Kornblum <research at jessekornblum.com>
++ 2007-2014 Jesse Kornblum <research at jessekornblum.com>
+ 2011-2012 Simson Garfinkel
+License: public-domain
+
+
+Files: m4/ax_pthread.m4
+Copyright: 2008 Steven G. Johnson <stevenj at alum.mit.edu>
+ 2011 Daniel Richard G. <skunk at iSKUNK.ORG>
+License: GPL-3+
+
+
+Files: src/sha1.c
+ src/sha1.h
+Copyright: 2006-2010, Brainspark B.V.
+License: GPL-2+
+Comment: This file is part of PolarSSL (http://www.polarssl.org).
+ Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>.
+
+
+Files: src/tiger.c
+Copyright: 1998, 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
+License: LGPL-2.1+
+
+
+Files: src/utf8.h
+ src/utf8/checked.h
+ src/utf8/core.h
+ src/utf8/unchecked.h
+Copyright: 2006 Nemanja Trifunovic
+License: boost-software-license
+
+
+Files: debian/*
+Copyright: 2008-2009 Daniel Baumann <daniel at debian.org>
+ 2008-2012 Christophe Monniez <christophe.monniez at fccu.be>
+ 2009-2012 Michael Prokop <mika at debian.org>
+ 2011-2012 Julien Valroff <julien at debian.org>
+ 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
+License: GPL-2+
+
+
+License: public-domain
+ This program is a work of the US Government. In accordance with 17 USC 105,
+ copyright protection is not available for any work of the US Government.
+ This program is PUBLIC DOMAIN. Portions of this program contain code that
+ is licensed under the terms of the General Public License (GPL). Those
+ portions retain their original copyright and license. See the file COPYING
+ for more details.
+ .
+ There is NO warranty for this program; not even for MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.
+
+
+License: GPL-3+
+ 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 3 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 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+
+License: 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: LGPL-2.1+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser 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 Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
+
+
+License: boost-software-license
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --cc debian/hashdeep.README.Debian
index 0000000,0000000..613ef47
new file mode 100644
--- /dev/null
+++ b/debian/hashdeep.README.Debian
@@@ -1,0 -1,0 +1,8 @@@
++hashdeep for Debian
++-------------------
++
++In the paste, hashdeep, called md5deep, had several executable files. All
++these files (sha1deep, sha256deep, etc) were symlinks to md5deep. Since
++4.4-1 Debian revision, only the hashdeep is installed.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Fri, 12 Jun 2015 19:56:33 +0200
diff --cc debian/hashdeep.docs
index ba719b6,0000000..16aef0d
mode 100644,000000..100644
--- a/debian/hashdeep.docs
+++ b/debian/hashdeep.docs
@@@ -1,4 -1,0 +1,4 @@@
+FILEFORMAT
+NEWS
- README
++README.md
+TODO
diff --cc debian/hashdeep.install
index 0000000,0000000..fd4322b
new file mode 100644
--- /dev/null
+++ b/debian/hashdeep.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/bin/hashdeep
++usr/share/man/man1/hashdeep.1
diff --cc debian/patches/fix-FTBFS-Hurd
index f086282,0000000..c5bb77f
mode 100644,000000..100644
--- a/debian/patches/fix-FTBFS-Hurd
+++ b/debian/patches/fix-FTBFS-Hurd
@@@ -1,34 -1,0 +1,35 @@@
+Description: define PATH_MAX variable to fix a FTBFS in Hurd.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
- Last-Update: 2015-03-30
- Index: md5deep-4.3/src/main.cpp
++Last-Update: 2015-06-14
++Index: hashdeep-4.4/src/files.cpp
+===================================================================
- --- md5deep-4.3.orig/src/main.cpp
- +++ md5deep-4.3/src/main.cpp
- @@ -39,6 +39,10 @@ std::string progname;
- "This is free software; see the source for copying conditions. There is NO\n"\
- "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-
- +// Fix build in HURD on Debian
- +#if defined(__GNU__) && !defined(PATH_MAX)
- +#define PATH_MAX 1024
- +#endif
-
- #ifdef _WIN32
- // This can't go in main.h or we get multiple definitions of it
- Index: md5deep-4.3/src/files.cpp
- ===================================================================
- --- md5deep-4.3.orig/src/files.cpp
- +++ md5deep-4.3/src/files.cpp
++--- hashdeep-4.4.orig/src/files.cpp
+++++ hashdeep-4.4/src/files.cpp
+@@ -26,6 +26,11 @@
+ #include "main.h"
+ #include "common.h"
+
++// Fix build in HURD on Debian
++#if defined(__GNU__) && !defined(PATH_MAX)
++#define PATH_MAX 1024
++#endif
++
+ #ifndef HAVE_ISXDIGIT
+ bool isxdigit(char ch)
+ {
++Index: hashdeep-4.4/src/main.cpp
++===================================================================
++--- hashdeep-4.4.orig/src/main.cpp
+++++ hashdeep-4.4/src/main.cpp
++@@ -27,6 +27,11 @@
++ #include "tiger.h"
++ #include "whirlpool.h"
++
+++// Fix build in HURD on Debian
+++#if defined(__GNU__) && !defined(PATH_MAX)
+++#define PATH_MAX 1024
+++#endif
+++
++ using namespace std;
++
++ std::string progname;
diff --cc debian/patches/fix-manpages
index 64eb5e1,0000000..70d5ed6
mode 100644,000000..100644
--- a/debian/patches/fix-manpages
+++ b/debian/patches/fix-manpages
@@@ -1,269 -1,0 +1,49 @@@
+Description: fix some hyphen used as minus sign in manpages.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
- Last-Update: 2015-03-29
- Index: md5deep-4.3/man/hashdeep.1
++Last-Update: 2015-06-12
++Index: hashdeep-4.4/man/hashdeep.1
+===================================================================
- --- md5deep-4.3.orig/man/hashdeep.1
- +++ md5deep-4.3/man/hashdeep.1
++--- hashdeep-4.4.orig/man/hashdeep.1
+++++ hashdeep-4.4/man/hashdeep.1
+@@ -5,11 +5,11 @@ hashdeep \- Compute, compare, or audit m
+
+ .SH SYNOPSIS
+ .B hashdeep
+--V | -h
++\-V | \-h
+ .br
+ .B hashdeep
+-[-c <alg1>[,<alg2>]] [-k <file>] [-i <size>] [\-f <file>]
- -[\-o <fbcplsde>] [-amxwMXrespblvv] [\-F<bum>] [\-j <num>] [\fBFILES\fR]
++-[\-o <fbcplsde>] [-amxwMXreEspblvv] [\-F<bum>] [\-j <num>] [\fBFILES\fR]
++[\-c <alg1>[,<alg2>]] [\-k <file>] [\-i <size>] [\-f <file>]
- +[\-o <fbcplsde>] [\-amxwMXrespblvv] [\-F<bum>] [\-j <num>] [\fBFILES\fR]
+++[\-o <fbcplsde>] [\-amxwMXreEspblvv] [\-F<bum>] [\-j <num>] [\fBFILES\fR]
+
+
+ .SH DESCRIPTION
+@@ -79,7 +79,7 @@ the list of known hashes are output. The
+ for known hashes is the output of previous hashdeep runs.
+ .br
+ \fB\fR
+-If standard input is used with the -m flag, displays "stdin"
++If standard input is used with the \-m flag, displays "stdin"
+ if the input matches one of the hashes in the list of known hashes. If the
+ hash does not match, the program displays no output.
+ .br
+@@ -123,7 +123,7 @@ does (or does not) match the list of kno
+ \fB\-r\fR
+ Enables recursive mode. All subdirectories are traversed. Please note
+ that recursive mode cannot be used to examine all files of a given
+-file extension. For example, calling hashdeep -r *.txt will examine
++file extension. For example, calling hashdeep \-r *.txt will examine
+ all files in \fIdirectories\fR that end in .txt.
+
+
- @@ -254,7 +254,7 @@ file with Wordpad (which can display Uni
-
- Currently the file name of a file containing known hashes may not be
- specified as a unicode filename, but you can specify the name using
- -tab completition or an asterisk (e.g. md5deep -m *.txt where there is
- +tab completition or an asterisk (e.g. md5deep \-m *.txt where there is
- only one file with a .txt extension).
-
- .SH RETURN VALUE
- Index: md5deep-4.3/man/md5deep.1
- ===================================================================
- --- md5deep-4.3.orig/man/md5deep.1
- +++ md5deep-4.3/man/md5deep.1
- @@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
-
- .SH SYNOPSIS
- .B md5deep
- --v | -V | -h
- +\-v | \-V | \-h
- .br
- .B md5deep
- -[\-m|\-M|\-x|\-X <file>] [-a|-A <hash>] [\-f <file>]
- +[\-m|\-M|\-x|\-X <file>] [\-a|\-A <hash>] [\-f <file>]
- [\-p <size>] [\-i <size>] [\-tnwzresS0lbkqZud] [\-F <bum>]
- [\-o <fbcplsde>] [\-j <num>] [[\fBFILES\fR]
-
- @@ -53,7 +53,7 @@ using IEC multipliers b, k, m, g, t, p,
- \fB\-r\fR
- Enables recursive mode. All subdirectories are traversed. Please note
- that recursive mode cannot be used to examine all files of a given
- -file extension. For example, calling md5deep -r *.txt will examine
- +file extension. For example, calling md5deep \-r *.txt will examine
- all files in \fIdirectories\fR that end in .txt.
-
- .TP
- @@ -74,7 +74,7 @@ Hashkeeper files, iLook, and the Nationa
- (NSRL) as produced by the National Institute for Standards in Technology.
- .br
- \fB\fR
- -If standard input is used with the -m flag, displays "stdin"
- +If standard input is used with the \-m flag, displays "stdin"
- if the input matches one of the hashes in the list of known hashes. If the
- hash does not match, the program displays no output.
- .br
- @@ -283,7 +283,7 @@ file with Wordpad (which can display Uni
-
- Currently the file name of a file containing known hashes may not be
- specified as a unicode filename, but you can specify the name using
- -tab completition or an asterisk (e.g. md5deep -m *.txt where there is
- +tab completition or an asterisk (e.g. md5deep \-m *.txt where there is
- only one file with a .txt extension).
-
- .SH RETURN VALUE
- Index: md5deep-4.3/man/sha1deep.1
- ===================================================================
- --- md5deep-4.3.orig/man/sha1deep.1
- +++ md5deep-4.3/man/sha1deep.1
- @@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
-
- .SH SYNOPSIS
- .B md5deep
- --v | -V | -h
- +\-v | \-V | \-h
- .br
- .B md5deep
- -[\-m|\-M|\-x|\-X <file>] [-a|-A <hash>] [\-f <file>]
- +[\-m|\-M|\-x|\-X <file>] [\-a|\-A <hash>] [\-f <file>]
- [\-p <size>] [\-i <size>] [\-tnwzresS0lbkqZud] [\-F <bum>]
- [\-o <fbcplsde>] [\-j <num>] [[\fBFILES\fR]
-
- @@ -53,7 +53,7 @@ using IEC multipliers b, k, m, g, t, p,
- \fB\-r\fR
- Enables recursive mode. All subdirectories are traversed. Please note
- that recursive mode cannot be used to examine all files of a given
- -file extension. For example, calling md5deep -r *.txt will examine
- +file extension. For example, calling md5deep \-r *.txt will examine
- all files in \fIdirectories\fR that end in .txt.
-
- .TP
- @@ -74,7 +74,7 @@ Hashkeeper files, iLook, and the Nationa
- (NSRL) as produced by the National Institute for Standards in Technology.
- .br
- \fB\fR
- -If standard input is used with the -m flag, displays "stdin"
- +If standard input is used with the \-m flag, displays "stdin"
- if the input matches one of the hashes in the list of known hashes. If the
- hash does not match, the program displays no output.
- .br
- @@ -283,7 +283,7 @@ file with Wordpad (which can display Uni
-
- Currently the file name of a file containing known hashes may not be
- specified as a unicode filename, but you can specify the name using
- -tab completition or an asterisk (e.g. md5deep -m *.txt where there is
- +tab completition or an asterisk (e.g. md5deep \-m *.txt where there is
- only one file with a .txt extension).
-
- .SH RETURN VALUE
- Index: md5deep-4.3/man/sha256deep.1
- ===================================================================
- --- md5deep-4.3.orig/man/sha256deep.1
- +++ md5deep-4.3/man/sha256deep.1
- @@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
-
- .SH SYNOPSIS
- .B md5deep
- --v | -V | -h
- +\-v | \-V | \-h
- .br
- .B md5deep
- -[\-m|\-M|\-x|\-X <file>] [-a|-A <hash>] [\-f <file>]
- +[\-m|\-M|\-x|\-X <file>] [\-a|\-A <hash>] [\-f <file>]
- [\-p <size>] [\-i <size>] [\-tnwzresS0lbkqZud] [\-F <bum>]
- [\-o <fbcplsde>] [\-j <num>] [[\fBFILES\fR]
-
- @@ -53,7 +53,7 @@ using IEC multipliers b, k, m, g, t, p,
- \fB\-r\fR
- Enables recursive mode. All subdirectories are traversed. Please note
- that recursive mode cannot be used to examine all files of a given
- -file extension. For example, calling md5deep -r *.txt will examine
- +file extension. For example, calling md5deep \-r *.txt will examine
- all files in \fIdirectories\fR that end in .txt.
-
- .TP
- @@ -74,7 +74,7 @@ Hashkeeper files, iLook, and the Nationa
- (NSRL) as produced by the National Institute for Standards in Technology.
- .br
- \fB\fR
- -If standard input is used with the -m flag, displays "stdin"
- +If standard input is used with the \-m flag, displays "stdin"
- if the input matches one of the hashes in the list of known hashes. If the
- hash does not match, the program displays no output.
- .br
- @@ -283,7 +283,7 @@ file with Wordpad (which can display Uni
-
- Currently the file name of a file containing known hashes may not be
- specified as a unicode filename, but you can specify the name using
- -tab completition or an asterisk (e.g. md5deep -m *.txt where there is
- +tab completition or an asterisk (e.g. md5deep \-m *.txt where there is
- only one file with a .txt extension).
-
- .SH RETURN VALUE
- Index: md5deep-4.3/man/tigerdeep.1
- ===================================================================
- --- md5deep-4.3.orig/man/tigerdeep.1
- +++ md5deep-4.3/man/tigerdeep.1
- @@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
-
- .SH SYNOPSIS
- .B md5deep
- --v | -V | -h
- +\-v | \-V | \-h
- .br
- .B md5deep
- -[\-m|\-M|\-x|\-X <file>] [-a|-A <hash>] [\-f <file>]
- +[\-m|\-M|\-x|\-X <file>] [\-a|\-A <hash>] [\-f <file>]
- [\-p <size>] [\-i <size>] [\-tnwzresS0lbkqZud] [\-F <bum>]
- [\-o <fbcplsde>] [\-j <num>] [[\fBFILES\fR]
-
- @@ -53,7 +53,7 @@ using IEC multipliers b, k, m, g, t, p,
- \fB\-r\fR
- Enables recursive mode. All subdirectories are traversed. Please note
- that recursive mode cannot be used to examine all files of a given
- -file extension. For example, calling md5deep -r *.txt will examine
- +file extension. For example, calling md5deep \-r *.txt will examine
- all files in \fIdirectories\fR that end in .txt.
-
- .TP
- @@ -74,7 +74,7 @@ Hashkeeper files, iLook, and the Nationa
- (NSRL) as produced by the National Institute for Standards in Technology.
- .br
- \fB\fR
- -If standard input is used with the -m flag, displays "stdin"
- +If standard input is used with the \-m flag, displays "stdin"
- if the input matches one of the hashes in the list of known hashes. If the
- hash does not match, the program displays no output.
- .br
- @@ -283,7 +283,7 @@ file with Wordpad (which can display Uni
-
- Currently the file name of a file containing known hashes may not be
- specified as a unicode filename, but you can specify the name using
- -tab completition or an asterisk (e.g. md5deep -m *.txt where there is
- +tab completition or an asterisk (e.g. md5deep \-m *.txt where there is
- only one file with a .txt extension).
-
- .SH RETURN VALUE
- Index: md5deep-4.3/man/whirlpooldeep.1
- ===================================================================
- --- md5deep-4.3.orig/man/whirlpooldeep.1
- +++ md5deep-4.3/man/whirlpooldeep.1
- @@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
-
- .SH SYNOPSIS
- .B md5deep
- --v | -V | -h
- +\-v | \-V | \-h
- .br
- .B md5deep
- -[\-m|\-M|\-x|\-X <file>] [-a|-A <hash>] [\-f <file>]
- +[\-m|\-M|\-x|\-X <file>] [\-a|\-A <hash>] [\-f <file>]
- [\-p <size>] [\-i <size>] [\-tnwzresS0lbkqZud] [\-F <bum>]
- [\-o <fbcplsde>] [\-j <num>] [[\fBFILES\fR]
-
- @@ -53,7 +53,7 @@ using IEC multipliers b, k, m, g, t, p,
- \fB\-r\fR
- Enables recursive mode. All subdirectories are traversed. Please note
- that recursive mode cannot be used to examine all files of a given
- -file extension. For example, calling md5deep -r *.txt will examine
- +file extension. For example, calling md5deep \-r *.txt will examine
- all files in \fIdirectories\fR that end in .txt.
-
- .TP
- @@ -74,7 +74,7 @@ Hashkeeper files, iLook, and the Nationa
- (NSRL) as produced by the National Institute for Standards in Technology.
- .br
- \fB\fR
- -If standard input is used with the -m flag, displays "stdin"
- +If standard input is used with the \-m flag, displays "stdin"
- if the input matches one of the hashes in the list of known hashes. If the
- hash does not match, the program displays no output.
- .br
- @@ -283,7 +283,7 @@ file with Wordpad (which can display Uni
++@@ -259,7 +259,7 @@ file with Wordpad (which can display Uni
+
+ Currently the file name of a file containing known hashes may not be
+ specified as a unicode filename, but you can specify the name using
+-tab completition or an asterisk (e.g. md5deep -m *.txt where there is
++tab completition or an asterisk (e.g. md5deep \-m *.txt where there is
+ only one file with a .txt extension).
+
+ .SH RETURN VALUE
diff --cc debian/rules
index d45ce35,0000000..532b2e4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,19 -1,0 +1,12 @@@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
++# This variable is used for upstream tests (dh_auto_test):
++export GOOD_BIN = $(CURDIR)/src
++
+%:
+ dh $@ --with autoreconf
+
++# Kept for quick debug purposes.
+override_dh_auto_test:
- # do nothing
-
- override_dh_install:
- dh_install
- #
- # Using rdfind and symlinks to transform duplicated files in softlinks
- #
- rdfind -makesymlinks true -makeresultsfile false $(CURDIR)/debian/md5deep/usr/share/man/man1/
- symlinks -cr $(CURDIR)/debian/md5deep/usr/share/man/man1/
- rdfind -makesymlinks true -makeresultsfile false $(CURDIR)/debian/md5deep/usr/bin
- symlinks -cr $(CURDIR)/debian/md5deep/usr/bin
diff --cc debian/watch
index 71174ca,0000000..50ef469
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
+version=3
+http://sf.net/md5deep/md5deep-(\d\S+)\.tar\.(?:bz2|gz|xz)
- https://github.com/jessek/hashdeep/releases .*/archive/release-(\d\S+)\.tar\.(?:bz2|gz|xz)
++https://github.com/jessek/hashdeep/releases .*/archive/(?:release|v)?-?(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/hashdeep.git
More information about the forensics-changes
mailing list