Refreshed kill-dot-pl patch.

diff --git a/debian/changelog b/debian/changelog
index a9727fc5b35b8d69d47fde330e11cbeed565256d..74ab3dec1d1be9b17aaf951605f81ee610e18523 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pflogsumm (1.1.4-1) UNRELEASED; urgency=low
 
   * New upstream release - Postfix 2.9 compatible.
     + Works with high precission timestamps. (Closes: #644896)
 
   * New upstream release - Postfix 2.9 compatible.
     + Works with high precission timestamps. (Closes: #644896)

+    + Refreshed kill-dot-pl patch.

 
  -- Sven Hoexter <hoexter@debian.org>  Wed, 01 Feb 2012 20:44:35 +0100
 
 
  -- Sven Hoexter <hoexter@debian.org>  Wed, 01 Feb 2012 20:44:35 +0100
 

diff --git a/debian/patches/kill-dot-pl b/debian/patches/kill-dot-pl
index d9e6c741d14af0e7ce633490138d7e69fa35b077..cbf6e561831448dde6aab39419e174f937d1b271 100644 (file)
--- a/debian/patches/kill-dot-pl
+++ b/debian/patches/kill-dot-pl
@@ -125,25 +125,25 @@ s/pflogsumm.pl/pflogsumm/ all over the place.
 -pflogsumm.pl \- Produce Postfix MTA logfile summary
 +pflogsumm \- Produce Postfix MTA logfile summary
  .PP
 -pflogsumm.pl \- Produce Postfix MTA logfile summary
 +pflogsumm \- Produce Postfix MTA logfile summary
  .PP

- Copyright (C) 1998\-2010 by James S. Seymour, Release 1.1.3.
+ Copyright (C) 1998\-2010 by James S. Seymour, Release 1.1.4

  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"

- .Vb 10
+ .Vb 8

 -\&    pflogsumm.pl \-[eq] [\-d <today|yesterday>] [\-\-detail <cnt>]
 +\&    pflogsumm \-[eq] [\-d <today|yesterday>] [\-\-detail <cnt>]
 -\&    pflogsumm.pl \-[eq] [\-d <today|yesterday>] [\-\-detail <cnt>]
 +\&    pflogsumm \-[eq] [\-d <today|yesterday>] [\-\-detail <cnt>]

- \&        [\-\-bounce_detail <cnt>] [\-\-deferral_detail <cnt>]
- \&        [\-h <cnt>] [\-i|\-\-ignore_case] [\-\-iso_date_time] [\-\-mailq]
- \&        [\-m|\-\-uucp_mung] [\-\-no_bounce_detail] [\-\-no_deferral_detail]
-@@ -147,7 +147,7 @@ Copyright (C) 1998\-2010 by James S. Sey
- \&        [\-u <cnt>] [\-\-verbose_msg_detail] [\-\-verp_mung[=<n>]]
- \&        [\-\-zero_fill] [file1 [filen]]
+ \&        [\-\-bounce\-detail <cnt>] [\-\-deferral\-detail <cnt>]
+ \&        [\-h <cnt>] [\-i|\-\-ignore\-case] [\-\-iso\-date\-time] [\-\-mailq]
+ \&        [\-m|\-\-uucp\-mung] [\-\-no\-no\-msg\-size] [\-\-problems\-first]
+@@ -145,7 +145,7 @@ Copyright (C) 1998\-2010 by James S. Sey
+ \&        [\-\-syslog\-name=string] [\-u <cnt>] [\-\-verbose\-msg\-detail]
+ \&        [\-\-verp\-mung[=<n>]] [\-\-zero\-fill] [file1 [filen]]

  \&
 -\&    pflogsumm.pl \-[help|version]
 +\&    pflogsumm \-[help|version]
  \&
  \&    If no file(s) specified, reads from stdin.  Output is to stdout.
  .Ve
  \&
 -\&    pflogsumm.pl \-[help|version]
 +\&    pflogsumm \-[help|version]
  \&
  \&    If no file(s) specified, reads from stdin.  Output is to stdout.
  .Ve

-@@ -270,7 +270,7 @@ Copyright (C) 1998\-2010 by James S. Sey
+@@ -268,7 +268,7 @@ Copyright (C) 1998\-2010 by James S. Sey

  \&                    The message may be delivered long\-enough after the
  \&                    (last) qmgr log entry that the information is not in
  \&                    the log(s) processed by a particular run of
  \&                    The message may be delivered long\-enough after the
  \&                    (last) qmgr log entry that the information is not in
  \&                    the log(s) processed by a particular run of


@@ -152,7 +152,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place.
  \&                    size" and the total for "bytes delivered." These are
  \&                    normally reported by pflogsumm as "Messages with no
  \&                    size data."
  \&                    size" and the total for "bytes delivered." These are
  \&                    normally reported by pflogsumm as "Messages with no
  \&                    size data."

-@@ -388,15 +388,15 @@ Copyright (C) 1998\-2010 by James S. Sey
+@@ -386,15 +386,15 @@ Copyright (C) 1998\-2010 by James S. Sey

  .Vb 1
  \&    Produce a report of previous day\*(Aqs activities:
  \&
  .Vb 1
  \&    Produce a report of previous day\*(Aqs activities:
  \&


@@ -180,25 +180,25 @@ s/pflogsumm.pl/pflogsumm/ all over the place.
 -pflogsumm.pl - Produce Postfix MTA logfile summary
 +pflogsumm - Produce Postfix MTA logfile summary
  
 -pflogsumm.pl - Produce Postfix MTA logfile summary
 +pflogsumm - Produce Postfix MTA logfile summary
  

- Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.3.
+ Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.4

  
  =head1 SYNOPSIS
  
 -    pflogsumm.pl -[eq] [-d <today|yesterday>] [--detail <cnt>]
 +    pflogsumm -[eq] [-d <today|yesterday>] [--detail <cnt>]
  
  =head1 SYNOPSIS
  
 -    pflogsumm.pl -[eq] [-d <today|yesterday>] [--detail <cnt>]
 +    pflogsumm -[eq] [-d <today|yesterday>] [--detail <cnt>]

-       [--bounce_detail <cnt>] [--deferral_detail <cnt>]
-       [-h <cnt>] [-i|--ignore_case] [--iso_date_time] [--mailq]
-       [-m|--uucp_mung] [--no_bounce_detail] [--no_deferral_detail]
-@@ -21,7 +21,7 @@ Copyright (C) 1998-2010 by James S. Seym
-       [-u <cnt>] [--verbose_msg_detail] [--verp_mung[=<n>]]
-       [--zero_fill] [file1 [filen]]
+       [--bounce-detail <cnt>] [--deferral-detail <cnt>]
+       [-h <cnt>] [-i|--ignore-case] [--iso-date-time] [--mailq]
+       [-m|--uucp-mung] [--no-no-msg-size] [--problems-first]
+@@ -19,7 +19,7 @@ Copyright (C) 1998-2010 by James S. Seym
+       [--syslog-name=string] [-u <cnt>] [--verbose-msg-detail]
+       [--verp-mung[=<n>]] [--zero-fill] [file1 [filen]]

  
 -    pflogsumm.pl -[help|version]
 +    pflogsumm -[help|version]
  
      If no file(s) specified, reads from stdin.  Output is to stdout.
  
  
 -    pflogsumm.pl -[help|version]
 +    pflogsumm -[help|version]
  
      If no file(s) specified, reads from stdin.  Output is to stdout.
  

-@@ -142,7 +142,7 @@ Copyright (C) 1998-2010 by James S. Seym
+@@ -140,7 +140,7 @@ Copyright (C) 1998-2010 by James S. Seym

                    The message may be delivered long-enough after the
                    (last) qmgr log entry that the information is not in
                    the log(s) processed by a particular run of
                    The message may be delivered long-enough after the
                    (last) qmgr log entry that the information is not in
                    the log(s) processed by a particular run of


@@ -207,7 +207,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place.
                    size" and the total for "bytes delivered." These are
                    normally reported by pflogsumm as "Messages with no
                    size data."
                    size" and the total for "bytes delivered." These are
                    normally reported by pflogsumm as "Messages with no
                    size data."

-@@ -257,15 +257,15 @@ Copyright (C) 1998-2010 by James S. Seym
+@@ -255,15 +255,15 @@ Copyright (C) 1998-2010 by James S. Seym

  
      Produce a report of previous day's activities:
  
  
      Produce a report of previous day's activities:
  


@@ -226,12 +226,3 @@ s/pflogsumm.pl/pflogsumm/ all over the place.
  
      Crontab entry to generate a report of the previous day's activity
      at 10 minutes after midnight.
  
      Crontab entry to generate a report of the previous day's activity
      at 10 minutes after midnight.

-@@ -488,7 +488,7 @@ for (0 .. 23) {
-     $smtpdPerHr[$_]  = [0,0,0];
- }
- 
--$progName = "pflogsumm.pl";
-+$progName = "pflogsumm";
- $usageMsg =
-     "usage: $progName -[eq] [-d <today|yesterday>] [--detail <cnt>]
-       [--bounce_detail <cnt>] [--deferral_detail <cnt>]