diff --git a/mail/pflogsumm/Makefile b/mail/pflogsumm/Makefile index cbaedf80ef9f..d158934933cc 100644 --- a/mail/pflogsumm/Makefile +++ b/mail/pflogsumm/Makefile @@ -1,36 +1,36 @@ PORTNAME= pflogsumm PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://jimsun.LinxNet.com/downloads/ \ ftp://jimsun.LinxNet.com/pub/postfix_contrib/ MAINTAINER= flo@FreeBSD.org COMMENT= Postfix Log Entry Summarizer WWW= https://jimsun.LinxNet.com/postfix_contrib.html LICENSE= GPLv2+ RUN_DEPENDS= p5-Date-Calc>=0:devel/p5-Date-Calc USES= perl5 shebangfix -NO_BUILD= yes +SHEBANG_FILES= ${PORTNAME}.pl NO_ARCH= yes +NO_BUILD= yes -PLIST_FILES= bin/pflogsumm man/man1/pflogsumm.1.gz -SHEBANG_FILES= ${PORTNAME}.pl +PLIST_FILES= bin/pflogsumm share/man/man1/pflogsumm.1.gz PORTDOCS= README ToDo pflogsumm-faq.txt OPTIONS_DEFINE= DOCS do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/mail/pflogsumm/files/patch-pflogsumm.pl b/mail/pflogsumm/files/patch-pflogsumm.pl index 2b4e95357f95..07a5695d50ba 100644 --- a/mail/pflogsumm/files/patch-pflogsumm.pl +++ b/mail/pflogsumm/files/patch-pflogsumm.pl @@ -1,11 +1,11 @@ ---- pflogsumm.pl.orig 2020-09-06 10:15:06.176055000 +0200 -+++ pflogsumm.pl 2020-09-06 10:15:43.839326000 +0200 -@@ -1536,7 +1536,7 @@ +--- pflogsumm.pl.orig 2024-01-21 13:07:50 UTC ++++ pflogsumm.pl +@@ -1536,7 +1536,7 @@ 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 || + unless((($domain, $ipAddr) = /^([^\[]+)\[((?:\d{1,3}\.){3}\d{1,3}|[0-9a-f:]+)\]/o) == 2 || (($domain, $ipAddr) = /^([^\/]+)\/([0-9a-f.:]+)/i) == 2) { # more exhaustive method ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/;