[Forensics-changes] [outguess] 01/01: Imported Debian patch 1:0.2-8

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Wed Dec 14 23:35:20 UTC 2016


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

eriberto pushed a commit to branch debian
in repository outguess.

commit 55bc02bbd64bbef5e3343c268f795dca4d6a69eb
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Sat Dec 3 22:50:47 2016 -0200

    Imported Debian patch 1:0.2-8
---
 debian/changelog                                   |  37 +++-
 debian/clean                                       |   1 +
 debian/control                                     |  24 ++-
 debian/copyright                                   | 224 +++++++++++++++++++--
 debian/install                                     |   1 +
 debian/links                                       |   1 -
 debian/manpages                                    |   2 +-
 debian/patches/10_avoid-direct-changes.patch       |  16 ++
 debian/patches/20_fix-autotools.patch              |  22 ++
 debian/patches/30_fix-GCC-warnings.patch           |  75 +++++++
 debian/patches/40_fix-spellings-final-binary.patch |  29 +++
 debian/patches/50_fix-manpage.patch                |  20 ++
 debian/patches/series                              |   5 +
 debian/rules                                       |  73 +------
 debian/source/format                               |   1 +
 debian/undocumented                                |   1 -
 debian/watch                                       |   3 +
 outguess.c                                         |   2 +-
 18 files changed, 440 insertions(+), 97 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66f1719..dbbd520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+outguess (1:0.2-8) unstable; urgency=medium
+
+  * New maintainer and co-maintainer. Thanks to anthony Gasperin, the last
+    maintainer. (Closes: #840594)
+  * Ack for NMU. (Closes: #817613)
+  * Migrations:
+      - debian/copyright to 1.0 format.
+      - debian/rules to new (reduced) format.
+      - DebSrc to 3.0 format.
+      - Removed histogram from package. (Closes: #659737)
+  * debian/clean: created to remove the deprecated file config.h.bot before
+    build.
+  * debian/control:
+      - Added a Homepage field which points to a mirror. (Closes: #840593)
+      - Added the Vcs-* fields.
+      - Improved the long description.
+  * debian/install: created to install an executable.
+  * debian/patches/:
+      - 10_avoid-direct-changes.patch: added to avoid direct changes in
+        upstream source code. It change outguess.c to match outguess-extract.
+      - 20_fix-autotools.patch: created to fix an issue in configure.in and
+        allow autoreconf.
+      - 30_fix-GCC-warnings.patch: created to fix some GCC warnings.
+      - 40_fix-spellings-final-binary.patch: added to fix some spelling errors
+        in final binaries.
+      - 50_fix-manpage.patch: added to fix spelling errors in manpage.
+  * debian/undocumented: useless. Removed.
+  * debian/watch: added a fake site to explain about the current status of the
+    original upstream homepage. (Closes: #673383)
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sat, 03 Dec 2016 22:50:47 -0200
+
 outguess (1:0.2-7.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -10,7 +42,7 @@ outguess (1:0.2-7.1) unstable; urgency=medium
 
 outguess (1:0.2-7) unstable; urgency=low
 
-  * New Maintainer (Closes: #424718) 
+  * New Maintainer (Closes: #424718)
 
  -- anthony Gasperin <anthony.gasperin at gmail.com>  Thu, 05 Mar 2009 10:36:24 +0100
 
@@ -45,7 +77,7 @@ outguess (1:0.2-4) unstable; urgency=low
 
 outguess (1:0.2-3) unstable; urgency=low
 
-  * New Mantainer (thank Chris for your work) (Closes: Bug#162470)
+  * New Maintainer (thank Chris for your work) (Closes: Bug#162470)
   * Modified debian copyright file (Closes: Bug#162425)
   * Putted seek_script and histogram in /usr/bin
   * Wrote manual page for seek_script
@@ -70,4 +102,3 @@ outguess (0.13b-1) unstable; urgency=low
   * Initial Release.
 
  -- Chris Leishman <masklin at debian.org>  Fri,  8 Sep 2000 23:43:53 +1100
-
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..5e5743e
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+config.h.bot
diff --git a/debian/control b/debian/control
index dc84f9f..a141c84 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,24 @@
 Source: outguess
 Section: utils
 Priority: optional
-Maintainer: anthony Gasperin <anthony.gasperin at gmail.com>
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 10)
+Vcs-Browser: https://anonscm.debian.org/git/forensics/outguess.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/outguess.git
+Homepage: http://cimarron.river.com/mirrors/www.outguess.org
 
 Package: outguess
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Universal Steganographic tool
- OutGuess is a universal steganographic tool that allows the insertion of
- hidden information into the redundant bits of data sources. The nature of the
- data source is irrelevant to the core of OutGuess. The program relies on data
- specific handlers that will extract redundant bits and write them back after
- modification. In this version the PNM and JPEG image formats are supported.
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: universal steganographic tool
+ OutGuess is a universal tool for steganography that allows the insertion
+ of hidden information into the redundant bits of data sources. The nature
+ of the data source is irrelevant to the core of OutGuess.
+ .
+ The program relies on data specific handlers that will extract redundant
+ bits and write them back after modification. The supported formats are
+ JPEG, PPM and PNM.
+ .
+ This package is useful in forensics investigations and security actions.
diff --git a/debian/copyright b/debian/copyright
index fca2d6b..5f11bd6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,38 @@
-This package was debianized by Chris Leishman <masklin at debian.org> on
-Fri,  8 Sep 2000 23:43:53 +1100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OutGuess
+Source: http://www.outguess.org
 
-It was downloaded from http://www.outguess.org/
+Files: *
+Copyright: 1999-2001 Niels Provos <provos at citi.umich.edu>
+           2000      Dug Song <dugsong at monkey.org>
+License: BSD-4-Clause
+Comment: The source file golay.c originally contained a non-comercial
+         requirement. This has been removed with permission from the
+         author, Robert Morelos-Zaragoza <morelos at csl.sony.co.jp>.
 
-Upstream Author: Niels Provos <provos at citi.umich.edu>
+Files: jpeg-6b-steg/*
+Copyright: 1988-1989 Jef Poskanzer
+           1991-1998 Thomas G. Lane
+License: special
 
-Copyright:
+Files: jpeg-6b-steg/ansi2knr.c
+Copyright: ? Aladdin Enterprises of Menlo Park, CA
+License: Ghostscript-GPL
 
- Copyright 2001 Niels Provos <provos at citi.umich.edu>
- All rights reserved.
- 
+Files: missing/md5.c
+       missing/md5.h
+Copyright: 2003 Colin Plumb
+License: public-domain
+
+Files: debian/*
+Copyright: 2000-2001 Chris Leishman <masklin at debian.org>
+           2002      Samuele Giovanni Tonon <samu at debian.org>
+           2007      Michael Ablassmeier <abi at debian.org>
+           2009      anthony Gasperin <anthony.gasperin at gmail.com>
+           2016      Joao Eriberto Mota Filho <eriberto at debian.org>
+License: BSD-4-Clause
+
+License: BSD-4-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -23,7 +46,7 @@ Copyright:
       This product includes software developed by Niels Provos.
  4. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
- 
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
@@ -35,10 +58,183 @@ Copyright:
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: Ghostscript-GPL
+ GHOSTSCRIPT GENERAL PUBLIC LICENSE
+ (Clarified 11 Feb 1988)
+ .
+ Copyright (C) 1988 Richard M. Stallman
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license, but changing it is not allowed.  You can also use this wording
+ to make the terms for other programs.
+ .
+ The license agreements of most software companies keep you at the
+ mercy of those companies.  By contrast, our general public license is
+ intended to give everyone the right to share Ghostscript.  To make sure
+ that you get the rights we want you to have, we need to make
+ restrictions that forbid anyone to deny you these rights or to ask you
+ to surrender the rights.  Hence this license agreement.
+ .
+ Specifically, we want to make sure that you have the right to give
+ away copies of Ghostscript, that you receive source code or else can get
+ it if you want it, that you can change Ghostscript or use pieces of it
+ in new free programs, and that you know you can do these things.
+ .
+ To make sure that everyone has such rights, we have to forbid you to
+ deprive anyone else of these rights.  For example, if you distribute
+ copies of Ghostscript, you must give the recipients all the rights that
+ you have.  You must make sure that they, too, receive or can get the
+ source code.  And you must tell them their rights.
+ .
+ Also, for our own protection, we must make certain that everyone finds
+ out that there is no warranty for Ghostscript.  If Ghostscript is
+ modified by someone else and passed on, we want its recipients to know
+ that what they have is not what we distributed, so that any problems
+ introduced by others will not reflect on our reputation.
+ .
+ Therefore we (Richard M. Stallman and the Free Software Foundation,
+ Inc.) make the following terms which say what you must do to be allowed
+ to distribute or change Ghostscript.
+ .
+    COPYING POLICIES
+ .
+ 1. You may copy and distribute verbatim copies of Ghostscript source
+ code as you receive it, in any medium, provided that you conspicuously
+ and appropriately publish on each copy a valid copyright and license
+ notice "Copyright (C) 1989 Aladdin Enterprises.  All rights reserved.
+ Distributed by Free Software Foundation, Inc." (or with whatever year is
+ appropriate); keep intact the notices on all files that refer to this
+ License Agreement and to the absence of any warranty; and give any other
+ recipients of the Ghostscript program a copy of this License Agreement
+ along with the program.  You may charge a distribution fee for the
+ physical act of transferring a copy.
+ .
+ 2. You may modify your copy or copies of Ghostscript or any portion of
+ it, and copy and distribute such modifications under the terms of
+ Paragraph 1 above, provided that you also do the following:
+ .
+    a) cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change; and
+    .
+    b) cause the whole of any work that you distribute or publish,
+    that in whole or in part contains or is a derivative of Ghostscript
+    or any part thereof, to be licensed at no charge to all third
+    parties on terms identical to those contained in this License
+    Agreement (except that you may choose to grant more extensive
+    warranty protection to some or all third parties, at your option).
+    .
+    c) You may charge a distribution fee for the physical act of
+    transferring a copy, and you may at your option offer warranty
+    protection in exchange for a fee.
+    .
+ Mere aggregation of another unrelated program with this program (or its
+ derivative) on a volume of a storage or distribution medium does not bring
+ the other program under the scope of these terms.
+ .
+ 3. You may copy and distribute Ghostscript (or a portion or derivative
+ of it, under Paragraph 2) in object code or executable form under the
+ terms of Paragraphs 1 and 2 above provided that you also do one of the
+ following:
+ .
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+    .
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal
+    shipping charge) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+    .
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form alone.)
+    .
+ For an executable file, complete source code means all the source code for
+ all modules it contains; but, as a special exception, it need not include
+ source code for modules which are standard libraries that accompany the
+ operating system on which the executable file runs.
+ .
+ 4. You may not copy, sublicense, distribute or transfer Ghostscript
+ except as expressly provided under this License Agreement.  Any attempt
+ otherwise to copy, sublicense, distribute or transfer Ghostscript is
+ void and your rights to use the program under this License agreement
+ shall be automatically terminated.  However, parties who have received
+ computer software programs from you with this License Agreement will not
+ have their licenses terminated so long as such parties remain in full
+ compliance.
+ .
+ 5. If you wish to incorporate parts of Ghostscript into other free
+ programs whose distribution conditions are different, write to the Free
+ Software Foundation.  We have not yet worked out a simple rule that
+ can be stated here, but we will often permit this.  We will be guided
+ by the two goals of preserving the free status of all derivatives of
+ our free software and of promoting the sharing and reuse of software.
+ .
+ Your comments and suggestions about our licensing policies and our
+ software are welcome!  Please contact the Free Software Foundation,
+ http://www.fsf.org/about/contact/.
+ .
+       NO WARRANTY
+ .
+ BECAUSE GHOSTSCRIPT IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY
+ NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW.  EXCEPT
+ WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, RICHARD
+ M. STALLMAN, ALADDIN ENTERPRISES, L. PETER DEUTSCH, AND/OR OTHER PARTIES
+ PROVIDE GHOSTSCRIPT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE
+ ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF GHOSTSCRIPT IS WITH
+ YOU.  SHOULD GHOSTSCRIPT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+ NECESSARY SERVICING, REPAIR OR CORRECTION.
+ .
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M.
+ STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., L. PETER DEUTSCH, ALADDIN
+ ENTERPRISES, AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE
+ GHOSTSCRIPT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+ ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+ (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+ INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE
+ PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) GHOSTSCRIPT, EVEN IF YOU
+ HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM
+ BY ANY OTHER PARTY.
 
+License: special
+ The authors make NO WARRANTY or representation, either express or implied,
+ with respect to this software, its quality, accuracy, merchantability, or
+ fitness for a particular purpose.  This software is provided "AS IS", and you,
+ its user, assume the entire risk as to its quality and accuracy.
+ .
+ This software is copyright (C) 1991-1998, Thomas G. Lane.
+ All Rights Reserved except as specified below.
+ .
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software (or portions thereof) for any purpose, without fee, subject to these
+ conditions:
+ (1) If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no-warranty notice
+ unaltered; and any additions, deletions, or changes to the original files
+ must be clearly indicated in accompanying documentation.
+ (2) If only executable code is distributed, then the accompanying
+ documentation must state that "this software is based in part on the work of
+ the Independent JPEG Group".
+ (3) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences; the authors accept
+ NO LIABILITY for damages of any kind.
+ .
+ These conditions apply to any software derived from or based on the IJG code,
+ not just to the unmodified library.  If you use our work, you ought to
+ acknowledge us.
+ .
+ Permission is NOT granted for the use of any IJG author's name or company name
+ in advertising or publicity relating to this software or products derived from
+ it.  This software may be referred to only as "the Independent JPEG Group's
+ software".
+ .
+ We specifically permit and encourage the use of this software as the basis of
+ commercial products, provided that all warranty or liability claims are
+ assumed by the product vendor.
 
-OutGuess was written in Germany, and CONTAINS CRYPTOGRAPHIC FUNCTIONS.
-
-The source file golay.c originally contained a non-comercial requirement.
-This has been removed with permission from the author, Robert Morelos-Zaragoza
-<morelos at csl.sony.co.jp>.
+License: public-domain
+ This file is under public domain.
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..2cc2cf3
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+seek_script usr/bin
diff --git a/debian/links b/debian/links
index 7d7a467..e72bffa 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,2 @@
 usr/bin/outguess usr/bin/outguess-extract
 usr/share/man/man1/outguess.1 usr/share/man/man1/outguess-extract.1
-
diff --git a/debian/manpages b/debian/manpages
index 654f116..8a8c089 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1,2 @@
-outguess.1
 debian/seek_script.1
+outguess.1
diff --git a/debian/patches/10_avoid-direct-changes.patch b/debian/patches/10_avoid-direct-changes.patch
new file mode 100644
index 0000000..a9573b2
--- /dev/null
+++ b/debian/patches/10_avoid-direct-changes.patch
@@ -0,0 +1,16 @@
+Description: change outguess.c to match outguess-extract
+Author: Samuele Giovanni Tonon <samu at debian.org>
+Last-Update: 2002-10-01
+Index: outguess-0.2/outguess.c
+===================================================================
+--- outguess-0.2.orig/outguess.c
++++ outguess-0.2/outguess.c
+@@ -818,7 +818,7 @@ main(int argc, char **argv)
+                 cp = strrchr(argv[0], '/') + 1;
+         else
+                 cp = argv[0];
+-	if (!strcmp("extract", cp)) {
++	if (!strcmp("outguess-extract", cp)) {
+ 		extractonly = 1;
+ 		doretrieve = 1;
+ 		argv++;
diff --git a/debian/patches/20_fix-autotools.patch b/debian/patches/20_fix-autotools.patch
new file mode 100644
index 0000000..01b94e8
--- /dev/null
+++ b/debian/patches/20_fix-autotools.patch
@@ -0,0 +1,22 @@
+Description: fix an issue in configure.in and allow autoreconf.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-12-04
+Index: outguess-0.2/configure.in
+===================================================================
+--- outguess-0.2.orig/configure.in
++++ outguess-0.2/configure.in
+@@ -38,12 +38,12 @@ AC_FUNC_MMAP
+ AC_CHECK_FUNCS(strrchr memcpy)
+ 
+ AC_CHECK_FUNC(strcasecmp,
+-	AC_DEFINE(HAVE_STRCASECMP),
++	AC_DEFINE([HAVE_STRCASECMP], [], [none]),
+ 	AC_MSG_RESULT(File extensions will be case sensitive!)
+ 	     )
+ 
+ AC_CHECK_FUNC(snprintf, 
+-	AC_DEFINE(HAVE_SNPRINTF),
++	AC_DEFINE([HAVE_SNPRINTF], [], [none]),
+ 	AC_MSG_RESULT(will use sprintf instead, you have a bad system)
+ 	     )
+ 
diff --git a/debian/patches/30_fix-GCC-warnings.patch b/debian/patches/30_fix-GCC-warnings.patch
new file mode 100644
index 0000000..8b78ac6
--- /dev/null
+++ b/debian/patches/30_fix-GCC-warnings.patch
@@ -0,0 +1,75 @@
+Description: fix some GCC warnings.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-12-04
+Index: outguess-0.2/arc.c
+===================================================================
+--- outguess-0.2.orig/arc.c
++++ outguess-0.2/arc.c
+@@ -38,6 +38,7 @@
+  * intact).
+  */
+ 
++#include <string.h>
+ #include <sys/types.h>
+ 
+ #include "config.h"
+Index: outguess-0.2/outguess.c
+===================================================================
+--- outguess-0.2.orig/outguess.c
++++ outguess-0.2/outguess.c
+@@ -50,6 +50,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <math.h>
++#include <string.h>
+ 
+ #include "config.h"
+ 
+Index: outguess-0.2/pnm.c
+===================================================================
+--- outguess-0.2.orig/pnm.c
++++ outguess-0.2/pnm.c
+@@ -38,6 +38,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ #include "config.h"
+ #include "outguess.h"
+Index: outguess-0.2/jpg.c
+===================================================================
+--- outguess-0.2.orig/jpg.c
++++ outguess-0.2/jpg.c
+@@ -37,6 +37,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ #include "config.h"
+ #include "outguess.h"
+Index: outguess-0.2/missing/md5.c
+===================================================================
+--- outguess-0.2.orig/missing/md5.c
++++ outguess-0.2/missing/md5.c
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #include "md5.h"
++#include <string.h>
+ 
+ /* Little-endian byte-swapping routines.  Note that these do not
+    depend on the size of datatypes such as uint32, nor do they require
+Index: outguess-0.2/histogram.c
+===================================================================
+--- outguess-0.2.orig/histogram.c
++++ outguess-0.2/histogram.c
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <err.h>
++#include <string.h>
+ 
+ #include "config.h"
+ #include "outguess.h"
diff --git a/debian/patches/40_fix-spellings-final-binary.patch b/debian/patches/40_fix-spellings-final-binary.patch
new file mode 100644
index 0000000..d125389
--- /dev/null
+++ b/debian/patches/40_fix-spellings-final-binary.patch
@@ -0,0 +1,29 @@
+Description: fix some spelling errors in final binaries.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-12-04
+Index: outguess-0.2/outguess.c
+===================================================================
+--- outguess-0.2.orig/outguess.c
++++ outguess-0.2/outguess.c
+@@ -937,7 +937,7 @@ main(int argc, char **argv)
+ 
+ 	/* Initialize Golay-Tables for 12->23 bit error correction */
+ 	if (doerror || doerror2) {
+-		fprintf(stderr, "Initalize encoding/decoding tables\n");
++		fprintf(stderr, "Initialize encoding/decoding tables\n");
+ 		init_golay();
+ 	}
+ 
+Index: outguess-0.2/pnm.c
+===================================================================
+--- outguess-0.2.orig/pnm.c
++++ outguess-0.2/pnm.c
+@@ -218,7 +218,7 @@ read_pnm(FILE *fin)
+ 	}
+ 
+ 	if (ferror(fin)) {
+-		perror("Error occured while reading input file");
++		perror("Error occurred while reading input file");
+ 		exit(1);
+ 	}
+ 	if (feof(fin)) {
diff --git a/debian/patches/50_fix-manpage.patch b/debian/patches/50_fix-manpage.patch
new file mode 100644
index 0000000..cd01323
--- /dev/null
+++ b/debian/patches/50_fix-manpage.patch
@@ -0,0 +1,20 @@
+Description: fix spelling errors in manpage.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-12-04
+Index: outguess-0.2/outguess.1
+===================================================================
+--- outguess-0.2.orig/outguess.1
++++ outguess-0.2/outguess.1
+@@ -65,10 +65,10 @@ bits that were extracted from a low valu
+ Additionally, 
+ .I Outguess
+ allows for the hiding of two distinct messages in the data, thus
+-providing plausible deniablity.  It keeps track of the bits that have
++providing plausible deniability.  It keeps track of the bits that have
+ been modified previously and locks them.  A (23,12,7) Golay code is
+ used for error correction to tolerate collisions on locked bits.
+-Artifical errors are introduced to avoid modifying bits that have a
++Artificial errors are introduced to avoid modifying bits that have a
+ high bias.
+ .SH OPTIONS
+ .LP
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..11ead39
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+10_avoid-direct-changes.patch
+20_fix-autotools.patch
+30_fix-GCC-warnings.patch
+40_fix-spellings-final-binary.patch
+50_fix-manpage.patch
diff --git a/debian/rules b/debian/rules
index 679cd51..328b9c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,73 +1,10 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=1
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#/usr/bin/docbook-to-man debian/outguess.sgml > outguess.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install prefix=$(CURDIR)/debian/outguess/usr
-	cp histogram $(CURDIR)/debian/outguess/usr/bin/outguess-histogram
-	cp seek_script $(CURDIR)/debian/outguess/usr/bin/
- 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+%:
+	dh $@
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_configure:
+	dh_auto_configure -- --prefix=$(CURDIR)/debian/outguess/usr
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/undocumented b/debian/undocumented
deleted file mode 100644
index 182a57f..0000000
--- a/debian/undocumented
+++ /dev/null
@@ -1 +0,0 @@
-histogram
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..92389a4
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts=dversionmangle=s/.*/0.No-Site/ \
+https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz
diff --git a/outguess.c b/outguess.c
index 4b4e687..557be9e 100644
--- a/outguess.c
+++ b/outguess.c
@@ -818,7 +818,7 @@ main(int argc, char **argv)
                 cp = strrchr(argv[0], '/') + 1;
         else
                 cp = argv[0];
-	if (!strcmp("outguess-extract", cp)) {
+	if (!strcmp("extract", cp)) {
 		extractonly = 1;
 		doretrieve = 1;
 		argv++;

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



More information about the forensics-changes mailing list