New version

Resolves: rhbz#1548222

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,2 +1,2 @@
-/pflogsumm-*.tar.gz
-/postfix-*.tar.gz
+pflogsumm-*.tar.gz
+postfix-*.tar.gz

gating.yaml

@@ -1,16 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_testing]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
- 
-#gating rawhide
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_stable]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

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*$/;

pflogsumm-1.1.6-syslog-name-underscore-fix.patch

@@ -1,18 +0,0 @@
-diff --git a/pflogsumm b/pflogsumm
-index cb3b8a9..35309f0 100755
---- a/pflogsumm
-+++ b/pflogsumm
-@@ -503,7 +503,12 @@ $usageMsg =
- # Accept either "_"s or "-"s in --switches
- foreach (@ARGV) {
-     last if($_ eq "--");
--    tr/_/-/ if(/^--\w/);
-+    if (/^--\w/)
-+    {
-+        my @argspl = split("=", $_, 2);
-+        $argspl[0] =~ tr/_/-/;
-+        $_ = join("=", @argspl);
-+    }
- }
- 
- # Some pre-inits for convenience

plans/all.fmf

@@ -1,6 +0,0 @@
-summary: Test plan with all Fedora tests
-discover:
-       how: fmf
-       url: https://src.fedoraproject.org/tests/postfix.git
-execute:
-       how: tmt

postfix-3.1.0-alternatives.patch

@@ -1,8 +1,8 @@
 diff --git a/conf/post-install b/conf/post-install
-index ed7c79a..c647f81 100644
+index 904cefa..5f1039b 100644
 --- a/conf/post-install
 +++ b/conf/post-install
-@@ -541,6 +541,18 @@ test -n "$create" && {
+@@ -532,6 +532,17 @@ test -n "$create" && {
  	    case $path in
  	    no|no/*) continue;;
  	    esac
@@ -15,7 +15,6 @@ index ed7c79a..c647f81 100644
 +		/usr/share/man/man1/mailq.1.gz) path=/usr/share/man/man1/mailq.postfix.1.gz ;;
 +		/usr/share/man/man1/newaliases.1.gz) path=/usr/share/man/man1/newaliases.postfix.1.gz ;;
 +		/usr/share/man/man5/aliases.5.gz) path=/usr/share/man/man5/aliases.postfix.5.gz ;;
-+		/usr/share/man/man8/smtp.8.gz) path=/usr/share/man/man8/smtp.postfix.8.gz ;;
 +		/usr/share/man/man8/smtpd.8.gz) path=/usr/share/man/man8/smtpd.postfix.8.gz ;;
 +	    esac
  	    # Pick up the flags.

postfix-3.1.0-files.patch

@@ -1,8 +1,8 @@
 diff --git a/conf/postfix-files b/conf/postfix-files
-index 5a93982..b843fec 100644
+index a433f4f..3ecdb5b 100644
 --- a/conf/postfix-files
 +++ b/conf/postfix-files
-@@ -84,7 +84,6 @@ $shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755
+@@ -83,7 +83,6 @@ $shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755
  $meta_directory/dynamicmaps.cf.d:d:root:-:755
  $meta_directory/dynamicmaps.cf:f:root:-:644
  $meta_directory/main.cf.proto:f:root:-:644
@@ -10,7 +10,7 @@ index 5a93982..b843fec 100644
  $meta_directory/master.cf.proto:f:root:-:644
  $meta_directory/postfix-files.d:d:root:-:755
  $meta_directory/postfix-files:f:root:-:644
-@@ -142,18 +141,13 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u
+@@ -140,18 +139,13 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u
  $sendmail_path:f:root:-:755
  $newaliases_path:l:$sendmail_path
  $mailq_path:l:$sendmail_path
@@ -29,7 +29,7 @@ index 5a93982..b843fec 100644
  $config_directory/main.cf:f:root:-:644:p
  $config_directory/master.cf:f:root:-:644:p
  $config_directory/pcre_table:f:root:-:644:o
-@@ -166,8 +160,8 @@ $config_directory/postfix-script:f:root:-:755:o
+@@ -164,8 +158,8 @@ $config_directory/postfix-script:f:root:-:755:o
  $config_directory/postfix-script-sgid:f:root:-:755:o
  $config_directory/postfix-script-nosgid:f:root:-:755:o
  $config_directory/post-install:f:root:-:755:o
@@ -40,7 +40,7 @@ index 5a93982..b843fec 100644
  $manpage_directory/man1/postalias.1:f:root:-:644
  $manpage_directory/man1/postcat.1:f:root:-:644
  $manpage_directory/man1/postconf.1:f:root:-:644
-@@ -181,9 +175,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644
+@@ -179,9 +173,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644
  $manpage_directory/man1/postmulti.1:f:root:-:644
  $manpage_directory/man1/postqueue.1:f:root:-:644
  $manpage_directory/man1/postsuper.1:f:root:-:644
@@ -52,13 +52,11 @@ index 5a93982..b843fec 100644
  $manpage_directory/man5/body_checks.5:f:root:-:644
  $manpage_directory/man5/bounce.5:f:root:-:644
  $manpage_directory/man5/canonical.5:f:root:-:644
-@@ -231,8 +225,8 @@ $manpage_directory/man8/qmgr.8:f:root:-:644
- $manpage_directory/man8/qmqpd.8:f:root:-:644
+@@ -228,7 +222,7 @@ $manpage_directory/man8/qmqpd.8:f:root:-:644
  $manpage_directory/man8/scache.8:f:root:-:644
  $manpage_directory/man8/showq.8:f:root:-:644
--$manpage_directory/man8/smtp.8:f:root:-:644
+ $manpage_directory/man8/smtp.8:f:root:-:644
 -$manpage_directory/man8/smtpd.8:f:root:-:644
-+$manpage_directory/man8/smtp.postfix.8:f:root:-:644
 +$manpage_directory/man8/smtpd.postfix.8:f:root:-:644
  $manpage_directory/man8/spawn.8:f:root:-:644
  $manpage_directory/man8/tlsproxy.8:f:root:-:644

postfix-3.2.0-config.patch

@@ -1,8 +1,8 @@
 diff --git a/conf/main.cf b/conf/main.cf
-index 3687c85..ae3af9e 100644
+index 7af8bde..fbe5c62 100644
 --- a/conf/main.cf
 +++ b/conf/main.cf
-@@ -136,6 +136,10 @@ mail_owner = postfix
+@@ -132,6 +132,10 @@ mail_owner = postfix
  #inet_interfaces = all
  #inet_interfaces = $myhostname
  #inet_interfaces = $myhostname, localhost
@@ -13,7 +13,7 @@ index 3687c85..ae3af9e 100644
  
  # The proxy_interfaces parameter specifies the network interface
  # addresses that this mail system receives mail on by way of a
-@@ -180,7 +184,7 @@ mail_owner = postfix
+@@ -176,7 +180,7 @@ mail_owner = postfix
  #
  # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
  #
@@ -22,7 +22,7 @@ index 3687c85..ae3af9e 100644
  #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
  #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
  #	mail.$mydomain, www.$mydomain, ftp.$mydomain
-@@ -407,7 +411,7 @@ unknown_local_recipient_reject_code = 550
+@@ -398,7 +402,7 @@ unknown_local_recipient_reject_code = 550
  # "postfix reload" to eliminate the delay.
  #
  #alias_maps = dbm:/etc/aliases
@@ -31,7 +31,7 @@ index 3687c85..ae3af9e 100644
  #alias_maps = hash:/etc/aliases, nis:mail.aliases
  #alias_maps = netinfo:/aliases
  
-@@ -418,7 +422,7 @@ unknown_local_recipient_reject_code = 550
+@@ -409,7 +413,7 @@ unknown_local_recipient_reject_code = 550
  #
  #alias_database = dbm:/etc/aliases
  #alias_database = dbm:/etc/mail/aliases
@@ -40,13 +40,11 @@ index 3687c85..ae3af9e 100644
  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
  
  # ADDRESS EXTENSIONS (e.g., user+foo)
-@@ -487,8 +491,28 @@ unknown_local_recipient_reject_code = 550
- # non-UNIX accounts with "User unknown in local recipient table".
+@@ -479,7 +483,27 @@ unknown_local_recipient_reject_code = 550
  #
  # Cyrus IMAP over LMTP. Specify ``lmtpunix      cmd="lmtpd"
--# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf.
+ # listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf.
 -#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp
-+# listen="/var/lib/imap/socket/lmtp" prefork=0'' in cyrus.conf.
 +#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
 +
 +# If using the cyrus-imapd IMAP server deliver local mail to the IMAP
@@ -71,7 +69,7 @@ index 3687c85..ae3af9e 100644
  #
  # Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and
  # subsequent line in master.cf.
-@@ -508,8 +532,7 @@ unknown_local_recipient_reject_code = 550
+@@ -499,8 +523,7 @@ unknown_local_recipient_reject_code = 550
  # the main.cf file, otherwise the SMTP server will reject mail for    
  # non-UNIX accounts with "User unknown in local recipient table".
  #
@@ -81,61 +79,21 @@ index 3687c85..ae3af9e 100644
  #fallback_transport =
  
  # The luser_relay parameter specifies an optional destination address
-@@ -682,6 +705,43 @@ sample_directory =
+@@ -673,4 +696,3 @@ sample_directory =
  # readme_directory: The location of the Postfix README files.
  #
  readme_directory =
 -inet_protocols = ipv4
- shlib_directory = /usr/lib/postfix/${mail_version}
- meta_directory = /etc/postfix
-+
-+# TLS CONFIGURATION
-+#
-+# Basic Postfix TLS configuration by default with self-signed certificate
-+# for inbound SMTP and also opportunistic TLS for outbound SMTP.
-+
-+# The full pathname of a file with the Postfix SMTP server RSA certificate
-+# in PEM format. Intermediate certificates should be included in general,
-+# the server certificate first, then the issuing CA(s) (bottom-up order).
-+#
-+smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
-+
-+# The full pathname of a file with the Postfix SMTP server RSA private key
-+# in PEM format. The private key must be accessible without a pass-phrase,
-+# i.e. it must not be encrypted.
-+#
-+smtpd_tls_key_file = /etc/pki/tls/private/postfix.key
-+
-+# Announce STARTTLS support to remote SMTP clients, but do not require that
-+# clients use TLS encryption (opportunistic TLS inbound).
-+#
-+smtpd_tls_security_level = may
-+
-+# Directory with PEM format Certification Authority certificates that the
-+# Postfix SMTP client uses to verify a remote SMTP server certificate.
-+#
-+smtp_tls_CApath = /etc/pki/tls/certs
-+
-+# The full pathname of a file containing CA certificates of root CAs
-+# trusted to sign either remote SMTP server certificates or intermediate CA
-+# certificates.
-+#
-+smtp_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
-+
-+# Use TLS if this is supported by the remote SMTP server, otherwise use
-+# plaintext (opportunistic TLS outbound).
-+#
-+smtp_tls_security_level = may
 diff --git a/conf/master.cf b/conf/master.cf
-index 5abe06c..81ae929 100644
+index b67ed59..a9633ba 100644
 --- a/conf/master.cf
 +++ b/conf/master.cf
-@@ -116,14 +116,14 @@ postlog   unix-dgram n  -       n       -       1       postlogd
+@@ -96,14 +96,14 @@ scache    unix  -       -       n       -       1       scache
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe
--#  flags=DRX user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
-+#  flags=DRX user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
+-#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
++#  user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
  #
  # ====================================================================
  #

postfix-3.2.0-large-fs.patch

@@ -21,10 +21,10 @@ index 50a4aa7..beef3db 100644
      if (msg_verbose)
  	msg_info("%s: %s: block size %lu, blocks free %lu",
 diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
-index 1fb449d..bcaac27 100644
+index 3f570c4..611d9cd 100644
 --- a/src/util/sys_defs.h
 +++ b/src/util/sys_defs.h
-@@ -783,8 +783,8 @@ extern int initgroups(const char *, int);
+@@ -768,8 +768,8 @@ extern int initgroups(const char *, int);
  #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
  #define FIONREAD_IN_TERMIOS_H

postfix-3.4.4-chroot-example-fix.patch

@@ -1,35 +0,0 @@
---- a/examples/chroot-setup/LINUX2	2006-01-01 15:53:58.000000000 -0800
-+++ b/examples/chroot-setup/LINUX2	2016-11-27 00:45:52.145301784 -0800
-@@ -45,14 +45,14 @@
- # 20060101 /lib64 support by Keith Owens.
- #
- 
--CP="cp -p"
-+CP="cp -p -Z"
- 
- cond_copy() {
-   # find files as per pattern in $1
-   # if any, copy to directory $2
-   dir=`dirname "$1"`
-   pat=`basename "$1"`
--  lr=`find "$dir" -maxdepth 1 -name "$pat"`
-+  lr=`find "$dir/" -maxdepth 1 -name "$pat"`
-   if test ! -d "$2" ; then exit 1 ; fi
-   if test "x$lr" != "x" ; then $CP $1 "$2" ; fi
- } 
-@@ -63,8 +63,8 @@
- POSTFIX_DIR=${POSTFIX_DIR-/var/spool/postfix}
- cd ${POSTFIX_DIR}
- 
--mkdir -p etc lib usr/lib/zoneinfo
--test -d /lib64 && mkdir -p lib64
-+mkdir -p -Z etc lib usr/lib/zoneinfo
-+test -d /lib64 && mkdir -p -Z lib64
- 
- # find localtime (SuSE 5.3 does not have /etc/localtime)
- lt=/etc/localtime
-@@ -88,4 +88,3 @@
-   cond_copy '/lib64/libdb.so*' lib64
- fi
- 
--postfix reload

postfix-etc-init.d-postfix

@@ -51,20 +51,15 @@ conf_check() {
 }
 
 make_aliasesdb() {
-	local MAP=""
-	local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
-	[ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
-	[ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
-
-	if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
+	if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
 	then
-		# /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
+		# /etc/aliases.db may be used by other MTA, make sure nothing
 		# has touched it since our last newaliases call
-		[ /etc/aliases -nt /etc/aliases.$MAP ] ||
-			[ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
-			[ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return
+		[ /etc/aliases -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return
 		/usr/bin/newaliases
-		touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
+		touch -r /etc/aliases.db "$ALIASESDB_STAMP"
 	else
 		/usr/bin/newaliases
 	fi

postfix.aliasesdb

@@ -3,20 +3,15 @@
 ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
 
 make_aliasesdb() {
-        local MAP=""
-        local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
-        [ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
-        [ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
-
-        if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
+        if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
         then
-                # /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
+                # /etc/aliases.db may be used by other MTA, make sure nothing
                 # has touched it since our last newaliases call
-                [ /etc/aliases -nt /etc/aliases.$MAP ] ||
-                        [ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
-                        [ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return 0
+                [ /etc/aliases -nt /etc/aliases.db ] ||
+                        [ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
+                        [ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return 0
                 /usr/bin/newaliases
-                touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
+                touch -r /etc/aliases.db "$ALIASESDB_STAMP"
         else
                 /usr/bin/newaliases
         fi

postfix.service

@@ -11,7 +11,6 @@ PrivateTmp=true
 CapabilityBoundingSet=~ CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE
 ProtectSystem=true
 PrivateDevices=true
-ExecStartPre=-/usr/sbin/restorecon -R /var/spool/postfix/pid
 ExecStartPre=-/usr/libexec/postfix/aliasesdb
 ExecStartPre=-/usr/libexec/postfix/chroot-update
 ExecStart=/usr/sbin/postfix start

postfix.sysusers

@@ -1,3 +0,0 @@
-u postfix 89 - /var/spool/postfix /sbin/nologin
-g postdrop 90
-m postfix mail

sources

@@ -1,2 +1,2 @@
-SHA512 (pflogsumm-1.1.6.tar.gz) = 4581d2120bc17cfb322fda8d293989a2754eb9fa2696e3a1cea9032e85ed6a566e75aea1f628a6c7bbc7b9d6bf47ffeb873f95d71d7cb7f0ee46e27e492cf630
-SHA512 (postfix-3.10.7.tar.gz) = 28d7c05bfd6fb15f906c67cca989c4b47640ec631b640943deb66d91e44a6684deb79af95f0d4ba4dd362d9ba59179e5ed268942384e5e35ba472c91cf366e4c
+SHA512 (postfix-3.2.6.tar.gz) = 081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
+SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d