Update to 1.1.3, take maintainership and fix a warning.

ok jakob@ (old maintainer)
This commit is contained in:
giovanni 2010-04-06 09:03:34 +00:00
parent c89828902e
commit 83d4ef0d0a
3 changed files with 34 additions and 24 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.7 2008/09/17 06:49:25 jakob Exp $
# $OpenBSD: Makefile,v 1.8 2010/04/06 09:03:34 giovanni Exp $
COMMENT= Postfix log entry summarizer
DISTNAME= pflogsumm-1.1.2
DISTNAME= pflogsumm-1.1.3
CATEGORIES= mail
MASTER_SITES+= http://jimsun.linxnet.com/downloads/
HOMEPAGE= http://jimsun.linxnet.com/postfix_contrib.html
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
MAINTAINER= Giovanni Bechis <giovanni@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes

View File

@ -1,5 +1,5 @@
MD5 (pflogsumm-1.1.2.tar.gz) = xrtDNESoNWQQGqMCWcyEmw==
RMD160 (pflogsumm-1.1.2.tar.gz) = cAWaov8R7xBNuqqI97TPRqEISOc=
SHA1 (pflogsumm-1.1.2.tar.gz) = jbRWUyLVXSipH+QfGt1JXTn499Y=
SHA256 (pflogsumm-1.1.2.tar.gz) = MvQT5r9D96YvSQnMgJ95KbDA0pof5eMTHdgFQSmCfbs=
SIZE (pflogsumm-1.1.2.tar.gz) = 44865
MD5 (pflogsumm-1.1.3.tar.gz) = Xj+yjftbf0qLa5vyq96VQg==
RMD160 (pflogsumm-1.1.3.tar.gz) = vmO9ecO95Ab+nn/MWyQf17IoPds=
SHA1 (pflogsumm-1.1.3.tar.gz) = hr2zuICJbppJkd0+p3xJgaXGXcs=
SHA256 (pflogsumm-1.1.3.tar.gz) = xN8RwurvMTAl4yYRTZ3qSw8Pm5eIgKKdLs8HV3SqcUI=
SIZE (pflogsumm-1.1.3.tar.gz) = 46380

View File

@ -1,5 +1,5 @@
--- pflogsumm.pl.orig Sun Jun 29 15:46:01 2008
+++ pflogsumm.pl Fri Sep 12 19:09:05 2008
--- pflogsumm.pl.orig Sat Mar 20 21:00:42 2010
+++ pflogsumm.pl Tue Apr 6 09:04:29 2010
@@ -4,13 +4,13 @@ eval 'exec perl -S $0 "$@"'
=head1 NAME
@ -7,25 +7,25 @@
-pflogsumm.pl - Produce Postfix MTA logfile summary
+pflogsumm - Produce Postfix MTA logfile summary
Copyright (C) 1998-2007 by James S. Seymour, Release 1.1.2.
Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.3.
=head1 SYNOPSIS
- pflogsumm.pl -[eq] [-d <today|yesterday>] [-h <cnt>] [-u <cnt>]
+ pflogsumm -[eq] [-d <today|yesterday>] [-h <cnt>] [-u <cnt>]
[--verp_mung[=<n>]] [--verbose_msg_detail] [--iso_date_time]
[-m|--uucp_mung] [-i|--ignore_case] [--smtpd_stats] [--mailq]
[--problems_first] [--rej_add_from] [--no_bounce_detail]
@@ -18,7 +18,7 @@ Copyright (C) 1998-2007 by James S. Seymour, Release 1
[--no_smtpd_warnings] [--zero_fill] [--syslog_name=string]
[file1 [filen]]
- 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. Seymour, Release 1
[-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.
@@ -119,7 +119,7 @@ Copyright (C) 1998-2007 by James S. Seymour, Release 1
@@ -142,7 +142,7 @@ Copyright (C) 1998-2010 by James S. Seymour, Release 1
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
@ -34,7 +34,7 @@
size" and the total for "bytes delivered." These are
normally reported by pflogsumm as "Messages with no
size data."
@@ -216,15 +216,15 @@ Copyright (C) 1998-2007 by James S. Seymour, Release 1
@@ -257,15 +257,15 @@ Copyright (C) 1998-2010 by James S. Seymour, Release 1
Produce a report of previous day's activities:
@ -53,12 +53,22 @@
Crontab entry to generate a report of the previous day's activity
at 10 minutes after midnight.
@@ -447,7 +447,7 @@ for (0 .. 23) {
@@ -488,7 +488,7 @@ for (0 .. 23) {
$smtpdPerHr[$_] = [0,0,0];
}
-$progName = "pflogsumm.pl";
+$progName = "pflogsumm";
$usageMsg =
"usage: $progName -[eq] [-d <today|yesterday>] [-h <cnt>] [-u <cnt>]
[--verp_mung[=<n>]] [--verbose_msg_detail] [--iso_date_time]
"usage: $progName -[eq] [-d <today|yesterday>] [--detail <cnt>]
[--bounce_detail <cnt>] [--deferral_detail <cnt>]
@@ -1421,7 +1421,8 @@ sub normalize_host {
if((my @octets = ($norm1 =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/o)) == 4) {
# Dotted-quad IP address
- return(pack('C4', @octets));
+ # Fix "Character in 'C' format wrapped in pack" warning
+ return(pack('U4', @octets));
} else {
# Possibly hostname or user@dom.ain
return(join( '', map { lc $_ } reverse split /[.@]/, $norm1 ));