--- pflogsumm-1.1.5.orig/debian/NEWS +++ pflogsumm-1.1.5/debian/NEWS @@ -0,0 +1,7 @@ +pflogsumm (1.1.3-2) unstable; urgency=low + + This release removes the old '.pl' compatibility symlinks. If your + scripts still call 'pflogsumm.pl' somewhere you've to change them now. + + -- Sven Hoexter Thu, 28 Apr 2011 20:50:51 +0200 + --- pflogsumm-1.1.5.orig/debian/README.Debian +++ pflogsumm-1.1.5/debian/README.Debian @@ -0,0 +1,4 @@ +pflogsumm.pl has been renamed to pflogsumm as the programming language +used shouldn't be in the name of the program. + + -- Sven Hoexter , Thu, 28 Apr 2011 20:57:15 +0200 --- pflogsumm-1.1.5.orig/debian/README.source +++ pflogsumm-1.1.5/debian/README.source @@ -0,0 +1,3 @@ +This package uses quilt to manage the patches in debian/patches. +For further information please install the quilt package and read +/usr/share/doc/quilt/README.source. --- pflogsumm-1.1.5.orig/debian/changelog +++ pflogsumm-1.1.5/debian/changelog @@ -0,0 +1,176 @@ +pflogsumm (1.1.5-5) unstable; urgency=medium + + * Add patch to count milter rejects provided by Matus Uhlar. + * Update Standards-Version to 4.3.0 - no changes required. + * Change debhelper-compat level to 12. + + -- Sven Hoexter Tue, 15 Jan 2019 10:10:35 +0100 + +pflogsumm (1.1.5-4) unstable; urgency=medium + + * Change Standards-Version to 4.2.1. + * Change priority from extra to optional. + * Change Vcs-Git to a https URL. + * Build-Depend on debhelper-compat, change to debhelper compat level 11. + + -- Sven Hoexter Thu, 01 Nov 2018 19:49:29 +0100 + +pflogsumm (1.1.5-3) unstable; urgency=medium + + * Import postscreen support patch provided by Matus Uhlar + d/patches/postscreen-rejects (Closes: #861402) + * Update d/copyright year to 2017. + * Update d/compat to 10, increase debhelper version dependency. + + -- Sven Hoexter Tue, 02 May 2017 18:32:14 +0200 + +pflogsumm (1.1.5-2) unstable; urgency=low + + * Increase Standards-Version to 3.9.8 - no changes required. + * Set debhelper compat level to 9. + * Set Vcs-Browser URL to a https based one. + + -- Sven Hoexter Sun, 27 Nov 2016 21:07:23 +0100 + +pflogsumm (1.1.5-1) unstable; urgency=low + + * New upstream release. + + Fixes RFC 3339 timestamps support including high precision + timestamps. Thanks to Mihai Stan + for the bugreport and the initial patch. (Closes: #644896) + + -- Sven Hoexter Mon, 06 Feb 2012 10:13:35 +0100 + +pflogsumm (1.1.4-1) unstable; urgency=low + + * New upstream release - Postfix 2.9 compatible. + + Refreshed kill-dot-pl patch. + + -- Sven Hoexter Wed, 01 Feb 2012 20:44:35 +0100 + +pflogsumm (1.1.3-2) unstable; urgency=low + + * Update Vcs-* to the new git repository. + * No longer create '.pl' compatiblity symlinks. (Closes: #639012) + * Add a NEWS file to state that the compatiblity symlinks are gone. + * Increase Standards-Version up to 3.9.2 - no changes required. + * Increase debhelper compat level to 8, build-depend on debhelper (>=8). + * Add debian/source/format -> 1.0. + * Build-depend on quilt to use dh --with quilt. + * Add debian/patches/kill-dot-pl and a debian/README.source. Due to + the removed '.pl' symlinks we've to do some s/pflogsumm.pl/pflogsumm/ + in several files. + * Update debian/copyright: + - Refer to /usr/share/common-licenses/GPL-2 instead of the generic + GPL symlink. + - State that the copyright and license for the debian directory. + + -- Sven Hoexter Thu, 28 Apr 2011 20:46:12 +0200 + +pflogsumm (1.1.3-1) unstable; urgency=low + + * New upstream release + + Reduce detail reporting with several --*_detail=N switches or + one global --detail=N switch. This deprecates several --no_*_detail + switches. See the upstream changelog for more details. (Closes: #364827) + + Added support for RFC 3330 timestamps. (Closes: #432276) + * Bump Standards-Version to 3.8.4 - no changes required. + + -- Sven Hoexter Sat, 20 Mar 2010 23:12:04 +0100 + +pflogsumm (1.1.2-2) unstable; urgency=low + + * Change dependency from perl5 to perl. + * Change priority from optional to extra to match with + the override entries already set in the archive. + (Postfix itself has to be priority extra so it doesn't make + sense to have pflogsumm with priority optional even if it + doesn't strictly depend on Postfix.) + * Remove the '.pl' in the cron example files. + + -- Sven Hoexter Fri, 16 Oct 2009 20:28:12 +0200 + +pflogsumm (1.1.2-1) unstable; urgency=low + + * Adopt the package (Closes: #549359). + * New upstream release. (Closes: #420657) + + Remove the old patch for the DSN status codes. + + The new version doesn't ship with rem_smtpd_stats_supp.pl. + * Bump Standards-Version to 3.8.3. + + Move Homepage from the description to the official Homepage field. + + Add a VCS-Svn entry for my repository. + * Move to a minimized dh 7 rules file. + + Raise debhelper build depedency to 7.0.50. + + Add ${misc:Depends} to the binary package. + + Add debian/compat file. + + Add manpage to debian/manpages. + + Add debian/docs to include the README and FAQ. + + Move the cron examples into debian/example and install them with + a debian/examples file. + * Add a debian/watch file (Closes: #515857). + * Update debian/copyright up to -2007 and note the current maintainer. + + -- Sven Hoexter Sat, 03 Oct 2009 11:12:12 +0200 + +pflogsumm (1.1.0-3) unstable; urgency=low + + * Upload prepared by Ralf Hildebrandt + * Patches by Fridtjof Busse + * Bumped DH_COMPAT + * Fixed some perl warnings + (Closes: #260210) + * Deal with newer versions of postfix which log DSN status codes + (Closes: #303899) + + -- Pascal Hakim Fri, 14 Apr 2006 21:30:05 +1000 + +pflogsumm (1.1.0-2) unstable; urgency=low + + * Fixed symlink to old name of pflogsumm and added a note to + README.Debian about it. + (Closes: #228364) + + -- Pascal Hakim Wed, 21 Jan 2004 17:12:05 +1100 + +pflogsumm (1.1.0-1) unstable; urgency=low + + * New maintainer (pasc@debian.org) + (Closes: #228042) + * Update to Standards-Version 3.6.1 + * Re-packaged as Debian non-native + * New upstream release + + Package updated + (Closes: #225816) + + Catches new format of rejects + (Closes: #203011) + + Fixes VERP-handling + (Closes: #177397) + * Renamed binary + (Closes: #188898) + + -- Pascal Hakim Fri, 16 Jan 2003 23:20:03 +1100 + +pflogsumm (1.0.10-1) unstable; urgency=low + + * New upstream release, fixes problems with postfix versions 2.0 and + beyond (Closes: #177564) + + -- Stijn de Bekker Mon, 10 Mar 2003 14:23:53 +0100 + +pflogsumm (1.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Stijn de Bekker Sun, 14 Apr 2002 21:45:53 +0200 + +pflogsumm (1.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Stijn de Bekker Wed, 20 Jun 2001 20:02:30 +0200 + +pflogsumm (0.0.20000925-1) unstable; urgency=low + + * Initial Release (Closes: #90244). + + -- Stijn de Bekker Tue, 20 Mar 2001 23:03:47 +0100 --- pflogsumm-1.1.5.orig/debian/control +++ pflogsumm-1.1.5/debian/control @@ -0,0 +1,18 @@ +Source: pflogsumm +Section: admin +Priority: optional +Maintainer: Sven Hoexter +Build-Depends-Indep: quilt +Build-Depends: debhelper-compat (= 12) +Standards-Version: 4.3.0 +Homepage: http://jimsun.linxnet.com/postfix_contrib.html +Vcs-Git: https://git.sven.stormbind.net/pflogsumm.git +Vcs-Browser: https://git.sven.stormbind.net/?p=sven/pflogsumm.git + +Package: pflogsumm +Architecture: all +Depends: ${misc:Depends}, perl, libdate-calc-perl +Description: Postfix log entry summarizer + pflogsumm is designed to provide an over-view of postfix + activity, with just enough detail to give the administrator + a "heads up" for potential trouble spots. --- pflogsumm-1.1.5.orig/debian/copyright +++ pflogsumm-1.1.5/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Stijn de Bekker on +Wed, 20 Jun 2001 20:04:19 +0100. + +It is currently maintained by Sven Hoexter . + +It was downloaded from + http://jimsun.linxnet.com/downloads/ + + +Upstream Author: James S. Seymour + + +Copyright: + +The debian directory of this package is +Copyright 2010-2018 Sven Hoexter + +All of the programs, applications, and utilities (hereinafter referred to +as "programs") are Copyright (C) 1998-2010 James S. Seymour. + +These programs are free software; you can redistribute them and/or modify +them under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. + +These programs are distributed in the hope that they will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License may be found in `/usr/share/common-licenses/GPL-2'. + +You may receive a copy of the GNU General Public License along with +these programs; if not, write to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. --- pflogsumm-1.1.5.orig/debian/dirs +++ pflogsumm-1.1.5/debian/dirs @@ -0,0 +1,2 @@ +/usr/sbin +/usr/share/man/man1 --- pflogsumm-1.1.5.orig/debian/docs +++ pflogsumm-1.1.5/debian/docs @@ -0,0 +1,2 @@ +pflogsumm-faq.txt +README --- pflogsumm-1.1.5.orig/debian/example/cron.daily +++ pflogsumm-1.1.5/debian/example/cron.daily @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Debian pflogsumm daily cron script +# +# This script analyses the logfile for statistics and problems. +# + +if [ -x /usr/sbin/pflogsumm ]; then + /usr/sbin/pflogsumm -d yesterday --problems_first /var/log/mail.log +fi --- pflogsumm-1.1.5.orig/debian/example/cron.weekly +++ pflogsumm-1.1.5/debian/example/cron.weekly @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Debian pflogsumm weekly cron script +# +# This script analyses the logfile for statistics and problems. +# + +if [ -x /usr/sbin/pflogsumm ]; then + /usr/sbin/pflogsumm --problems_first /var/log/mail.log* +fi --- pflogsumm-1.1.5.orig/debian/examples +++ pflogsumm-1.1.5/debian/examples @@ -0,0 +1,2 @@ +debian/example/cron.daily +debian/example/cron.weekly --- pflogsumm-1.1.5.orig/debian/gbp.conf +++ pflogsumm-1.1.5/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True --- pflogsumm-1.1.5.orig/debian/manpages +++ pflogsumm-1.1.5/debian/manpages @@ -0,0 +1 @@ +pflogsumm.1 --- pflogsumm-1.1.5.orig/debian/patches/kill-dot-pl +++ pflogsumm-1.1.5/debian/patches/kill-dot-pl @@ -0,0 +1,234 @@ +Starting with 1.1.3-2 the pflogsumm package no longer ships the +'.pl' compatibility symlinks. Thus for consistency we've to do some +s/pflogsumm.pl/pflogsumm/ all over the place. +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 ++FAQ for pflogsumm - A Log Summarizer/Analyzer for the Postfix MTA + + 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 +- postfix, and more end up trying pflogsumm.pl, many of the questions, ++ postfix, and more end up trying pflogsumm, many of the questions, + suggestions, and enhancement requests are becoming "frequently + asked". So odd as it seems (to me, at any rate), it looks like it's + time for a FAQ. + + +-Index of pflogsumm.pl Frequently Asked Questions (in no particular order) ++Index of pflogsumm Frequently Asked Questions (in no particular order) + + 1. Project Status + 2. "Could You Make" or "Here's A Patch To Make" Pflogsumm Do ... +@@ -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: + +- zcat /var/log/maillog.0.gz |pflogsumm.pl ++ zcat /var/log/maillog.0.gz |pflogsumm + + or + +- gunzip ++ gunzip + + should do the trick quite nicely for you. + +@@ -149,7 +149,7 @@ + exactly at midnight, you might try something like: + + (zcat /var/log/maillog.0.gz; cat /var/log/maillog) \ +- |pflogsumm.pl -d yesterday ++ |pflogsumm -d yesterday + + See Also: 5. Processing Multiple Log Files + 17. How Do I Get Pflogsumm To Email Reports To Me +@@ -175,7 +175,7 @@ + A more complex example, where compressed logs are involved: + + (zcat `ls -rt /var/log/maillog.*.gz`; cat /var/log/maillog) \ +- |pflogsumm.pl ++ |pflogsumm + + 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 @@ + (for each in 3 2 1 0; do + zcat "/var/log/maillog.$each.gz" + done +- cat /var/log/maillog) |pflogsumm.pl ++ cat /var/log/maillog) |pflogsumm + + or (somewhat more efficiently--by running zcat only once): + + (zcat `for ea in 3 2 1 0; do echo "/var/log/maillog.$ea.gz"; +- done`; cat /var/log/maillog) |pflogsumm.pl ++ done`; cat /var/log/maillog) |pflogsumm + + [Note: I didn't actually run these. So you would be well-advised + to double-check them.] +@@ -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 +- of pflogsumm.pl. ++ of pflogsumm. + + The Result: + +@@ -337,7 +337,7 @@ + + 10. Pflogsumm misses/mis-diagnoses/mis-reports, etc. + +- Are you using a real old version of VMailer? As of pflogsumm.pl ++ Are you using a real old version of VMailer? As of pflogsumm + 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 @@ + Are you processing your log files in chronological order? See item + "5: "Processing Multiple Log Files". + +- Pflogsumm.pl is being developed by me on my rather small-scale server ++ pflogsumm is being developed by me on my rather small-scale server + 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 @@ + 11. Pflogsumm is generating lots of "uninitialized value" warnings + + Are you using a version of Perl lower than 5.004_04? Perhaps with a +- "beta" version of pflogsumm.pl? If so, try turning off the "-w" ++ "beta" version of pflogsumm? If so, try turning off the "-w" + switch. Pflogsumm as of 19990413-02beta appeared to work correctly + with Perl 5.003 in spite of the warnings. (Those warnings didn't + appear with Perl 5.004.) + + I don't guarantee that I'll remember to test future versions of +- pflogsumm.pl against 5.003, but I'll try to :-). ++ pflogsumm against 5.003, but I'll try to :-). + + You really should consider upgrading your Perl to 5.004 or later. + +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 + .SH "NAME" +-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.5 + .SH "SYNOPSIS" + .IX Header "SYNOPSIS" + .Vb 8 +-\& pflogsumm.pl \-[eq] [\-d ] [\-\-detail ] ++\& pflogsumm \-[eq] [\-d ] [\-\-detail ] + \& [\-\-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 @@ + \& [\-\-syslog\-name=string] [\-u ] [\-\-verbose\-msg\-detail] + \& [\-\-verp\-mung[=]] [\-\-zero\-fill] [file1 [filen]] + \& +-\& pflogsumm.pl \-[help|version] ++\& pflogsumm \-[help|version] + \& + \& If no file(s) specified, reads from stdin. Output is to stdout. + .Ve +@@ -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 +-\& pflogsumm.pl. This throws off "Recipients by message ++\& pflogsumm. This throws off "Recipients by message + \& size" and the total for "bytes delivered." These are + \& normally reported by pflogsumm as "Messages with no + \& size data." +@@ -386,15 +386,15 @@ + .Vb 1 + \& Produce a report of previous day\*(Aqs activities: + \& +-\& pflogsumm.pl \-d yesterday /var/log/maillog ++\& pflogsumm \-d yesterday /var/log/maillog + \& + \& A report of prior week\*(Aqs activities (after logs rotated): + \& +-\& pflogsumm.pl /var/log/maillog.0 ++\& pflogsumm /var/log/maillog.0 + \& + \& What\*(Aqs happened so far today: + \& +-\& pflogsumm.pl \-d today /var/log/maillog ++\& pflogsumm \-d today /var/log/maillog + \& + \& Crontab entry to generate a report of the previous day\*(Aqs activity + \& at 10 minutes after midnight. +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.5 + + =head1 SYNOPSIS + +- pflogsumm.pl -[eq] [-d ] [--detail ] ++ pflogsumm -[eq] [-d ] [--detail ] + [--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 @@ + [--syslog-name=string] [-u ] [--verbose-msg-detail] + [--verp-mung[=]] [--zero-fill] [file1 [filen]] + +- pflogsumm.pl -[help|version] ++ pflogsumm -[help|version] + + If no file(s) specified, reads from stdin. Output is to stdout. + +@@ -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 +- pflogsumm.pl. This throws off "Recipients by message ++ pflogsumm. This throws off "Recipients by message + size" and the total for "bytes delivered." These are + normally reported by pflogsumm as "Messages with no + size data." +@@ -255,15 +255,15 @@ + + Produce a report of previous day's activities: + +- pflogsumm.pl -d yesterday /var/log/maillog ++ pflogsumm -d yesterday /var/log/maillog + + A report of prior week's activities (after logs rotated): + +- pflogsumm.pl /var/log/maillog.0 ++ pflogsumm /var/log/maillog.0 + + What's happened so far today: + +- pflogsumm.pl -d today /var/log/maillog ++ pflogsumm -d today /var/log/maillog + + Crontab entry to generate a report of the previous day's activity + at 10 minutes after midnight. --- pflogsumm-1.1.5.orig/debian/patches/milter-rejects +++ pflogsumm-1.1.5/debian/patches/milter-rejects @@ -0,0 +1,18 @@ +Index: pflogsumm/pflogsumm.pl +=================================================================== +--- pflogsumm.orig/pflogsumm.pl ++++ pflogsumm/pflogsumm.pl +@@ -666,11 +666,11 @@ while(<>) { + + # regexp rejects happen in "cleanup" + if($cmd eq "cleanup" && (my($rejSubTyp, $rejReas, $rejRmdr) = $logRmdr =~ +- /\/cleanup\[\d+\]: .*?\b(reject|warning|hold|discard): (header|body) (.*)$/) == 3) ++ /\/cleanup\[\d+\]: .*?\b((?:milter-)reject|warning|hold|discard): (header|body|END-OF-MESSAGE) (.*)$/) == 3) + { + $rejRmdr =~ s/( from \S+?)?; from=<.*$// unless($opts{'verbMsgDetail'}); + $rejRmdr = string_trimmer($rejRmdr, 64, $opts{'verbMsgDetail'}); +- if($rejSubTyp eq "reject") { ++ if($rejSubTyp eq "reject" or $rejSubTyp eq "milter-reject") { + ++$rejects{$cmd}{$rejReas}{$rejRmdr} unless($opts{'rejectDetail'} == 0); + ++$msgsRjctd; + } elsif($rejSubTyp eq "warning") { --- pflogsumm-1.1.5.orig/debian/patches/postscreen-rejects +++ pflogsumm-1.1.5/debian/patches/postscreen-rejects @@ -0,0 +1,43 @@ +Index: pflogsumm.pl +=================================================================== +--- pflogsumm.orig/pflogsumm.pl ++++ pflogsumm/pflogsumm.pl +@@ -713,7 +713,7 @@ while(<>) { + \${$msgsPerDay{$revMsgDateStr}}[4]); + } elsif($cmd eq 'master') { + ++$masterMsgs{(split(/^.*master.*: /, $logRmdr))[1]}; +- } elsif($cmd eq 'smtpd') { ++ } elsif($cmd eq 'smtpd' || $cmd eq 'postscreen') { + if($logRmdr =~ /\[\d+\]: \w+: client=(.+?)(,|$)/) { + # + # Warning: this code in two places! +@@ -1536,14 +1536,14 @@ sub gimme_domain { + # split domain/ipaddr into separates + # newer versions of Postfix have them "dom.ain[i.p.add.ress]" + # older versions of Postfix have them "dom.ain/i.p.add.ress" +- unless((($domain, $ipAddr) = /^([^\[]+)\[((?:\d{1,3}\.){3}\d{1,3})\]/) == 2 || +- (($domain, $ipAddr) = /^([^\/]+)\/([0-9a-f.:]+)/i) == 2) { ++ unless((($domain, $ipAddr) = /^([^\[]*)\[((?:\d{1,3}\.){3}\d{1,3})\]/) == 2|| ++ (($domain, $ipAddr) = /^([^\/]*)\/([0-9a-f.:]+)/i) == 2) { + # more exhaustive method + ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/; + } + + # "mach.host.dom"/"mach.host.do.co" to "host.dom"/"host.do.co" +- if($domain eq 'unknown') { ++ if($domain eq "" || $domain eq 'unknown') { + $domain = $ipAddr; + # For identifying the host part on a Class C network (commonly + # seen with dial-ups) the following is handy. +@@ -1656,9 +1656,10 @@ sub proc_smtpd_reject { + # those--incl. stuff that'll screw up subsequent parsing. So just + # get rid of it right off. + $rejReas =~ s/^(\d{3} <).*?(>:)/$1$2/; ++ $rejReas =~ s/^(?:\d{3} \d\.\d\.\d )(Protocol error);.*$/$1/; + $rejReas =~ s/^(?:.*?[:;] )(?:\[[^\]]+\] )?([^;,]+)[;,].*$/$1/; + $rejReas =~ s/^((?:Sender|Recipient) address rejected: [^:]+):.*$/$1/; +- $rejReas =~ s/(Client host|Sender address) .+? blocked/blocked/; ++ $rejReas =~ s/(client|Client host|Sender address) .+? blocked/blocked/; + } elsif($rejTyp eq "MAIL") { # *more* special treatment :-( grrrr... + $rejReas =~ s/^\d{3} (?:<.+>: )?([^;:]+)[;:]?.*$/$1/; + } else { --- pflogsumm-1.1.5.orig/debian/patches/series +++ pflogsumm-1.1.5/debian/patches/series @@ -0,0 +1,3 @@ +kill-dot-pl +postscreen-rejects +milter-rejects --- pflogsumm-1.1.5.orig/debian/rules +++ pflogsumm-1.1.5/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +%: + dh $@ --with quilt + +override_dh_auto_install: + install --mode=755 pflogsumm.pl debian/pflogsumm/usr/sbin/pflogsumm --- pflogsumm-1.1.5.orig/debian/source/format +++ pflogsumm-1.1.5/debian/source/format @@ -0,0 +1 @@ +1.0 --- pflogsumm-1.1.5.orig/debian/watch +++ pflogsumm-1.1.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://jimsun.linxnet.com/pub/postfix_contrib/pflogsumm-([\d\.]+)\.tar\.gz