[Forensics-changes] [missidentify] 01/01: Imported Debian patch 1.0-7

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Mon Jun 15 23:51:40 UTC 2015


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

eriberto pushed a commit to branch debian
in repository missidentify.

commit 050c82f482bf79ac134cd2f26288b4165fff32e2
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Mon Jun 15 20:44:50 2015 -0300

    Imported Debian patch 1.0-7
---
 debian/changelog                | 26 ++++++++++++++++
 debian/compat                   |  2 +-
 debian/control                  | 21 +++++++------
 debian/copyright                | 67 +++++++++++++++++++++--------------------
 debian/patches/fix-FTBFS-Hurd   | 49 ++++++++++++++++++++++++++++++
 debian/patches/fix-manpage      | 16 ++++++++++
 debian/patches/series           |  2 ++
 debian/rules                    | 15 ++-------
 debian/source.lintian-overrides |  3 --
 debian/source/format            |  1 +
 debian/watch                    |  2 +-
 11 files changed, 144 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53a9406..1a807b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+missidentify (1.0-7) unstable; urgency=medium
+
+  * Team upload.
+  * Using dh-autoreconf.
+  * Migrations:
+      - DebSrc to 3.0 format.
+      - DH level to 9.
+      - debian/copyright to 1.0 format.
+  * debian/control:
+      - Fix a typo in long description. Thanks to Pascal De Vuyst.
+        (Closes: #726929)
+      - Updated the short and long descriptions.
+      - Updated Standards-Version to 3.9.6.
+      - Updated the Vcs-* fields.
+  * debian/copyright: full updated.
+  * debian/patches/
+      - Added fix-manpage to fix a little issue in manpage.
+      - Added fix-FTBFS-Hurd to fix the build process on Hurd.
+  * debian/source.lintian-overrides: deprecated; removed.
+  * debian/rules:
+      - Added the DEB_BUILD_MAINT_OPTIONS variable to improve the GCC hardening.
+      - Simplified by autoreconf use.
+  * debian/watch: improved.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Mon, 15 Jun 2015 20:44:50 -0300
+
 missidentify (1.0-6) unstable; urgency=low
 
   [ Daniel Baumann ]
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f4b709a..07b88b8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,19 @@ 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 (>= 7), autotools-dev
-Standards-Version: 3.9.1
-Homepage: http://missidentify.sourceforge.net/
-Vcs-Browser: http://git.debian.org/?p=forensics/missidentify.git
-Vcs-Git: git://git.debian.org/forensics/missidentify.git
+Build-Depends: debhelper (>= 9), dh-autoreconf
+Standards-Version: 3.9.6
+Homepage: http://missidentify.sf.net
+Vcs-Browser: https://anonscm.debian.org/cgit/forensics/missidentify.git
+Vcs-Git: git://anonscm.debian.org/forensics/missidentify.git
 
 Package: missidentify
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: a program to find win32 applications
- missidentify is a program to find win32 applications. By default, it displays
- the filename of any executable that does not have an executable extension
- (exe, dll, com, sys, cpl, hxs, hxi, olb, rll or tlb).
+Description: find win32 applications
+ Miss Identify (missidentify) is a program to find MS Windows type win32
+ applications. By default, it displays the filename of any executable that
+ does not have an extension, as exe, dll, com, sys, cpl, hxs, hxi, olb, rll
+ or tlb. It can also display all the executables regardless the extension.
  .
- It can also display all the executables regradless the extension.
+ Miss Identify is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index 96517f8..5215bed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,45 @@
-Author: Jesse Kornblum <research at jessekornblum.com>
-Download: http://missidentify.sourceforge.net/#download
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Miss Identify
+Source: http://missidentify.sf.net
 
 Files: *
-Copyright: (C) 2008 Jesse Kornblum <research at jessekornblum.com>
-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 program 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+Copyright: 2007-2008 Jesse Kornblum <research at jessekornblum.com>
+License: GPL-2
+
+Files: cycles.c
+       dig.c
+       helpers.c
+Copyright: 2008 Jesse Kornblum <research at jessekornblum.com>
+License: public_domain
 
 Files: debian/*
-Copyright:
- (C) 2008 Christophe Monniez <christophe.monniez at fccu.be>
- (C) 2008-2009 Daniel Baumann <daniel at debian.org>
+Copyright: 2008      Christophe Monniez <christophe.monniez at fccu.be>
+           2008-2009 Daniel Baumann <daniel at debian.org>
+           2011      Michael Prokop <mika at debian.org>
+           2015      Joao Eriberto Mota Filho <eriberto 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.
+
+License: GPL-2 or 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 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 version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: public_domain
+ This 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.
  .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ This program 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.
diff --git a/debian/patches/fix-FTBFS-Hurd b/debian/patches/fix-FTBFS-Hurd
new file mode 100644
index 0000000..705f724
--- /dev/null
+++ b/debian/patches/fix-FTBFS-Hurd
@@ -0,0 +1,49 @@
+Description: define PATH_MAX variable to fix a FTBFS in Hurd.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-06-15
+Index: missidentify-1.0/main.c
+===================================================================
+--- missidentify-1.0.orig/main.c
++++ missidentify-1.0/main.c
+@@ -3,6 +3,11 @@
+ 
+ #include "main.h"
+ 
++// Fix build in HURD on Debian
++#if defined(__GNU__) && !defined(PATH_MAX)
++#define PATH_MAX 1024
++#endif
++
+ void usage(void)
+ {
+   print_status("%s version %s by %s", __progname, VERSION, AUTHOR);
+Index: missidentify-1.0/dig.c
+===================================================================
+--- missidentify-1.0.orig/dig.c
++++ missidentify-1.0/dig.c
+@@ -16,6 +16,10 @@
+ 
+ #include "main.h"
+ 
++// Fix build in HURD on Debian
++#if defined(__GNU__) && !defined(PATH_MAX)
++#define PATH_MAX 1024
++#endif
+ 
+ #ifndef _WIN32
+ static void remove_double_slash(TCHAR *fn)
+Index: missidentify-1.0/cycles.c
+===================================================================
+--- missidentify-1.0.orig/cycles.c
++++ missidentify-1.0/cycles.c
+@@ -16,6 +16,10 @@
+ 
+ #include "main.h"
+ 
++// Fix build in HURD on Debian
++#if defined(__GNU__) && !defined(PATH_MAX)
++#define PATH_MAX 1024
++#endif
+ 
+ typedef struct dir_table {
+   TCHAR *name;
diff --git a/debian/patches/fix-manpage b/debian/patches/fix-manpage
new file mode 100644
index 0000000..30d3c77
--- /dev/null
+++ b/debian/patches/fix-manpage
@@ -0,0 +1,16 @@
+Description: fix a hyphen used as minus sign in manpage.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-06-07
+Index: missidentify-1.0/missidentify.1
+===================================================================
+--- missidentify-1.0.orig/missidentify.1
++++ missidentify-1.0/missidentify.1
+@@ -19,7 +19,7 @@ display the filename of all executable f
+ \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 missidentify -r *.txt will examine
++file extension. For example, calling missidentify \-r *.txt will examine
+ all files in \fIdirectories\fR that end in .txt. 
+ 
+ .TP
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0bb8ae7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-manpage
+fix-FTBFS-Hurd
diff --git a/debian/rules b/debian/rules
index 9162658..63844c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,6 @@
 #!/usr/bin/make -f
 
-%:
-	dh ${@}
-
-override_dh_auto_clean:
-	dh_auto_clean
-
-	rm -f config.guess config.sub
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-override_dh_auto_configure:
-	[ -r /usr/share/misc/config.guess ] && cp -f /usr/share/misc/config.guess config.guess
-	[ -r /usr/share/misc/config.sub ] && cp -f /usr/share/misc/config.sub config.sub
-
-	dh_auto_configure -- LDFLAGS="-Wl,-z,defs"
+%:
+	dh $@ --with autoreconf
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index a261995..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Avoid warnings if non-uploaders to uploads.
-missidentify source: changelog-should-mention-nmu
-missidentify source: source-nmu-has-incorrect-version-number
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/watch b/debian/watch
index 76557f8..74043d4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/missidentify/missidentify-(.+)\.tar\.gz
+http://sf.net/missidentify/missidentify-(\d\S+)\.tar\.(?:bz2|gz|xz)

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



More information about the forensics-changes mailing list