Fixed warnings if IPv6 addresses are in the log

Resolves: rhbz#1384871
This commit is contained in:
Jaroslav Škarvada 2017-06-13 20:15:05 +02:00
parent bc2e6a28cd
commit 49c4d11a67
2 changed files with 23 additions and 3 deletions

View File

@ -0,0 +1,13 @@
diff --git pflogsumm-1.1.3/pflogsumm.pl pflogsumm-1.1.3/pflogsumm.pl
index 57c8d33..2d7020e 100755
--- pflogsumm-1.1.3/pflogsumm.pl
+++ pflogsumm-1.1.3/pflogsumm.pl
@@ -1529,7 +1529,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})\]/o) == 2 ||
+ unless((($domain, $ipAddr) = /^([^\[]+)\[((?:\d{1,3}\.){3}\d{1,3}|[0-9a-f:]+)\]/o) == 2 ||
(($domain, $ipAddr) = /^([^\/]+)\/([0-9a-f.:]+)/oi) == 2) {
# more exhaustive method
($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/o;

View File

@ -42,7 +42,7 @@
Name: postfix
Summary: Postfix Mail Transport Agent
Version: 3.1.4
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 2
Group: System Environment/Daemons
URL: http://www.postfix.org
@ -86,8 +86,10 @@ Patch2: postfix-3.1.0-files.patch
Patch3: postfix-3.1.0-alternatives.patch
Patch4: postfix-3.1.0-large-fs.patch
Patch9: pflogsumm-1.1.3-datecalc.patch
# rhbz#1384871, sent upstream
Patch10: pflogsumm-1.1.3-ipv6-warnings-fix.patch
# Upstream patch
Patch10: postfix-3.1.3-timestamps.patch
Patch11: postfix-3.1.3-timestamps.patch
# Optional patches - set the appropriate environment variables to include
# them when building the package/spec file
@ -221,9 +223,10 @@ src/global/mail_params.h
gzip -dc %{SOURCE53} | tar xf -
pushd pflogsumm-%{pflogsumm_ver}
%patch9 -p1 -b .datecalc
%patch10 -p1 -b .ipv6-warnings-fix
popd
%endif
%patch10 -p1 -b timestamps
%patch11 -p1 -b .timestamps
for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@ -736,6 +739,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Tue Jun 13 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.1.4-2
- Fixed warnings if IPv6 addresses are in the log
Resolves: rhbz#1384871
* Mon Jan 2 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.1.4-1
- New version
Resolves: rhbz#1409447