[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc4-110-gc47ae94

Francesco Paolo Lovergine frankie at debian.org
Thu Jan 30 13:21:20 UTC 2014 

The following commit has been merged in the master branch:
commit 8954a7fe69268d094d69317c51cbe87a456794b2
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 30 13:51:39 2014 +0100

    Patchset refreshed

diff --git a/debian/changelog b/debian/changelog
index 6d45354..cb63e0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ proftpd-dfsg (1.3.5~rc4-1) unstable; urgency=low
       on upgrades from wheezy. Otherwise the buggy postrm script would delete
       some files from the newly unpacked package. 
     (closes: #699647)
+  * Refreshed patchset.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 30 Jan 2014 13:20:53 +0100
 
diff --git a/debian/patches/contrib_hardening_flags b/debian/patches/contrib_hardening_flags
index 8210c3d..8e663c5 100644
--- a/debian/patches/contrib_hardening_flags
+++ b/debian/patches/contrib_hardening_flags
@@ -1,11 +1,11 @@
 Index: proftpd-dfsg/contrib/mod_load/Makefile.in
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_load/Makefile.in	2013-01-08 13:56:32.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_load/Makefile.in	2013-01-10 14:30:50.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_load/Makefile.in	2014-01-30 13:47:39.000000000 +0100
++++ proftpd-dfsg/contrib/mod_load/Makefile.in	2014-01-30 13:48:27.000000000 +0100
 @@ -17,6 +17,9 @@
  # Necessary redefinitions
  CPPFLAGS= -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(MODULE_INCLUDES)
- LDFLAGS=-L../../lib
+ LDFLAGS=-L../../lib @LDFLAGS@
 +# Add (hardening) flags.
 +CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS  += $(shell dpkg-buildflags --get LDFLAGS)
@@ -14,12 +14,12 @@ Index: proftpd-dfsg/contrib/mod_load/Makefile.in
  	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 Index: proftpd-dfsg/contrib/mod_sftp/Makefile.in
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_sftp/Makefile.in	2013-01-09 13:06:28.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/Makefile.in	2013-01-10 14:30:50.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_sftp/Makefile.in	2014-01-30 13:47:39.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/Makefile.in	2014-01-30 13:49:51.000000000 +0100
 @@ -26,6 +26,9 @@
  INCLUDES=-I. -I../.. -I../../include @INCLUDES@
  CPPFLAGS= $(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
- LDFLAGS=-L../../lib @LIBDIRS@
+ LDFLAGS=-L../../lib @LDFLAGS@
 +# Add (hardening) flags.
 +CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS  += $(shell dpkg-buildflags --get LDFLAGS)
@@ -28,12 +28,12 @@ Index: proftpd-dfsg/contrib/mod_sftp/Makefile.in
  	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 Index: proftpd-dfsg/contrib/mod_wrap2/Makefile.in
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_wrap2/Makefile.in	2013-01-08 13:56:32.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_wrap2/Makefile.in	2013-01-10 14:30:50.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_wrap2/Makefile.in	2014-01-30 13:47:39.000000000 +0100
++++ proftpd-dfsg/contrib/mod_wrap2/Makefile.in	2014-01-30 13:50:18.000000000 +0100
 @@ -17,6 +17,9 @@
  # Necessary redefinitions
  CPPFLAGS= -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(MODULE_INCLUDES)
- LDFLAGS=-L../../lib
+ LDFLAGS=-L../../lib @LDFLAGS@
 +# Add (hardening) flags.
 +CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS  += $(shell dpkg-buildflags --get LDFLAGS)
diff --git a/debian/patches/odbc b/debian/patches/odbc
index 80fb134..2c480eb 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-10-05 18:15:43.000000000 +0200
-+++ proftpd-dfsg/contrib/mod_sql_odbc.c	2011-10-05 18:16:09.000000000 +0200
+--- 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
 @@ -22,6 +22,7 @@
   * the source code for OpenSSL in the source distribution.
   *
-  * $Id: mod_sql_odbc.c,v 1.14 2011/05/23 20:56:40 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/xferstats.holger-preiss b/debian/patches/xferstats.holger-preiss
index f321f06..ee33164 100644
--- a/debian/patches/xferstats.holger-preiss
+++ b/debian/patches/xferstats.holger-preiss
@@ -4,9 +4,9 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/contrib/xferstats.holger-preiss
 ===================================================================
---- proftpd-dfsg.orig/contrib/xferstats.holger-preiss	2011-10-05 18:19:34.000000000 +0200
-+++ proftpd-dfsg/contrib/xferstats.holger-preiss	2011-10-06 10:39:31.000000000 +0200
-@@ -38,6 +38,8 @@
+--- proftpd-dfsg.orig/contrib/xferstats.holger-preiss	2014-01-30 13:42:22.000000000 +0100
++++ proftpd-dfsg/contrib/xferstats.holger-preiss	2014-01-30 13:45:32.000000000 +0100
+@@ -45,6 +45,8 @@
  #  -added option A which compares the addresses end with a given pattern
  #  -added option i and o which reports either incoming or outgoing traffic only
  
@@ -15,17 +15,17 @@ Index: proftpd-dfsg/contrib/xferstats.holger-preiss
  @mydom = split(/\./, `dnsdomainname`);
  $mydom2 = pop(@mydom); chop($mydom2);
  $mydom1 = pop(@mydom);
-@@ -59,8 +61,7 @@
+@@ -66,8 +68,7 @@
  $opt_t = 1;
  $opt_l = 3;
  
 -require 'getopts.pl';
--&Getopts('f:rahdD:l:s:A:iou:');
-+getopts('f:rahdD:l:s:A:iou:');
+-&Getopts('f:rahdD:l:s:A:iotu:e');
++getopts('f:rahdD:l:s:A:iotu:e');
  
  if ($opt_r) { $real = 1;}
  if ($opt_a) { $anon = 1;}
-@@ -196,8 +197,8 @@
+@@ -209,8 +210,8 @@
  }
  close LOG;
  
@@ -36,7 +36,7 @@ Index: proftpd-dfsg/contrib/xferstats.holger-preiss
  
  if ($xferfiles == 0) {die "There was no data to process.\n";}
  
-@@ -231,7 +232,7 @@
+@@ -244,7 +245,7 @@
  
  # sort daily traffic by bytes sendt
  #foreach $date ( sort datecompare keys(nbytes) ) {
@@ -45,7 +45,7 @@ Index: proftpd-dfsg/contrib/xferstats.holger-preiss
  
     $nfiles = $xferfiles{$date};
     $nbytes = $xferbytes{$date};
-@@ -250,14 +251,14 @@
+@@ -263,14 +264,14 @@
  
  Total Transfers from each Archive Section (By bytes)
  
@@ -65,7 +65,7 @@ Index: proftpd-dfsg/contrib/xferstats.holger-preiss
  .
  
  $| = 1;
-@@ -266,7 +267,7 @@
+@@ -279,7 +280,7 @@
  $~ = line2;
  
  # sort total transfer for each archive by # files transfered
@@ -74,7 +74,7 @@ Index: proftpd-dfsg/contrib/xferstats.holger-preiss
  
     $files = $groupfiles{$section};
     $bytes = $groupbytes{$section};
-@@ -298,7 +299,7 @@
+@@ -311,7 +312,7 @@
  $~ = line3;
  
  # sort amount per domain by files
@@ -83,7 +83,7 @@ Index: proftpd-dfsg/contrib/xferstats.holger-preiss
  
     $files = $domainfiles{$domain};
     $bytes = $domainbytes{$domain};
-@@ -340,7 +341,7 @@
+@@ -353,7 +354,7 @@
  $~ = line8;
  
  # sort hourly transmission by sent bytes

-- 
ProFTPD core package

More information about the Pkg-proftpd-maintainers mailing list