From adccfd2c7631fd8bf7a45e317b4b08fd400eff28 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Mon, 6 Feb 2012 10:21:39 +0100 Subject: [PATCH] Refresh the kil-dot-pl patch again. --- debian/patches/kill-dot-pl | 54 +++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/debian/patches/kill-dot-pl b/debian/patches/kill-dot-pl index cbf6e56..cde875e 100644 --- a/debian/patches/kill-dot-pl +++ b/debian/patches/kill-dot-pl @@ -1,8 +1,10 @@ Starting with 1.1.3-2 the pflogsumm package no longer ships the '.pl' compatiblity symlinks. Thus for consistency we've to do some s/pflogsumm.pl/pflogsumm/ all over the place. ---- a/pflogsumm-faq.txt -+++ b/pflogsumm-faq.txt +Index: pflogsumm/pflogsumm-faq.txt +=================================================================== +--- pflogsumm.orig/pflogsumm-faq.txt 2012-02-06 10:09:17.000000000 +0100 ++++ pflogsumm/pflogsumm-faq.txt 2012-02-06 10:18:17.679364712 +0100 @@ -1,5 +1,5 @@ -FAQ for Pflogsumm.pl - A Log Summarizer/Analyzer for the Postfix MTA @@ -10,7 +12,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. Introduction -@@ -7,13 +7,13 @@ Introduction +@@ -7,13 +7,13 @@ hearted exercise in improving my facility with Perl--with the hope that something useful would come out of it as well--has turned out to be a somewhat popular utility. And as more Admins find out about @@ -26,7 +28,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. 1. Project Status 2. "Could You Make" or "Here's A Patch To Make" Pflogsumm Do ... -@@ -137,11 +137,11 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -137,11 +137,11 @@ "creeping over-feature-itis" if I can. My position is *not* set in stone on this issue. In the mean-time: @@ -40,7 +42,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. should do the trick quite nicely for you. -@@ -149,7 +149,7 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -149,7 +149,7 @@ exactly at midnight, you might try something like: (zcat /var/log/maillog.0.gz; cat /var/log/maillog) \ @@ -49,7 +51,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. See Also: 5. Processing Multiple Log Files 17. How Do I Get Pflogsumm To Email Reports To Me -@@ -175,7 +175,7 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -175,7 +175,7 @@ A more complex example, where compressed logs are involved: (zcat `ls -rt /var/log/maillog.*.gz`; cat /var/log/maillog) \ @@ -58,7 +60,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. Obviously, this depends on the file modification times for your logs being reflective of their chronological order. If that can't be -@@ -185,12 +185,12 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -185,12 +185,12 @@ (for each in 3 2 1 0; do zcat "/var/log/maillog.$each.gz" done @@ -73,7 +75,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. [Note: I didn't actually run these. So you would be well-advised to double-check them.] -@@ -305,7 +305,7 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -305,7 +305,7 @@ Message size is reported only by the queue manager. 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 @@ -82,7 +84,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. The Result: -@@ -337,7 +337,7 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -337,7 +337,7 @@ 10. Pflogsumm misses/mis-diagnoses/mis-reports, etc. @@ -91,7 +93,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. version 19990220-06, versions of VMailer prior to 19981023 are no longer supported. Sorry. Pflogsumm-19990121-01.pl will be made permanently available from now on for those with out-of-date versions -@@ -346,7 +346,7 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -346,7 +346,7 @@ Are you processing your log files in chronological order? See item "5: "Processing Multiple Log Files". @@ -100,7 +102,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. at home. There are only two users on the system. And I do no mail-forwarding. So the log samples I have to work with are commensurately limited. -@@ -366,13 +366,13 @@ Index of pflogsumm.pl Frequently Asked Q +@@ -366,13 +366,13 @@ 11. Pflogsumm is generating lots of "uninitialized value" warnings Are you using a version of Perl lower than 5.004_04? Perhaps with a @@ -116,8 +118,10 @@ s/pflogsumm.pl/pflogsumm/ all over the place. You really should consider upgrading your Perl to 5.004 or later. ---- a/pflogsumm.1 -+++ b/pflogsumm.1 +Index: pflogsumm/pflogsumm.1 +=================================================================== +--- pflogsumm.orig/pflogsumm.1 2012-02-06 10:11:16.000000000 +0100 ++++ pflogsumm/pflogsumm.1 2012-02-06 10:19:18.695363861 +0100 @@ -130,13 +130,13 @@ .if n .ad l .nh @@ -125,7 +129,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. -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.4 + Copyright (C) 1998\-2010 by James S. Seymour, Release 1.1.5 .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 8 @@ -134,7 +138,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. \& [\-\-bounce\-detail ] [\-\-deferral\-detail ] \& [\-h ] [\-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 +@@ -145,7 +145,7 @@ \& [\-\-syslog\-name=string] [\-u ] [\-\-verbose\-msg\-detail] \& [\-\-verp\-mung[=]] [\-\-zero\-fill] [file1 [filen]] \& @@ -143,7 +147,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. \& \& If no file(s) specified, reads from stdin. Output is to stdout. .Ve -@@ -268,7 +268,7 @@ Copyright (C) 1998\-2010 by James S. Sey +@@ -268,7 +268,7 @@ \& 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 +156,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." -@@ -386,15 +386,15 @@ Copyright (C) 1998\-2010 by James S. Sey +@@ -386,15 +386,15 @@ .Vb 1 \& Produce a report of previous day\*(Aqs activities: \& @@ -171,16 +175,18 @@ s/pflogsumm.pl/pflogsumm/ all over the place. \& \& Crontab entry to generate a report of the previous day\*(Aqs activity \& at 10 minutes after midnight. ---- a/pflogsumm.pl -+++ b/pflogsumm.pl -@@ -4,13 +4,13 @@ eval 'exec perl -S $0 "$@"' +Index: pflogsumm/pflogsumm.pl +=================================================================== +--- pflogsumm.orig/pflogsumm.pl 2012-02-06 10:11:16.000000000 +0100 ++++ pflogsumm/pflogsumm.pl 2012-02-06 10:19:00.459363575 +0100 +@@ -4,13 +4,13 @@ =head1 NAME -pflogsumm.pl - Produce Postfix MTA logfile summary +pflogsumm - Produce Postfix MTA logfile summary - Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.4 + Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.5 =head1 SYNOPSIS @@ -189,7 +195,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. [--bounce-detail ] [--deferral-detail ] [-h ] [-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 +@@ -19,7 +19,7 @@ [--syslog-name=string] [-u ] [--verbose-msg-detail] [--verp-mung[=]] [--zero-fill] [file1 [filen]] @@ -198,7 +204,7 @@ s/pflogsumm.pl/pflogsumm/ all over the place. If no file(s) specified, reads from stdin. Output is to stdout. -@@ -140,7 +140,7 @@ Copyright (C) 1998-2010 by James S. Seym +@@ -140,7 +140,7 @@ 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 +213,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." -@@ -255,15 +255,15 @@ Copyright (C) 1998-2010 by James S. Seym +@@ -255,15 +255,15 @@ Produce a report of previous day's activities: -- 2.39.2