From 57945e6bbe545d56fd4ba5e904ce3889b8cb4cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 1 Mar 2019 11:07:39 +0100 Subject: [PATCH] New version Resolves: rhbz#1683855 --- ...3.3.3-config.patch => postfix-3.4.0-config.patch | 4 ++-- ...x-3.1.0-files.patch => postfix-3.4.0-files.patch | 10 +++++----- ...0-large-fs.patch => postfix-3.4.0-large-fs.patch | 4 ++-- postfix.spec | 13 +++++++++---- sources | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) rename postfix-3.3.3-config.patch => postfix-3.4.0-config.patch (97%) rename postfix-3.1.0-files.patch => postfix-3.4.0-files.patch (90%) rename postfix-3.2.0-large-fs.patch => postfix-3.4.0-large-fs.patch (92%) diff --git a/postfix-3.3.3-config.patch b/postfix-3.4.0-config.patch similarity index 97% rename from postfix-3.3.3-config.patch rename to postfix-3.4.0-config.patch index a785a9d..eff0f57 100644 --- a/postfix-3.3.3-config.patch +++ b/postfix-3.4.0-config.patch @@ -123,10 +123,10 @@ index 7af8bde..495e346 100644 +# +smtp_tls_security_level = may diff --git a/conf/master.cf b/conf/master.cf -index 5a75ae5..1b7e44f 100644 +index c0f2508..05c5d07 100644 --- a/conf/master.cf +++ b/conf/master.cf -@@ -97,14 +97,14 @@ scache unix - - n - 1 scache +@@ -98,14 +98,14 @@ postlog unix-dgram n - n - 1 postlogd # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe diff --git a/postfix-3.1.0-files.patch b/postfix-3.4.0-files.patch similarity index 90% rename from postfix-3.1.0-files.patch rename to postfix-3.4.0-files.patch index 273dbbd..ad73553 100644 --- a/postfix-3.1.0-files.patch +++ b/postfix-3.4.0-files.patch @@ -1,5 +1,5 @@ diff --git a/conf/postfix-files b/conf/postfix-files -index a433f4f..3ecdb5b 100644 +index 4ed9d1f..19711d2 100644 --- a/conf/postfix-files +++ b/conf/postfix-files @@ -83,7 +83,6 @@ $shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755 @@ -10,7 +10,7 @@ index a433f4f..3ecdb5b 100644 $meta_directory/master.cf.proto:f:root:-:644 $meta_directory/postfix-files.d:d:root:-:755 $meta_directory/postfix-files:f:root:-:644 -@@ -140,18 +139,13 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u +@@ -141,18 +140,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 a433f4f..3ecdb5b 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 -@@ -164,8 +158,8 @@ $config_directory/postfix-script:f:root:-:755:o +@@ -165,8 +159,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 a433f4f..3ecdb5b 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 -@@ -179,9 +173,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644 +@@ -180,9 +174,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,7 +52,7 @@ index a433f4f..3ecdb5b 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 -@@ -228,7 +222,7 @@ $manpage_directory/man8/qmqpd.8:f:root:-:644 +@@ -230,7 +224,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 diff --git a/postfix-3.2.0-large-fs.patch b/postfix-3.4.0-large-fs.patch similarity index 92% rename from postfix-3.2.0-large-fs.patch rename to postfix-3.4.0-large-fs.patch index 227d1b7..fbc55f1 100644 --- a/postfix-3.2.0-large-fs.patch +++ b/postfix-3.4.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 3f570c4..611d9cd 100644 +index a8d2571..ad07498 100644 --- a/src/util/sys_defs.h +++ b/src/util/sys_defs.h -@@ -768,8 +768,8 @@ extern int initgroups(const char *, int); +@@ -769,8 +769,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 diff --git a/postfix.spec b/postfix.spec index 3d01703..f795c8c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -47,7 +47,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.3.3 +Version: 3.4.0 Release: 1%{?dist} Epoch: 2 URL: http://www.postfix.org @@ -85,10 +85,10 @@ Source101: postfix-pam.conf # Patches -Patch1: postfix-3.3.3-config.patch -Patch2: postfix-3.1.0-files.patch +Patch1: postfix-3.4.0-config.patch +Patch2: postfix-3.4.0-files.patch Patch3: postfix-3.3.3-alternatives.patch -Patch4: postfix-3.2.0-large-fs.patch +Patch4: postfix-3.4.0-large-fs.patch Patch9: pflogsumm-1.1.5-datecalc.patch # rhbz#1384871, sent upstream Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch @@ -659,6 +659,7 @@ fi %attr(0755, root, root) %{postfix_daemon_dir}/postfix-wrapper %attr(0755, root, root) %{postfix_daemon_dir}/postmulti-script %attr(0755, root, root) %{postfix_daemon_dir}/postscreen +%attr(0755, root, root) %{postfix_daemon_dir}/postlogd %attr(0755, root, root) %{postfix_daemon_dir}/proxymap %attr(0755, root, root) %{postfix_shlib_dir}/libpostfix-*.so %{_bindir}/mailq.postfix @@ -752,6 +753,10 @@ fi %endif %changelog +* Fri Mar 1 2019 Jaroslav Škarvada - 2:3.4.0-1 +- New version + Resolves: rhbz#1683855 + * Wed Feb 27 2019 Jaroslav Škarvada - 2:3.3.3-1 - New version Resolves: rhbz#1683487 diff --git a/sources b/sources index 3a5d361..f25ce07 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (postfix-3.4.0.tar.gz) = 2afc7a4aef8768eb140b803b9e29d9270bd536d168845bfde18fc58c233d6d7293ab4ad40ab0b452c55130f7139246c752007e8d676294af3068110a9021f4e2 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d -SHA512 (postfix-3.3.3.tar.gz) = 9d04d48b5393c49c00ca62f0a24e21c9642f2b645431b66b532a559ad1b4d35c7581fec8bd1bb1a2d7b31b812b1cea3b29e0a0cbd6576bd377b2c810d27b7ec3