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

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 4c9d587f3c7ee7c2e22fc26bb2e47079d2bcbc2e
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Oct 6 10:46:31 2011 +0200

    Fixed xferstats aka ftpstats.

diff --git a/debian/changelog b/debian/changelog
index c5fd5e5..da0853c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ proftpd-dfsg (1.3.4~rc3-1) unstable; urgency=low
 
   * New upstream pre-release.
   * Refreshed all patches.
+  * Changed patch xferstats.holger-preiss to fix a few warnings and use
+    Getopt::Std instead of the old getopts.pl which will be removed soon or
+    later in perl5. Thanks lintian.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 05 Oct 2011 18:18:55 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 06 Oct 2011 10:44:15 +0200
 
 proftpd-dfsg (1.3.4~rc2-4) unstable; urgency=low
 
diff --git a/debian/patches/xferstats.holger-preiss b/debian/patches/xferstats.holger-preiss
index be8b78e..f321f06 100644
--- a/debian/patches/xferstats.holger-preiss
+++ b/debian/patches/xferstats.holger-preiss
@@ -4,9 +4,48 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/contrib/xferstats.holger-preiss
 ===================================================================
---- proftpd-dfsg.orig/contrib/xferstats.holger-preiss	2011-02-08 13:28:11.000000000 +0100
-+++ proftpd-dfsg/contrib/xferstats.holger-preiss	2011-02-08 13:28:41.000000000 +0100
-@@ -250,14 +250,14 @@
+--- 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 @@
+ #  -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
+ 
++use Getopt::Std;
++
+ @mydom = split(/\./, `dnsdomainname`);
+ $mydom2 = pop(@mydom); chop($mydom2);
+ $mydom1 = pop(@mydom);
+@@ -59,8 +61,7 @@
+ $opt_t = 1;
+ $opt_l = 3;
+ 
+-require 'getopts.pl';
+-&Getopts('f:rahdD:l:s:A:iou:');
++getopts('f:rahdD:l:s:A:iou:');
+ 
+ if ($opt_r) { $real = 1;}
+ if ($opt_a) { $anon = 1;}
+@@ -196,8 +197,8 @@
+ }
+ close LOG;
+ 
+- at syslist = keys(systemfiles);
+- at dates = sort datecompare keys(xferbytes);
++ at syslist = keys(%systemfiles);
++ at dates = sort datecompare keys(%xferbytes);
+ 
+ if ($xferfiles == 0) {die "There was no data to process.\n";}
+ 
+@@ -231,7 +232,7 @@
+ 
+ # sort daily traffic by bytes sendt
+ #foreach $date ( sort datecompare keys(nbytes) ) {
+-foreach $date ( sort datecompare keys(xferbytes) ) {
++foreach $date ( sort datecompare keys(%xferbytes) ) {
+ 
+    $nfiles = $xferfiles{$date};
+    $nbytes = $xferbytes{$date};
+@@ -250,14 +251,14 @@
  
  Total Transfers from each Archive Section (By bytes)
  
@@ -26,3 +65,30 @@ Index: proftpd-dfsg/contrib/xferstats.holger-preiss
  .
  
  $| = 1;
+@@ -266,7 +267,7 @@
+ $~ = line2;
+ 
+ # sort total transfer for each archive by # files transfered
+-foreach $section ( sort bytecompare keys(groupfiles) ) {
++foreach $section ( sort bytecompare keys(%groupfiles) ) {
+ 
+    $files = $groupfiles{$section};
+    $bytes = $groupbytes{$section};
+@@ -298,7 +299,7 @@
+ $~ = line3;
+ 
+ # sort amount per domain by files
+-foreach $domain ( sort domnamcompare keys(domainfiles) ) {
++foreach $domain ( sort domnamcompare keys(%domainfiles) ) {
+ 
+    $files = $domainfiles{$domain};
+    $bytes = $domainbytes{$domain};
+@@ -340,7 +341,7 @@
+ $~ = line8;
+ 
+ # sort hourly transmission by sent bytes
+-foreach $time ( sort keys(xfertbytes) ) {
++foreach $time ( sort keys(%xfertbytes) ) {
+ 
+    $nfiles   = $xfertfiles{$time};
+    $nbytes   = $xfertbytes{$time};

-- 
ProFTPD core package