diff --git a/postfix-3.0.2-alternatives.patch b/postfix-3.1.0-alternatives.patch similarity index 92% rename from postfix-3.0.2-alternatives.patch rename to postfix-3.1.0-alternatives.patch index fb4cf78..ff4e6c7 100644 --- a/postfix-3.0.2-alternatives.patch +++ b/postfix-3.1.0-alternatives.patch @@ -1,8 +1,8 @@ diff --git a/conf/post-install b/conf/post-install -index d5db260..71e18cf 100644 +index 904cefa..5f1039b 100644 --- a/conf/post-install +++ b/conf/post-install -@@ -530,6 +530,17 @@ test -n "$create" && { +@@ -532,6 +532,17 @@ test -n "$create" && { case $path in no|no/*) continue;; esac diff --git a/postfix-3.0.0-files.patch b/postfix-3.1.0-files.patch similarity index 90% rename from postfix-3.0.0-files.patch rename to postfix-3.1.0-files.patch index 1a177a6..273dbbd 100644 --- a/postfix-3.0.0-files.patch +++ b/postfix-3.1.0-files.patch @@ -1,5 +1,5 @@ diff --git a/conf/postfix-files b/conf/postfix-files -index b259bca..778e13c 100644 +index a433f4f..3ecdb5b 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 b259bca..778e13c 100644 $meta_directory/master.cf.proto:f:root:-:644 $meta_directory/postfix-files.d:d:root:-:755 $meta_directory/postfix-files:f:root:-:644 -@@ -139,18 +138,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 b259bca..778e13c 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 -@@ -163,8 +157,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 b259bca..778e13c 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 -@@ -177,9 +171,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,7 +52,7 @@ index b259bca..778e13c 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 -@@ -226,7 +220,7 @@ $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 diff --git a/postfix-3.0.0-large-fs.patch b/postfix-3.1.0-large-fs.patch similarity index 92% rename from postfix-3.0.0-large-fs.patch rename to postfix-3.1.0-large-fs.patch index 2c0fef9..b122ecf 100644 --- a/postfix-3.0.0-large-fs.patch +++ b/postfix-3.1.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 497c216..8be83ea 100644 +index a33fa94..c5249da 100644 --- a/src/util/sys_defs.h +++ b/src/util/sys_defs.h -@@ -777,8 +777,8 @@ extern int initgroups(const char *, int); +@@ -778,8 +778,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 8f8a458..e2146d0 100644 --- a/postfix.spec +++ b/postfix.spec @@ -41,7 +41,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 3.0.4 +Version: 3.1.0 Release: 1%{?dist} Epoch: 2 Group: System Environment/Daemons @@ -82,9 +82,9 @@ Source101: postfix-pam.conf # Patches Patch1: postfix-3.0.0-config.patch -Patch2: postfix-3.0.0-files.patch -Patch3: postfix-3.0.2-alternatives.patch -Patch4: postfix-3.0.0-large-fs.patch +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 # Optional patches - set the appropriate environment variables to include @@ -633,6 +633,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755, root, root) %{postfix_daemon_dir}/post-install %attr(0644, root, root) %{postfix_config_dir}/postfix-files %attr(0755, root, root) %{postfix_daemon_dir}/postfix-script +%attr(0755, root, root) %{postfix_daemon_dir}/postfix-tls-script %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 @@ -731,6 +732,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Feb 25 2016 Jaroslav Škarvada - 2:3.1.0-1 +- New version + Resolves: rhbz#1311968 +- Defuzzified files, large-fs, and alternatives patches + * Mon Feb 22 2016 Jaroslav Škarvada - 2:3.0.4-1 - New version Resolves: rhbz#1310481 diff --git a/sources b/sources index c4f1a8f..386611d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5e3fb28dfb5b7f4a8b6b9bf2abde9542 pflogsumm-1.1.3.tar.gz -877365c99e1fb5d46e61da5b22df0255 postfix-3.0.4.tar.gz +b4a506fa74c69c6fb1875c0971268344 postfix-3.1.0.tar.gz