[Forensics-changes] [undbx] 01/01: Imported Debian patch 0.20-2

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Wed Jun 17 18:14:17 UTC 2015


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

eriberto pushed a commit to branch debian
in repository undbx.

commit 4f685106013722d5cb2a69ebb28f8be5502bfc80
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Wed Jun 17 13:33:13 2015 -0300

    Imported Debian patch 0.20-2
---
 debian/changelog                    | 26 ++++++++++++++++++++++++++
 debian/compat                       |  2 +-
 debian/control                      | 22 ++++++++++++----------
 debian/copyright                    | 14 +++++++++-----
 debian/{undbx.manpages => manpages} |  0
 debian/patches/fix-makefile         | 13 +++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  4 +++-
 debian/source/local-options         |  2 --
 debian/undbx.1                      |  2 +-
 debian/watch                        |  2 +-
 11 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7913c4..191c17a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+undbx (0.20-2) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream homepage. Thanks to Henri Salo <henri at nerv.fi>.
+      (Closes: #787589)
+  * Migrations:
+      - DH level to 9.
+      - Using dh-autoreconf now.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.6.
+      - Improved the long description.
+      - Updated the Vcs-* fields.
+  * debian/copyright:
+      - Updated the Format field in header.
+      - Updated all information.
+  * debian/patches/fix-makefile: added to allow the GCC hardening. This will
+      fix a possible FTBFS too. (Closes: #689702)
+  * debian/rules: added the DEB_BUILD_MAINT_OPTIONS to improve the GCC
+      hardening.
+  * debian/undbx.1: fixed a typo. Thanks to A. Costa" <agcosta at gis.net>.
+      (Closes: #695491).
+  * debian/undbx.manpages: renamed to manpages.
+  * debian/watch: updated.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Wed, 17 Jun 2015 13:33:13 -0300
+
 undbx (0.20-1) unstable; urgency=low
 
   * Team upload
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 3212bdd..c5459f7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,20 @@ 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 (>= 8.0.0), autotools-dev
-Standards-Version: 3.9.2
-Homepage: http://code.google.com/p/undbx/
-Vcs-Browser: http://git.debian.org/?p=forensics/undbx.git
-Vcs-Git: git://git.debian.org/forensics/undbx.git
+Build-Depends: debhelper (>= 9), dh-autoreconf
+Standards-Version: 3.9.6
+Homepage: https://github.com/ZungBang/undbx
+Vcs-Browser: https://anonscm.debian.org/cgit/forensics/undbx.git
+Vcs-Git: git://anonscm.debian.org/forensics/undbx.git
 
 Package: undbx
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Tool to extract, recover and undelete e-mail messages from .dbx files
+Description: tool to extract, recover and undelete e-mail messages from .dbx files
  UnDBX is a tool to extract, recover and undelete e-mail messages from MS
- Outlook Express .dbx files. Corrupted .dbx files can be parsed to try to
- recover messages from it. It can also try to undelete messages, not only from
- Deleted Items but also from fragments of deleted messages that were not
- overwritten.
+ Outlook Express .dbx files (or similar e-mail programs in MS Windows).
+ Corrupted .dbx files can be parsed to try to recover messages from it. It
+ can also try to undelete messages, not only from Deleted Items but also
+ from fragments of deleted messages that were not overwritten.
+ .
+ UnDBX is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index d29e5df..cfe981a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,18 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: UnDBX
 Upstream-Contact: Avi Rozen <avi.rozen at gmail.com>
-Upstream-Name: UnDBX 
-Source: http://code.google.com/p/undbx/
+Source: https://github.com/ZungBang/undbx
 
 Files: *
-Copyright: (C) 2008-2010 Avi Rozen
+Copyright: 2002-2010 Free Software Foundation, Inc.
+           2008-2009 Ulrich Krebs <ukrebs at freenet.de>
+           2008-2010 Avi Rozen <avi.rozen at gmail.com>
 License: GPL-3+
 
 Files: debian/*
-Copyright: (C) 2011 Christophe Monniez <christophe.monniez at fccu.be>
+Copyright: 2011 Christophe Monniez <christophe.monniez at fccu.be>
+           2011 Julien Valroff <julien at debian.org>
+           2015 Joao Eriberto Mota Filho <eriberto at debian.org>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/undbx.manpages b/debian/manpages
similarity index 100%
rename from debian/undbx.manpages
rename to debian/manpages
diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile
new file mode 100644
index 0000000..4cfbc32
--- /dev/null
+++ b/debian/patches/fix-makefile
@@ -0,0 +1,13 @@
+Description: change Makefile.am to allow the GCC hardening.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2015-06-17
+Index: undbx-0.20/Makefile.am
+===================================================================
+--- undbx-0.20.orig/Makefile.am
++++ undbx-0.20/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = -Wall -Werror
++#AM_CFLAGS = -Wall -Werror
+ bin_PROGRAMS = undbx
+ undbx_SOURCES = undbx.c dbxsys.c dbxread.c emlread.c
+ noinst_HEADERS =  dbxsys.h dbxread.h emlread.h
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4f20ff2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-makefile
diff --git a/debian/rules b/debian/rules
index 297a025..3dff0bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
-	dh $@ --with autotools_dev 
+	dh $@ --with autoreconf
 
 override_dh_auto_install:
 	dh_auto_install
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes
diff --git a/debian/undbx.1 b/debian/undbx.1
index 758c069..bf1999e 100644
--- a/debian/undbx.1
+++ b/debian/undbx.1
@@ -23,7 +23,7 @@ In normal mode (not recovery), a message is extracted only if there is no corres
 On the other hand, if a .eml file exists in the destination directory and no corresponding mail is found in the .dbx file, the mail is considered deleted and \fBundbx\fR will delete this .eml file.
 This way, \fBundbx\fR can be used as an synchronization backup tool for .dbx files.
 .PP
-The file names of .eml files are composed by the From, To and Subjec: header fields.
+The file names of .eml files are composed by the From, To and Subject: header fields.
 The modification time of each file is set to match the date specified in the Date field of the mail header.
 .SH OPTIONS
 
diff --git a/debian/watch b/debian/watch
index a237e56..ee75c04 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://googlecode.debian.net/p/undbx/undbx-(.+)\.tar\.gz
+https://github.com/ZungBang/undbx/releases .*/archive/undbx-(\d\S+)\.tar\.(?:bz2|gz|xz)

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



More information about the forensics-changes mailing list