New version

Resolves: rhbz#1460474
Updated pflogsumm to 1.1.5
Fixed warnings if IPv6 addresses are in the log
  Resolves: rhbz#1384871

pflogsumm-1.1.3-datecalc.patch

@@ -1,14 +0,0 @@
-diff -up pflogsumm-1.1.3/pflogsumm.pl.datecalc pflogsumm-1.1.3/pflogsumm.pl
---- pflogsumm-1.1.3/pflogsumm.pl.datecalc	2010-03-20 21:00:42.000000000 +0100
-+++ pflogsumm-1.1.3/pflogsumm.pl	2010-06-10 15:57:27.000000000 +0200
-@@ -400,8 +400,8 @@ Copyright (C) 1998-2010 by James S. Seym
- use strict;
- use locale;
- use Getopt::Long;
--eval { require Date::Calc };
--my $hasDateCalc = $@ ? 0 : 1;
-+require Date::Calc;
-+my $hasDateCalc = 1;
- 
- my $mailqCmd = "mailq";
- my $release = "1.1.3";

pflogsumm-1.1.5-datecalc.patch

@@ -0,0 +1,15 @@
+diff --git pflogsumm-1.1.5/pflogsumm.pl pflogsumm-1.1.5/pflogsumm.pl
+index 31de5bd..36384dd 100755
+--- pflogsumm-1.1.5/pflogsumm.pl
++++ pflogsumm-1.1.5/pflogsumm.pl
+@@ -398,8 +398,8 @@ Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.5
+ use strict;
+ use locale;
+ use Getopt::Long;
+-eval { require Date::Calc };
+-my $hasDateCalc = $@ ? 0 : 1;
++require Date::Calc;
++my $hasDateCalc = 1;
+ 
+ my $mailqCmd = "mailq";
+ my $release = "1.1.5";

pflogsumm-1.1.5-ipv6-warnings-fix.patch

@@ -0,0 +1,13 @@
+diff --git pflogsumm-1.1.5/pflogsumm.pl pflogsumm-1.1.5/pflogsumm.pl
+index 36384dd..eb527d0 100755
+--- pflogsumm-1.1.5/pflogsumm.pl
++++ pflogsumm-1.1.5/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:]+)\]/) == 2 ||
+            (($domain, $ipAddr) = /^([^\/]+)\/([0-9a-f.:]+)/i) == 2) {
+ 	# more exhaustive method
+         ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/;

postfix.spec

@@ -41,7 +41,7 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 3.2.0
+Version: 3.2.1
 Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
@@ -67,12 +67,10 @@ Source5: postfix-chroot-update
 
 # Sources 50-99 are upstream [patch] contributions
 
-%define pflogsumm_ver 1.1.3
+%define pflogsumm_ver 1.1.5
 
-%if %{with pflogsumm}
 # Postfix Log Entry Summarizer: http://jimsun.linxnet.com/postfix_contrib.html
 Source53: http://jimsun.linxnet.com/downloads/pflogsumm-%{pflogsumm_ver}.tar.gz
-%endif
 
 # Sources >= 100 are config files
 
@@ -85,7 +83,9 @@ Patch1: postfix-3.2.0-config.patch
 Patch2: postfix-3.1.0-files.patch
 Patch3: postfix-3.1.0-alternatives.patch
 Patch4: postfix-3.2.0-large-fs.patch
-Patch9: pflogsumm-1.1.3-datecalc.patch
+Patch9: pflogsumm-1.1.5-datecalc.patch
+# rhbz#1384871, sent upstream
+Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -219,6 +219,7 @@ 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
 
@@ -733,6 +734,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jun 13 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.2.1-1
+- New version
+  Resolves: rhbz#1460474
+- Updated pflogsumm to 1.1.5
+- Fixed warnings if IPv6 addresses are in the log
+  Resolves: rhbz#1384871
+
 * Thu Mar  2 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.2.0-1
 - New version
   Resolves: rhbz#1427860

sources

@@ -1,2 +1,2 @@
-SHA512 (pflogsumm-1.1.3.tar.gz) = c378bbc4ec3fe6be3bca52df579ca0c92a98a53e8b3017e8b308f3359ce1216a23c754cb9775c5aaf6578a77189aae89cc39df189a39f32ff8c8997ee542a7ce
+SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
-SHA512 (postfix-3.2.0.tar.gz) = bfaa4b2125758833997b399bb2f095475924c1e51fba752e631ad73494d8764458548541d175ef8a1ed6566e9dac569f963e0651e1500aa19595f9062b8e86ce
+SHA512 (postfix-3.2.1.tar.gz) = 0deaf380719abe3e603d8a1532b7ab3aa32e77f32041d3cfbe585ef1499454731ea6e8da6ab9a4e20e3d2bd094dd6190eaad88c52bf657cb902b7799ceccb82f