Skip to content
Permalink
Browse files

Fix matching of IPv6 addresses. Update to 1.1.5 as well.

NOTE: option naming has changed (underscores to hyphens).
  • Loading branch information
suominen committed Dec 1, 2019
1 parent d5dbb78 commit bf14e7ce68ab032541e986ca48e15159855ca00d
@@ -1,22 +1,23 @@
# $NetBSD: Makefile,v 1.21 2019/08/11 13:23:16 wiz Exp $
# $NetBSD: Makefile,v 1.22 2019/12/01 04:21:56 kim Exp $
#

DISTNAME= pflogsumm-1.1.3
PKGREVISION= 1
DISTNAME= pflogsumm-1.1.5
PKGREVISION= #
CATEGORIES= sysutils mail
MASTER_SITES= ftp://jimsun.linxnet.com/pub/postfix_contrib/
MASTER_SITES= https://jimsun.linxnet.com/downloads/

MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://jimsun.linxnet.com/postfix_contrib.html
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://jimsun.linxnet.com/postfix_contrib.html
COMMENT= Produce summaries from Postfix syslog data
LICENSE= gnu-gpl-v2

DEPENDS+= p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc

.include "../../mk/bsd.prefs.mk"

NO_CONFIGURE= yes
USE_TOOLS+= perl:run
INSTALLATION_DIRS= ${PKGMANDIR}/man1 sbin
INSTALLATION_DIRS= ${PKGMANDIR}/man1 sbin share/doc/pflogsumm

do-build:
${SED} 's;/usr/bin/perl;${PERL5};' ${WRKSRC}/pflogsumm.pl \
@@ -25,5 +26,9 @@ do-build:
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/pflogsumm ${DESTDIR}${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/pflogsumm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.for doc in ChangeLog README ToDo pflogsumm-faq.txt
${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/share/doc/pflogsumm
.endfor


.include "../../mk/bsd.pkg.mk"
@@ -1,3 +1,7 @@
@comment $NetBSD: PLIST,v 1.3 2018/01/01 22:29:58 rillig Exp $
@comment $NetBSD: PLIST,v 1.4 2019/12/01 04:21:56 kim Exp $
man/man1/pflogsumm.1
sbin/pflogsumm
share/doc/pflogsumm/ChangeLog
share/doc/pflogsumm/README
share/doc/pflogsumm/ToDo
share/doc/pflogsumm/pflogsumm-faq.txt
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.6 2019/02/03 01:56:07 scole Exp $
$NetBSD: distinfo,v 1.7 2019/12/01 04:21:56 kim Exp $

SHA1 (pflogsumm-1.1.3.tar.gz) = 86bdb3b880896e9a4991dd3ea77c4981a5c65dcb
RMD160 (pflogsumm-1.1.3.tar.gz) = be63bd79c3bde406fe9e7fcc5b241fd7b2283ddb
SHA512 (pflogsumm-1.1.3.tar.gz) = c378bbc4ec3fe6be3bca52df579ca0c92a98a53e8b3017e8b308f3359ce1216a23c754cb9775c5aaf6578a77189aae89cc39df189a39f32ff8c8997ee542a7ce
Size (pflogsumm-1.1.3.tar.gz) = 46380 bytes
SHA1 (pflogsumm-1.1.5.tar.gz) = d18daa19d725e64c2b7e6c8da458b2d563272645
RMD160 (pflogsumm-1.1.5.tar.gz) = 7ae3c7ce49861834784c3aaaa32e3adb99ef0da0
SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
Size (pflogsumm-1.1.5.tar.gz) = 47130 bytes
SHA1 (patch-pflogsumm.pl) = 7ba5a9d347d5b6ed0579c0226d6241d905b928a1
@@ -0,0 +1,15 @@
$NetBSD: patch-pflogsumm.pl,v 1.1 2019/12/01 04:21:56 kim Exp $

Fix IPv6 matching in the bracket case.

--- pflogsumm.pl.orig 2012-02-05 22:25:25.000000000 +0000
+++ pflogsumm.pl
@@ -1536,7 +1536,7 @@
# 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 ||
+ unless((($domain, $ipAddr) = /^([^\[]+)\[([0-9a-f.:]+)\]/i) == 2 ||
(($domain, $ipAddr) = /^([^\/]+)\/([0-9a-f.:]+)/i) == 2) {
# more exhaustive method
($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/;

0 comments on commit bf14e7c

Please sign in to comment.
You can’t perform that action at this time.