[proftpd-dfsg] 03/03: New upstream maintainance release 1.3.5a

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository proftpd-dfsg.

commit 791da579f7bcd0c5932c6edc2b39f9eaf882ec8a
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Jan 27 11:34:09 2016 +0000

    New upstream maintainance release 1.3.5a
---
 debian/changelog         | 7 +++++++
 debian/patches/autotools | 6 +++---
 debian/patches/odbc      | 6 +++---
 debian/patches/series    | 1 -
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5ef6f1..4e14e28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proftpd-dfsg (1.3.5a-1) unstable; urgency=medium
+
+  * New upstream release. Patch CVE-2015-3306 merged.
+  * Patches refreshed.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 27 Jan 2016 12:18:06 +0100
+
 proftpd-dfsg (1.3.5-2) unstable; urgency=high
 
   * proftpd-dev: Depend on libtool-bin: merged NMU, thanks Doko.
diff --git a/debian/patches/autotools b/debian/patches/autotools
index 9420752..7beecd9 100644
--- a/debian/patches/autotools
+++ b/debian/patches/autotools
@@ -4,9 +4,9 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/Makefile.in
 ===================================================================
---- proftpd-dfsg.orig/Makefile.in	2013-01-08 15:56:17.000000000 +0100
-+++ proftpd-dfsg/Makefile.in	2013-01-08 15:56:21.000000000 +0100
-@@ -230,10 +230,10 @@
+--- proftpd-dfsg.orig/Makefile.in
++++ proftpd-dfsg/Makefile.in
+@@ -233,10 +233,10 @@ dist: depend distclean spec
  	chmod a+x configure config.sub install-sh modules/glue.sh
  
  # autoheader might not change config.h.in, so touch a stamp file.
diff --git a/debian/patches/odbc b/debian/patches/odbc
index 2c480eb..bd263cb 100644
--- a/debian/patches/odbc
+++ b/debian/patches/odbc
@@ -5,12 +5,12 @@ Bug-Debian: http://bugs.debian.org/366397
 
 Index: proftpd-dfsg/contrib/mod_sql_odbc.c
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_sql_odbc.c	2014-01-30 13:46:03.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sql_odbc.c	2014-01-30 13:46:47.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_sql_odbc.c
++++ proftpd-dfsg/contrib/mod_sql_odbc.c
 @@ -22,6 +22,7 @@
   * the source code for OpenSSL in the source distribution.
   *
-  * $Id: mod_sql_odbc.c,v 1.15 2013/09/25 04:25:54 castaglia Exp $
+  * $Id: mod_sql_odbc.c,v 1.15 2013-09-25 04:25:54 castaglia Exp $
 + * $Libraries: -lodbc $
   */
  
diff --git a/debian/patches/series b/debian/patches/series
index d1331b8..01d4f10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ odbc
 silent
 use_hypen_in_manpage
 contrib_hardening_flags
-CVE-2015-3306

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git