[Forensics-changes] [SCM] debian-forensics/md5deep branch, debian, updated. debian/3.4-3-5-g285ec22

Christophe Monniez christophe.monniez at fccu.be
Mon May 31 20:01:56 UTC 2010


The following commit has been merged in the debian branch:
commit 285ec22affc8e682f4db7746c3945b22ba3843d0
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Mon May 31 21:53:19 2010 +0200

    Refreshing quilt patch.

diff --git a/debian/patches/01-manpage.patch b/debian/patches/01-manpage.patch
index f4bcfdc..31b38a0 100644
--- a/debian/patches/01-manpage.patch
+++ b/debian/patches/01-manpage.patch
@@ -1,10 +1,11 @@
 Author: Franck Joncourt <franck.mail at dthconnex.com>
 Description: Fixed lintian warning: hyphen-used-as-minus-sign (Closes: #538911).
 
-diff -Naurp md5deep.orig/hashdeep/hashdeep.1 md5deep/hashdeep/hashdeep.1
---- md5deep.orig/hashdeep/hashdeep.1	2009-07-28 12:41:22.000000000 +0000
-+++ md5deep/hashdeep/hashdeep.1	2009-07-29 08:21:12.000000000 +0000
-@@ -5,10 +5,10 @@ hashdeep \- Compute, compare, or audit m
+Index: md5deep/hashdeep/hashdeep.1
+===================================================================
+--- md5deep.orig/hashdeep/hashdeep.1	2010-05-31 21:37:41.000000000 +0200
++++ md5deep/hashdeep/hashdeep.1	2010-05-31 21:46:53.000000000 +0200
+@@ -5,10 +5,10 @@
  
  .SH SYNOPSIS
  .B hashdeep 
@@ -12,12 +13,12 @@ diff -Naurp md5deep.orig/hashdeep/hashdeep.1 md5deep/hashdeep/hashdeep.1
 +\-V | \-h
  .br
  .B hashdeep
--[-c <alg1>[,<alg2>]] [-k <file>] [-i <size>] [-amxwMXrespblvv] [\fBFILES\fR]
-+[\-c <alg1>[,<alg2>]] [\-k <file>] [\-i <size>] [\-amxwMXrespblvv] [\fBFILES\fR]
+-[-c <alg1>[,<alg2>]] [-k <file>] [-i <size>] [\-o <fbcplsd>] [-amxwMXrespblvv] [\fBFILES\fR]
++[\-c <alg1>[,<alg2>]] [\-k <file>] [\-i <size>] [\-o <fbcplsd>] [\-amxwMXrespblvv] [\fBFILES\fR]
  
  
  .SH DESCRIPTION
-@@ -78,7 +78,7 @@ the list of known hashes are output. The
+@@ -78,7 +78,7 @@
  for known hashes is the output of previous hashdeep runs.
  .br
  \fB\fR
@@ -26,7 +27,7 @@ diff -Naurp md5deep.orig/hashdeep/hashdeep.1 md5deep/hashdeep/hashdeep.1
  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
-@@ -112,7 +112,7 @@ does (or does not) match the list of kno
+@@ -112,7 +112,7 @@
  \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 
@@ -35,7 +36,7 @@ diff -Naurp md5deep.orig/hashdeep/hashdeep.1 md5deep/hashdeep/hashdeep.1
  all files in \fIdirectories\fR that end in .txt. 
  
  
-@@ -176,7 +176,7 @@ is represented with a question mark (?).
+@@ -199,7 +199,7 @@
  Note that Unicode characters are \fBnot\fR supported in the files
  containing known hashes. You can specify a file of known hashes that has
  Unicode characters in its name by using tab completition or an asterisk
@@ -44,23 +45,24 @@ diff -Naurp md5deep.orig/hashdeep/hashdeep.1 md5deep/hashdeep/hashdeep.1
  
  .SH RETURN VALUE
  Returns zero on success, one on error. 
-diff -Naurp md5deep.orig/md5deep/md5deep.1 md5deep/md5deep/md5deep.1
---- md5deep.orig/md5deep/md5deep.1	2009-07-28 12:41:22.000000000 +0000
-+++ md5deep/md5deep/md5deep.1	2009-07-29 08:21:12.000000000 +0000
-@@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
+Index: md5deep/md5deep/md5deep.1
+===================================================================
+--- md5deep.orig/md5deep/md5deep.1	2010-05-31 21:37:41.000000000 +0200
++++ md5deep/md5deep/md5deep.1	2010-05-31 21:48:17.000000000 +0200
+@@ -13,10 +13,10 @@
  
  .SH SYNOPSIS
  .B md5deep 
 --v | -V | -h
-+\-v | \-V | \-h
++\-v | \-V | -h
  .br
  .B md5deep
--[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>]
-+[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>]
+-[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>] [\-f <file>]
++[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>] [\-f <file>]
  [\-p <size>] [\-i <size>] [\-tnwzresS0lbkq] [\-o <fbcplsd>] [\fBFILES\fR]
  
  .SH DESCRIPTION
-@@ -52,7 +52,7 @@ using multiplers b, k, m, g, t, p, or e.
+@@ -52,7 +52,7 @@
  \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 
@@ -69,7 +71,7 @@ diff -Naurp md5deep.orig/md5deep/md5deep.1 md5deep/md5deep/md5deep.1
  all files in \fIdirectories\fR that end in .txt. 
  
  .TP
-@@ -73,7 +73,7 @@ Hashkeeper files, iLook, and the Nationa
+@@ -73,7 +73,7 @@
  (NSRL) as produced by the National Institute for Standards in Technology.
  .br
  \fB\fR
@@ -78,7 +80,7 @@ diff -Naurp md5deep.orig/md5deep/md5deep.1 md5deep/md5deep/md5deep.1
  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
-@@ -216,7 +216,7 @@ each Unicode character is represented as
+@@ -223,7 +223,7 @@
  Note that Unicode characters are \fBnot\fR supported in the files
  containing known hashes. You can specify a file of known hashes that has
  Unicode characters in its name by using tab completition or an asterisk
@@ -87,10 +89,11 @@ diff -Naurp md5deep.orig/md5deep/md5deep.1 md5deep/md5deep/md5deep.1
  
  .SH RETURN VALUE
  Returns a bit-wise value based on the success of the operation and the
-diff -Naurp md5deep.orig/md5deep/sha1deep.1 md5deep/md5deep/sha1deep.1
---- md5deep.orig/md5deep/sha1deep.1	2009-07-28 12:41:22.000000000 +0000
-+++ md5deep/md5deep/sha1deep.1	2009-07-29 08:21:12.000000000 +0000
-@@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
+Index: md5deep/md5deep/sha1deep.1
+===================================================================
+--- md5deep.orig/md5deep/sha1deep.1	2010-05-31 21:37:41.000000000 +0200
++++ md5deep/md5deep/sha1deep.1	2010-05-31 21:49:14.000000000 +0200
+@@ -13,10 +13,10 @@
  
  .SH SYNOPSIS
  .B md5deep 
@@ -98,12 +101,12 @@ diff -Naurp md5deep.orig/md5deep/sha1deep.1 md5deep/md5deep/sha1deep.1
 +\-v | \-V | \-h
  .br
  .B md5deep
--[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>]
-+[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>]
+-[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>] [\-f <file>]
++[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>] [\-f <file>]
  [\-p <size>] [\-i <size>] [\-tnwzresS0lbkq] [\-o <fbcplsd>] [\fBFILES\fR]
  
  .SH DESCRIPTION
-@@ -52,7 +52,7 @@ using multiplers b, k, m, g, t, p, or e.
+@@ -52,7 +52,7 @@
  \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 
@@ -112,7 +115,7 @@ diff -Naurp md5deep.orig/md5deep/sha1deep.1 md5deep/md5deep/sha1deep.1
  all files in \fIdirectories\fR that end in .txt. 
  
  .TP
-@@ -73,7 +73,7 @@ Hashkeeper files, iLook, and the Nationa
+@@ -73,7 +73,7 @@
  (NSRL) as produced by the National Institute for Standards in Technology.
  .br
  \fB\fR
@@ -121,7 +124,7 @@ diff -Naurp md5deep.orig/md5deep/sha1deep.1 md5deep/md5deep/sha1deep.1
  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
-@@ -216,7 +216,7 @@ each Unicode character is represented as
+@@ -223,7 +223,7 @@
  Note that Unicode characters are \fBnot\fR supported in the files
  containing known hashes. You can specify a file of known hashes that has
  Unicode characters in its name by using tab completition or an asterisk
@@ -130,10 +133,11 @@ diff -Naurp md5deep.orig/md5deep/sha1deep.1 md5deep/md5deep/sha1deep.1
  
  .SH RETURN VALUE
  Returns a bit-wise value based on the success of the operation and the
-diff -Naurp md5deep.orig/md5deep/sha256deep.1 md5deep/md5deep/sha256deep.1
---- md5deep.orig/md5deep/sha256deep.1	2009-07-28 12:41:22.000000000 +0000
-+++ md5deep/md5deep/sha256deep.1	2009-07-29 08:21:12.000000000 +0000
-@@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
+Index: md5deep/md5deep/sha256deep.1
+===================================================================
+--- md5deep.orig/md5deep/sha256deep.1	2010-05-31 21:37:41.000000000 +0200
++++ md5deep/md5deep/sha256deep.1	2010-05-31 21:49:59.000000000 +0200
+@@ -13,10 +13,10 @@
  
  .SH SYNOPSIS
  .B md5deep 
@@ -141,12 +145,12 @@ diff -Naurp md5deep.orig/md5deep/sha256deep.1 md5deep/md5deep/sha256deep.1
 +\-v | \-V | \-h
  .br
  .B md5deep
--[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>]
-+[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>]
+-[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>] [\-f <file>]
++[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>] [\-f <file>]
  [\-p <size>] [\-i <size>] [\-tnwzresS0lbkq] [\-o <fbcplsd>] [\fBFILES\fR]
  
  .SH DESCRIPTION
-@@ -52,7 +52,7 @@ using multiplers b, k, m, g, t, p, or e.
+@@ -52,7 +52,7 @@
  \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 
@@ -155,7 +159,7 @@ diff -Naurp md5deep.orig/md5deep/sha256deep.1 md5deep/md5deep/sha256deep.1
  all files in \fIdirectories\fR that end in .txt. 
  
  .TP
-@@ -73,7 +73,7 @@ Hashkeeper files, iLook, and the Nationa
+@@ -73,7 +73,7 @@
  (NSRL) as produced by the National Institute for Standards in Technology.
  .br
  \fB\fR
@@ -164,7 +168,7 @@ diff -Naurp md5deep.orig/md5deep/sha256deep.1 md5deep/md5deep/sha256deep.1
  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
-@@ -216,7 +216,7 @@ each Unicode character is represented as
+@@ -223,7 +223,7 @@
  Note that Unicode characters are \fBnot\fR supported in the files
  containing known hashes. You can specify a file of known hashes that has
  Unicode characters in its name by using tab completition or an asterisk
@@ -173,10 +177,11 @@ diff -Naurp md5deep.orig/md5deep/sha256deep.1 md5deep/md5deep/sha256deep.1
  
  .SH RETURN VALUE
  Returns a bit-wise value based on the success of the operation and the
-diff -Naurp md5deep.orig/md5deep/tigerdeep.1 md5deep/md5deep/tigerdeep.1
---- md5deep.orig/md5deep/tigerdeep.1	2009-07-28 12:41:22.000000000 +0000
-+++ md5deep/md5deep/tigerdeep.1	2009-07-29 08:21:12.000000000 +0000
-@@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
+Index: md5deep/md5deep/tigerdeep.1
+===================================================================
+--- md5deep.orig/md5deep/tigerdeep.1	2010-05-31 21:37:41.000000000 +0200
++++ md5deep/md5deep/tigerdeep.1	2010-05-31 21:50:44.000000000 +0200
+@@ -13,10 +13,10 @@
  
  .SH SYNOPSIS
  .B md5deep 
@@ -184,12 +189,12 @@ diff -Naurp md5deep.orig/md5deep/tigerdeep.1 md5deep/md5deep/tigerdeep.1
 +\-v | \-V | \-h
  .br
  .B md5deep
--[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>]
-+[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>]
+-[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>] [\-f <file>]
++[\-m|\-M|\-x|\-X <file>]  [\-a|<-A <hash>] [\-f <file>]
  [\-p <size>] [\-i <size>] [\-tnwzresS0lbkq] [\-o <fbcplsd>] [\fBFILES\fR]
  
  .SH DESCRIPTION
-@@ -52,7 +52,7 @@ using multiplers b, k, m, g, t, p, or e.
+@@ -52,7 +52,7 @@
  \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 
@@ -198,7 +203,7 @@ diff -Naurp md5deep.orig/md5deep/tigerdeep.1 md5deep/md5deep/tigerdeep.1
  all files in \fIdirectories\fR that end in .txt. 
  
  .TP
-@@ -73,7 +73,7 @@ Hashkeeper files, iLook, and the Nationa
+@@ -73,7 +73,7 @@
  (NSRL) as produced by the National Institute for Standards in Technology.
  .br
  \fB\fR
@@ -207,7 +212,7 @@ diff -Naurp md5deep.orig/md5deep/tigerdeep.1 md5deep/md5deep/tigerdeep.1
  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
-@@ -216,7 +216,7 @@ each Unicode character is represented as
+@@ -223,7 +223,7 @@
  Note that Unicode characters are \fBnot\fR supported in the files
  containing known hashes. You can specify a file of known hashes that has
  Unicode characters in its name by using tab completition or an asterisk
@@ -216,10 +221,11 @@ diff -Naurp md5deep.orig/md5deep/tigerdeep.1 md5deep/md5deep/tigerdeep.1
  
  .SH RETURN VALUE
  Returns a bit-wise value based on the success of the operation and the
-diff -Naurp md5deep.orig/md5deep/whirlpooldeep.1 md5deep/md5deep/whirlpooldeep.1
---- md5deep.orig/md5deep/whirlpooldeep.1	2009-07-28 12:41:22.000000000 +0000
-+++ md5deep/md5deep/whirlpooldeep.1	2009-07-29 08:21:12.000000000 +0000
-@@ -13,10 +13,10 @@ whirlpooldeep \- Compute and compare Whi
+Index: md5deep/md5deep/whirlpooldeep.1
+===================================================================
+--- md5deep.orig/md5deep/whirlpooldeep.1	2010-05-31 21:37:41.000000000 +0200
++++ md5deep/md5deep/whirlpooldeep.1	2010-05-31 21:51:25.000000000 +0200
+@@ -13,10 +13,10 @@
  
  .SH SYNOPSIS
  .B md5deep 
@@ -227,12 +233,12 @@ diff -Naurp md5deep.orig/md5deep/whirlpooldeep.1 md5deep/md5deep/whirlpooldeep.1
 +\-v | \-V | \-h
  .br
  .B md5deep
--[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>]
-+[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>]
+-[\-m|\-M|\-x|\-X <file>]  [-a|-A <hash>] [\-f <file>]
++[\-m|\-M|\-x|\-X <file>]  [\-a|\-A <hash>] [\-f <file>]
  [\-p <size>] [\-i <size>] [\-tnwzresS0lbkq] [\-o <fbcplsd>] [\fBFILES\fR]
  
  .SH DESCRIPTION
-@@ -52,7 +52,7 @@ using multiplers b, k, m, g, t, p, or e.
+@@ -52,7 +52,7 @@
  \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 
@@ -241,7 +247,7 @@ diff -Naurp md5deep.orig/md5deep/whirlpooldeep.1 md5deep/md5deep/whirlpooldeep.1
  all files in \fIdirectories\fR that end in .txt. 
  
  .TP
-@@ -73,7 +73,7 @@ Hashkeeper files, iLook, and the Nationa
+@@ -73,7 +73,7 @@
  (NSRL) as produced by the National Institute for Standards in Technology.
  .br
  \fB\fR
@@ -250,7 +256,7 @@ diff -Naurp md5deep.orig/md5deep/whirlpooldeep.1 md5deep/md5deep/whirlpooldeep.1
  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
-@@ -216,7 +216,7 @@ each Unicode character is represented as
+@@ -223,7 +223,7 @@
  Note that Unicode characters are \fBnot\fR supported in the files
  containing known hashes. You can specify a file of known hashes that has
  Unicode characters in its name by using tab completition or an asterisk

-- 
debian-forensics/md5deep



More information about the forensics-changes mailing list