[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-57-g4c9d587

Thu Oct 6 08:47:00 UTC 2011

The following commit has been merged in the master branch:
commit a0644208c45533c756448c690ade9e9c10460123
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Oct 5 18:19:43 2011 +0200

    Refreshed patches.

diff --git a/debian/changelog b/debian/changelog
index a1b305b..c5fd5e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proftpd-dfsg (1.3.4~rc3-1) unstable; urgency=low
+
+  * New upstream pre-release.
+  * Refreshed all patches.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 05 Oct 2011 18:18:55 +0200
+
 proftpd-dfsg (1.3.4~rc2-4) unstable; urgency=low
 
   * Now debian/rules manages correctly debug. noopt and nostrip options
diff --git a/debian/patches/autotools b/debian/patches/autotools
index d88b7a1..cf6ece8 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	2011-02-07 18:08:50.000000000 +0100
-+++ proftpd-dfsg/Makefile.in	2011-02-07 18:09:21.000000000 +0100
-@@ -195,10 +195,10 @@
+--- proftpd-dfsg.orig/Makefile.in	2011-10-05 18:05:31.000000000 +0200
++++ proftpd-dfsg/Makefile.in	2011-10-05 18:05:33.000000000 +0200
+@@ -201,10 +201,10 @@
  
  
  # autoheader might not change config.h.in, so touch a stamp file.
diff --git a/debian/patches/change_pam_name b/debian/patches/change_pam_name
index 38ecb0b..cab975b 100644
--- a/debian/patches/change_pam_name
+++ b/debian/patches/change_pam_name
@@ -4,9 +4,9 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/modules/mod_auth_pam.c
 ===================================================================
---- proftpd-dfsg.orig/modules/mod_auth_pam.c	2011-02-07 18:12:28.000000000 +0100
-+++ proftpd-dfsg/modules/mod_auth_pam.c	2011-02-07 18:12:53.000000000 +0100
-@@ -72,7 +72,7 @@
+--- proftpd-dfsg.orig/modules/mod_auth_pam.c	2011-10-05 18:05:31.000000000 +0200
++++ proftpd-dfsg/modules/mod_auth_pam.c	2011-10-05 18:06:02.000000000 +0200
+@@ -71,7 +71,7 @@
  static authtable auth_pam_authtab[2];
  
  static pam_handle_t *	pamh			= NULL;
diff --git a/debian/patches/ftpasswd.cracklib.location b/debian/patches/ftpasswd.cracklib.location
index 31d2eca..b651186 100644
--- a/debian/patches/ftpasswd.cracklib.location
+++ b/debian/patches/ftpasswd.cracklib.location
@@ -6,9 +6,9 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/contrib/ftpasswd
 ===================================================================
---- proftpd-dfsg.orig/contrib/ftpasswd	2011-02-08 13:30:16.000000000 +0100
-+++ proftpd-dfsg/contrib/ftpasswd	2011-02-08 13:30:36.000000000 +0100
-@@ -37,7 +37,8 @@
+--- proftpd-dfsg.orig/contrib/ftpasswd	2011-10-05 18:05:31.000000000 +0200
++++ proftpd-dfsg/contrib/ftpasswd	2011-10-05 18:06:25.000000000 +0200
+@@ -36,7 +36,8 @@
  my $default_passwd_file = "./ftpd.passwd";
  my $default_group_file = "./ftpd.group";
  my $shell_file = "/etc/shells";
diff --git a/debian/patches/mod_cap b/debian/patches/mod_cap
index cbc986b..d01dc2a 100644
--- a/debian/patches/mod_cap
+++ b/debian/patches/mod_cap
@@ -7,8 +7,8 @@ Bug-Debian: http://bugs.debian.org/479893
 
 Index: proftpd-dfsg/lib/libcap/Makefile
 ===================================================================
---- proftpd-dfsg.orig/lib/libcap/Makefile	2011-02-07 17:47:01.000000000 +0100
-+++ proftpd-dfsg/lib/libcap/Makefile	2011-02-08 13:36:58.000000000 +0100
+--- proftpd-dfsg.orig/lib/libcap/Makefile	2011-10-05 18:13:28.000000000 +0200
++++ proftpd-dfsg/lib/libcap/Makefile	2011-10-05 18:14:52.000000000 +0200
 @@ -23,7 +23,7 @@
  INCLS=libcap.h cap_names.h $(INCS)
  OBJS=$(addsuffix .o, $(FILES))
@@ -20,8 +20,8 @@ Index: proftpd-dfsg/lib/libcap/Makefile
  	$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
 Index: proftpd-dfsg/modules/mod_cap.c
 ===================================================================
---- proftpd-dfsg.orig/modules/mod_cap.c	2011-02-07 17:47:34.000000000 +0100
-+++ proftpd-dfsg/modules/mod_cap.c	2011-02-08 13:36:58.000000000 +0100
+--- proftpd-dfsg.orig/modules/mod_cap.c	2011-10-05 18:13:28.000000000 +0200
++++ proftpd-dfsg/modules/mod_cap.c	2011-10-05 18:14:52.000000000 +0200
 @@ -42,10 +42,8 @@
  #  define _LINUX_BYTEORDER_GENERIC_H
  # endif
diff --git a/debian/patches/mod_wrap_noparanoid b/debian/patches/mod_wrap_noparanoid
index 1dd422f..6b7c6aa 100644
--- a/debian/patches/mod_wrap_noparanoid
+++ b/debian/patches/mod_wrap_noparanoid
@@ -5,9 +5,9 @@ Bug-Debian: http://bugs.debian.org/366397
 
 Index: proftpd-dfsg/contrib/mod_wrap.c
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_wrap.c	2011-02-07 17:47:07.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_wrap.c	2011-02-08 13:35:42.000000000 +0100
-@@ -922,8 +922,7 @@
+--- proftpd-dfsg.orig/contrib/mod_wrap.c	2011-10-05 18:05:31.000000000 +0200
++++ proftpd-dfsg/contrib/mod_wrap.c	2011-10-05 18:06:49.000000000 +0200
+@@ -924,8 +924,7 @@
  
    fromhost(&request);
  
diff --git a/debian/patches/odbc b/debian/patches/odbc
index c242d1f..80fb134 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	2011-03-17 10:44:56.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sql_odbc.c	2011-03-17 10:48:28.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_sql_odbc.c	2011-10-05 18:15:43.000000000 +0200
++++ proftpd-dfsg/contrib/mod_sql_odbc.c	2011-10-05 18:16:09.000000000 +0200
 @@ -22,6 +22,7 @@
   * the source code for OpenSSL in the source distribution.
   *
-  * $Id: mod_sql_odbc.c,v 1.12 2011/02/27 21:36:04 castaglia Exp $
+  * $Id: mod_sql_odbc.c,v 1.14 2011/05/23 20:56:40 castaglia Exp $
 + * $Libraries: -lodbc $
   */
  

-- 
ProFTPD core package

