commit postfix for openSUSE:Factory

26 Jun 2014

Hello community,

here is the log from the commit of package postfix for openSUSE:Factory checked in at 2014-06-26 08:00:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/postfix (Old)
 and      /work/SRC/openSUSE:Factory/.postfix.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "postfix"

Changes:
--------

--- /work/SRC/openSUSE:Factory/postfix/postfix.changes	2014-02-17 13:04:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes	2014-06-26 08:00:36.000000000 +0200
@@ -1,0 +2,34 @@
+Mon Jun 23 21:41:23 UTC 2014 - jamesp@vicidial.com
+
+- The included postfix-mysql.tar.bz2 was using a MySQL 4.1 style of
+  table engine specification. Modified so that the sql uses
+  'ENGINE=' instead of 'TYPE=' for creating tables.
+
+-------------------------------------------------------------------
+Mon Jun 23 15:17:52 UTC 2014 - varkoly@suse.com
+
+- bnc#816769 - config.postfix issues warnings about missing master.cf 
+
+-------------------------------------------------------------------
+Tue Jun 10 13:34:03 UTC 2014 - varkoly@suse.com
+
+- bnc#882033 - Package postfix has changed files according to rpm
+- bnc#855688 - possible systemd bug: postfix & cifs dependency confict
+
+-------------------------------------------------------------------
+Mon Jun  9 12:17:35 UTC 2014 - varkoly@suse.com
+
+- bnc#863350 - SuSEconfig.postfix complains about modified /etc/postfix/main.cf after updating postfix 
+
+-------------------------------------------------------------------
+Mon May 26 17:21:54 UTC 2014 - chris@computersalat.de
+
+- replace vda patch:
+  * add postfix-vda-v13-2.10.0.patch
+  * remove postfix-vda-v11-2.9.6.patch
+- rebase patches
+- config.postfix
+  * add master.cf support for submission (587)
+  * rework master.cf support for smtps
+
+-------------------------------------------------------------------

Old:
----
  postfix-vda-v11-2.9.6.patch

New:
----
  postfix-vda-v13-2.10.0.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ postfix.spec ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:38.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:38.000000000 +0200
@@ -31,7 +31,7 @@
 Source4:        %{name}.keyring
 Source10:       rpmlintrc
 Source11:       check_mail_queue
-Patch:          dynamic_maps.patch
+Patch0:         dynamic_maps.patch
 Patch1:         dynamic_maps_pie.patch
 Patch2:         pointer_to_literals.patch
 Patch3:         ipv6_disabled.patch
@@ -40,7 +40,7 @@
 Patch12:        %{name}-post-install.patch
 Patch20:        %{name}-ssl-release-buffers.patch
 Patch21:        postfix-opensslconfig.patch
-Patch100:       %{name}-vda-v11-2.9.6.patch
+Patch100:       %{name}-vda-v13-2.10.0.patch
 Patch101:       postfix-db6.diff
 #PATCH-FIX-SLE PATCH-FIX-OPENSUSE to be able to build the agent tls_proxy
 Patch102:       add_missed_library.patch
@@ -158,7 +158,7 @@
 %prep
 %{?gpg_verify: %gpg_verify %{S:1}}
 %setup -q -a 2 -a 3
-%patch   -p1
+%patch0 -p1
 %patch1  -p1
 %patch2  -p1
 %patch3
@@ -166,10 +166,10 @@
 %patch11
 %patch12
 %patch20
-%patch21 -p1
+%patch21
 %patch100 -p1
-%patch -P 101 -p1
-%patch102 -p0
+%patch101
+%patch102
 # ---------------------------------------------------------------------------
 
 %build
@@ -415,10 +415,33 @@
 %post
 # We never have to run suseconfig for postfix after installation
 # We only start postfix own upgrade-configuration by update
-/usr/sbin/postfix set-permissions || :
 if [ ${1:-0} -gt 1 ]; then
 	touch /var/adm/postfix.configured
-	/usr/sbin/postfix upgrade-configuration || :
+        # Check if main.cf and master.cf was changed manualy
+        MAINCH=0
+        if [ -e /var/adm/SuSEconfig/md5/etc/postfix/main.cf ]; then
+                MD5SUM1=$( cat /var/adm/SuSEconfig/md5/etc/postfix/main.cf )
+                MD5SUM2=$( grep -v "^#" /etc/postfix/main.cf | md5sum )
+                if [ "$MD5SUM1" != "$MD5SUM2" ]; then
+                   MAINCH=1
+                fi
+        fi
+        MASTERCH=0
+        if [ -e /var/adm/SuSEconfig/md5/etc/postfix/master.cf ]; then
+                MD5SUM1=$( cat /var/adm/SuSEconfig/md5/etc/postfix/master.cf )
+                MD5SUM2=$( grep -v "^#" /etc/postfix/master.cf | md5sum )
+                if [ "$MD5SUM1" != "$MD5SUM2" ]; then
+                   MASTERCH=1
+                fi
+        fi
+        echo "Executing upgrade-configuration."
+        /usr/sbin/postfix set-permissions upgrade-configuration setgid_group=%{pf_setgid_group}
+        if [ $MASTERCH -eq 0 ]; then
+           test -e /var/adm/SuSEconfig/md5/etc/postfix/master.cf && grep -v "^#" /etc/postfix/master.cf | md5sum > /var/adm/SuSEconfig/md5/etc/postfix/master.cf
+        fi
+        if [ $MAINCH -eq 0 ]; then
+           test -e /var/adm/SuSEconfig/md5/etc/postfix/main.cf && grep -v "^#" /etc/postfix/main.cf | md5sum > /var/adm/SuSEconfig/md5/etc/postfix/main.cf
+        fi
 fi
 %{fillup_and_insserv -y postfix}
 %{fillup_only -an mail}
@@ -522,7 +545,7 @@
 %{conf_backup_dir}
 %dir %attr(0700,%{name},root) %{pf_data_directory}
 %{_mandir}/man?/*.gz
-%dir %attr(0755,%{name},root) /%{pf_queue_directory}
+%dir %attr(0755,root,root) /%{pf_queue_directory}
 %dir %attr(0700,%{name},root) /%{pf_queue_directory}/active
 %dir %attr(0700,%{name},root) /%{pf_queue_directory}/bounce
 %dir %attr(0700,%{name},root) /%{pf_queue_directory}/corrupt

++++++ add_missed_library.patch ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:38.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:38.000000000 +0200
@@ -1,6 +1,8 @@
---- src/tlsproxy/Makefile.in.orig	2014-02-12 15:41:35.614464191 +0100
-+++ src/tlsproxy/Makefile.in	2014-02-12 15:42:14.445752897 +0100
-@@ -9,7 +9,7 @@
+Index: src/tlsproxy/Makefile.in
+===================================================================
+--- src/tlsproxy/Makefile.in.orig
++++ src/tlsproxy/Makefile.in
+@@ -9,7 +9,7 @@ TESTPROG=
  PROG	= tlsproxy
  INC_DIR = ../../include
  LIBS	= ../../lib/libtls.a ../../lib/libmaster.a ../../lib/libglobal.a \
@@ -9,4 +11,3 @@
  
  .c.o:;	$(CC) $(CFLAGS) -c $*.c
  
-

++++++ ipv6_disabled.patch ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:39.000000000 +0200
@@ -1,5 +1,7 @@
---- src/util/inet_proto.c.orig	2012-01-03 01:57:59.000000000 +0100
-+++ src/util/inet_proto.c	2012-11-15 13:39:22.000000000 +0100
+Index: src/util/inet_proto.c
+===================================================================
+--- src/util/inet_proto.c.orig
++++ src/util/inet_proto.c
 @@ -195,7 +195,6 @@ INET_PROTO_INFO *inet_proto_init(const c
  	if ((sock = socket(PF_INET6, SOCK_STREAM, 0)) >= 0) {
  	    close(sock);


++++++ postfix-SuSE.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/config.postfix new/postfix-SuSE/config.postfix
--- old/postfix-SuSE/config.postfix	2014-02-12 16:09:42.000000000 +0100
+++ new/postfix-SuSE/config.postfix	2014-06-23 17:17:27.000000000 +0200
@@ -256,7 +256,7 @@
        warn_user "Can't create temp directory, exiting..."
        exit 1
     fi
-    cp -f /etc/postfix/main.cf $TMPDIR/main.cf
+    cp -f /etc/postfix/{main,master}.cf $TMPDIR
 
     # Some default settings, that seem to be useable, at least to me
     $PCONF -e "mail_spool_directory = /var/mail"
@@ -808,6 +808,7 @@
     export POSTFIX_CHROOT
     export POSTFIX_NULLCLIENT
     export USE_AMAVIS
+    export POSTFIX_SMTP_AUTH_SERVER
     export POSTFIX_SMTP_TLS_SERVER
     export POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT
     export POSTFIX_SMTP_TLS_CLIENT
@@ -831,6 +832,8 @@
     defined $ENV{POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT} ? $ENV{POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT} : "no";
 my $tlsclient = 
     defined $ENV{POSTFIX_SMTP_TLS_CLIENT} ? $ENV{POSTFIX_SMTP_TLS_CLIENT} : "no";
+my $authserver = 
+    defined $ENV{POSTFIX_SMTP_AUTH_SERVER} ? $ENV{POSTFIX_SMTP_AUTH_SERVER} : "no";
 my $normalize = {};
 
 
@@ -840,13 +843,14 @@
 $use_amavis = lc($use_amavis);
 $tlsserver = lc($tlsserver);
 $tlsclient = lc($tlsclient);
+$authserver = lc($authserver);
 
 open(MCF,"<$mcf") || die "unable to open $mcf: $!";
 
 while( <MCF> ) {
     chomp;
 
-    if( /\#?\s*(smtp\s+inet.*?smtpd)/ ) {
+    if( /^\#?\s*(smtp\s+inet.*?smtpd)/ ) {
 	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
 	if ($nullclient eq "yes") {
 	    $line = "#".$1;
@@ -860,57 +864,143 @@
 	    $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/;
 	    $line = $1."-".$2;
 	}
-    } elsif( /\#?\s*(amavis\s+unix.*)/ ) {
+    ## amavis
+    } elsif( /^\#?\s*(amavis\s+unix.*)/ ) {
 	if ($use_amavis ne "yes") {
 	    $line = "#".$1;
 	} else {
 	    $line = $1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtp_data_done_timeout=.*)/ ) {
+    } elsif ( /^\#?\s\s(-o\s+smtp_data_done_timeout=.*)/ ) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtp_send_xforward_command=.*)/ ) {
+    } elsif ( /^\#?\s\s(-o\s+smtp_send_xforward_command=.*)/ ) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+disable_dns_lookups=.*)/ ) {
+    } elsif ( /^\#?\s\s(-o\s+disable_dns_lookups=.*)/ ) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+max_use=.*)/ ) {
+    } elsif ( /^\#?\s\s(-o\s+max_use=.*)/ ) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif( /\#?\s*(local\s+unix.*)/ ) {
+    ## end amavis
+    } elsif( /^\#?\s*(local\s+unix.*)/ ) {
 	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
 	if ($nullclient eq "yes") {
 	    $line = "#".$1;
 	} else {
 	    $line = $1;
 	}
-    } elsif( /\#?\s*(localhost:10025\s+inet.*)/ ) {
+    ## submission
+    } elsif( /^\#?\s*(submission\s+inet.*?smtpd)/ ) {
+	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
+	if ( $tlsserver ne "yes" ) {
+	     $line = "#".$1;
+	} else {
+	     $line = $1;
+	}
+	if ( $use_amavis eq "yes" ) {
+	     $line =~ /(^\#?\s*submission\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/;
+	     $line = $1."10".$2;
+	} else {
+	     $line =~ /(^\#?\s*submission\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/;
+	     $line = $1."-".$2;
+	}
+    } elsif( /^\#?\s{3}(-o\s+syslog_name=.*)/ ) {
+	if ( $tlsserver ne "yes" ) {
+	     $line = "#   ".$1;
+	} else {
+	     $line = "   ".$1;
+	}
+    } elsif( /^\#?\s{3}(-o\s+smtpd_tls_security_level=.*)/ ) {
+	if ( $tlsserver ne "yes" ) {
+	     $line = "#   ".$1;
+	} else {
+	     $line = "   ".$1;
+	}
+    } elsif( /^\#?\s{3}(-o\s+smtpd_sasl_auth_enable=.*)/ ) {
+	if ( $tlsserver ne "yes" && $authserver ne "yes") {
+	     $line = "#   ".$1;
+	} else {
+	     $line = "   ".$1;
+	}
+    ## end submission
+    ## smtps
+    } elsif( /^\#?\s*(smtps\s+inet.*?smtpd)/ ) {
+	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
+	if ( $sslserver ne "yes" ) {
+	     $line = "#".$1;
+	} else {
+	     $line = $1;
+	}
+	if ( $use_amavis eq "yes" ) {
+	     $line =~ /(^\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/;
+	     $line = $1."10".$2;
+	} else {
+	     $line =~ /(^\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/;
+	     $line = $1."-".$2;
+	}
+    } elsif( /^\#?\s{4}(-o\s+syslog_name=.*)/ ) {
+	if ( $sslserver ne "yes" ) {
+	     $line = "#    ".$1;
+	} else {
+	     $line = "    ".$1;
+	}
+    } elsif( /^\#?\s{4}(-o\s+smtpd_tls_wrappermode=.*)/ ) {
+	if ( $sslserver ne "yes" ) {
+	     $line = "#    ".$1;
+	} else {
+	     $line = "    ".$1;
+	}
+    } elsif( /^\#?\s{4}(-o\s+content_filter=.*)/ ) {
+	if ( $sslserver ne "yes" && $use_amavis ne "yes" ) {
+	     $line = "#    ".$1;
+	} else {
+	     $line = "    ".$1;
+	}
+    } elsif( /^\#?\s{4}(-o\s+smtpd_sasl_auth_enable=.*)/ ) {
+	if ( $sslserver ne "yes" && $authserver ne "yes") {
+	     $line = "#    ".$1;
+	} else {
+	     $line = "    ".$1;
+	}
+    ## end smtps
+    ## tlsmgr
+    } elsif( /^\#?\s*(tlsmgr\s+unix.*)/ ) {
+	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
+	if ( $tlsclient ne "yes" && $tlsserver ne "yes" && $sslserver ne "yes" ) {
+	    $line = "#".$1;
+	} else {
+	    $line = $1;
+	}
+    ## end tlsmgr
+    ## localhost_10025 
+    } elsif( /^\#?\s*(localhost:10025\s+inet.*)/ ) {
 	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#".$1;
 	} else {
 	    $line = $1;
 	}
-    } elsif ( /\#?\s\s(-o\s+content_filter=.*)/ ) {
+    } elsif ( /^\#?\s\s(-o\s+content_filter=.*)/ ) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_delay_reject=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_delay_reject=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
@@ -928,79 +1018,79 @@
 	    $line = "  ".$1.$2;
 	  }
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_helo_restrictions=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_helo_restrictions=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_sender_restrictions=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_sender_restrictions=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_recipient_restrictions=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_recipient_restrictions=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-   } elsif ( /\#?\s\s(-o\s+smtpd_data_restrictions=.*)/) {
+   } elsif ( /^\#?\s\s(-o\s+smtpd_data_restrictions=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_end_of_data_restrictions=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_end_of_data_restrictions=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_restriction_classes=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_restriction_classes=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+mynetworks=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+mynetworks=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_error_sleep_time=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_error_sleep_time=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_soft_error_limit=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_soft_error_limit=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_hard_error_limit=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_hard_error_limit=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_client_connection_count_limit=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_client_connection_count_limit=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+smtpd_client_connection_rate_limit=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+smtpd_client_connection_rate_limit=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+receive_override_options=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+receive_override_options=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
@@ -1010,45 +1100,25 @@
 	      $line = "  -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings";
 	    }
 	}
-     } elsif ( /\#?\s\s(-o\s+local_header_rewrite_clients=.*)/) {
+     } elsif ( /^\#?\s\s(-o\s+local_header_rewrite_clients=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-     } elsif ( /\#?\s\s(-o\s+local_recipient_maps=.*)/) {
+     } elsif ( /^\#?\s\s(-o\s+local_recipient_maps=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif ( /\#?\s\s(-o\s+relay_recipient_maps=.*)/) {
+    } elsif ( /^\#?\s\s(-o\s+relay_recipient_maps=.*)/) {
 	if ( $use_amavis ne "yes" ) {
 	    $line = "#  ".$1;
 	} else {
 	    $line = "  ".$1;
 	}
-    } elsif( /\#?\s*(tlsmgr\s+unix.*)/ ) {
-	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
-	if ( $tlsclient ne "yes" && $tlsserver ne "yes" && $sslserver ne "yes" ) {
-	    $line = "#".$1;
-	} else {
-	    $line = $1;
-	}
-    } elsif( /\#?\s*(smtps\s+inet.*?smtpd)/ ) {
-	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
-	if ( $sslserver ne "yes" ) {
-	     $line = "#".$1." -o smtpd_tls_wrappermode=yes";
-	} else {
-	     $line = $1." -o smtpd_tls_wrappermode=yes";
-	}
-	if ( $use_amavis eq "yes" ) {
-	     $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/;
-	     $line = $1."10".$2." -o content_filter=smtp:[127.0.0.1]:10024";
-	} else {
-	     $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/;
-	     $line = $1."-".$2;
-	}
+    ## end localhost_10025 
     } elsif( /^(\#?\s*(?:pickup|qmgr)\s+)(?:fifo|unix)(\s+.*)/ ) {
 	if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; }
 	if ( $laptop eq "yes" ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/postfix.service new/postfix-SuSE/postfix.service
--- old/postfix-SuSE/postfix.service	2013-10-03 04:44:47.000000000 +0200
+++ new/postfix-SuSE/postfix.service	2014-06-10 15:44:27.000000000 +0200
@@ -14,8 +14,8 @@
 
 [Unit]
 Description=Postfix Mail Transport Agent
-Requires=var-run.mount nss-lookup.target network.target remote-fs.target time-sync.target
-After=var-run.mount nss-lookup.target network.target remote-fs.target time-sync.target
+Requires=var-run.mount nss-lookup.target network.target local-fs.target time-sync.target
+After=var-run.mount nss-lookup.target network.target local-fs.target time-sync.target
 After=amavis.service mysql.service cyrus.service ldap.service openslp.service ypbind.service
 Conflicts=sendmail.service exim.service
 

++++++ postfix-db6.diff ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:39.000000000 +0200
@@ -8,10 +8,10 @@
  src/util/dict_db.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: postfix-2.9.6/src/util/dict_db.c
+Index: src/util/dict_db.c
 ===================================================================
---- postfix-2.9.6.orig/src/util/dict_db.c
-+++ postfix-2.9.6/src/util/dict_db.c
+--- src/util/dict_db.c.orig
++++ src/util/dict_db.c
 @@ -699,7 +699,7 @@ static DICT *dict_db_open(const char *cl
         if ((errno = db->upgrade(db,db_path,0)) != 0)
             msg_fatal("upgrade of database %s: %m",db_path);

++++++ postfix-master.cf.patch ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:39.000000000 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- conf/master.cf.orig
 +++ conf/master.cf
-@@ -9,6 +9,11 @@
+@@ -10,32 +10,38 @@
  #               (yes)   (yes)   (yes)   (never) (100)
  # ==========================================================================
  smtp      inet  n       -       n       -       -       smtpd
@@ -14,7 +14,54 @@
  #smtp      inet  n       -       n       -       1       postscreen
  #smtpd     pass  -       -       n       -       -       smtpd
  #dnsblog   unix  -       -       n       -       0       dnsblog
-@@ -50,6 +55,26 @@ local     unix  -       n       n
+ #tlsproxy  unix  -       -       n       -       0       tlsproxy
+ #submission inet n       -       n       -       -       smtpd
+-#  -o syslog_name=postfix/submission
+-#  -o smtpd_tls_security_level=encrypt
+-#  -o smtpd_sasl_auth_enable=yes
+-#  -o smtpd_reject_unlisted_recipient=no
+-#  -o smtpd_client_restrictions=$mua_client_restrictions
+-#  -o smtpd_helo_restrictions=$mua_helo_restrictions
+-#  -o smtpd_sender_restrictions=$mua_sender_restrictions
+-#  -o smtpd_recipient_restrictions=
+-#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+-#  -o milter_macro_daemon_name=ORIGINATING
++#   -o syslog_name=postfix/submission
++#   -o smtpd_tls_security_level=encrypt
++#   -o smtpd_sasl_auth_enable=yes
++#   -o smtpd_reject_unlisted_recipient=no
++#   -o smtpd_client_restrictions=$mua_client_restrictions
++#   -o smtpd_helo_restrictions=$mua_helo_restrictions
++#   -o smtpd_sender_restrictions=$mua_sender_restrictions
++#   -o smtpd_recipient_restrictions=
++#   -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
++#   -o milter_macro_daemon_name=ORIGINATING
+ #smtps     inet  n       -       n       -       -       smtpd
+-#  -o syslog_name=postfix/smtps
+-#  -o smtpd_tls_wrappermode=yes
+-#  -o smtpd_sasl_auth_enable=yes
+-#  -o smtpd_reject_unlisted_recipient=no
+-#  -o smtpd_client_restrictions=$mua_client_restrictions
+-#  -o smtpd_helo_restrictions=$mua_helo_restrictions
+-#  -o smtpd_sender_restrictions=$mua_sender_restrictions
+-#  -o smtpd_recipient_restrictions=
+-#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+-#  -o milter_macro_daemon_name=ORIGINATING
++#    -o syslog_name=postfix/smtps
++#    -o smtpd_tls_wrappermode=yes
++#    -o content_filter=smtp:[127.0.0.1]:10024
++#    -o smtpd_sasl_auth_enable=yes
++#    -o smtpd_reject_unlisted_recipient=no
++#    -o smtpd_client_restrictions=$mua_client_restrictions
++#    -o smtpd_helo_restrictions=$mua_helo_restrictions
++#    -o smtpd_sender_restrictions=$mua_sender_restrictions
++#    -o smtpd_recipient_restrictions=
++#    -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
++#    -o milter_macro_daemon_name=ORIGINATING
+ #628       inet  n       -       n       -       -       qmqpd
+ pickup    unix  n       -       n       60      1       pickup
+ cleanup   unix  n       -       n       -       0       cleanup
+@@ -61,6 +67,26 @@ local     unix  -       n       n
  virtual   unix  -       n       n       -       -       virtual
  lmtp      unix  -       -       n       -       -       lmtp
  anvil     unix  -       -       n       -       1       anvil
@@ -41,7 +88,7 @@
  scache    unix  -       -       n       -       1       scache
  #
  # ====================================================================
-@@ -84,7 +109,7 @@ scache    unix  -       -       n
+@@ -95,7 +121,7 @@ scache    unix  -       -       n
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe
@@ -50,7 +97,7 @@
  #
  # ====================================================================
  #
-@@ -117,3 +142,7 @@ scache    unix  -       -       n
+@@ -128,3 +154,7 @@ scache    unix  -       -       n
  #mailman   unix  -       n       n       -       -       pipe
  #  flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
  #  ${nexthop} ${user}

++++++ postfix-mysql.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-mysql/postfix-mysql.sql new/postfix-mysql/postfix-mysql.sql
--- old/postfix-mysql/postfix-mysql.sql	2006-05-05 23:39:44.000000000 +0200
+++ new/postfix-mysql/postfix-mysql.sql	2014-06-23 23:37:56.000000000 +0200
@@ -17,7 +17,7 @@
   active tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (username),
   KEY username (username)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Admins';
+) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Admins';
 
 --
 -- Dumping data for table `admin`
@@ -42,7 +42,7 @@
   modified datetime NOT NULL default '0000-00-00 00:00:00',
   active tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (address)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Aliases';
+) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Aliases';
 
 --
 -- Dumping data for table `alias`
@@ -71,7 +71,7 @@
   modified datetime NOT NULL default '0000-00-00 00:00:00',
   active tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (domain)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Domains';
+) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Domains';
 
 --
 -- Dumping data for table `domain`
@@ -94,7 +94,7 @@
   created datetime NOT NULL default '0000-00-00 00:00:00',
   active tinyint(1) NOT NULL default '1',
   KEY username (username)
-) TYPE=MyISAM COMMENT='Postfix Admin - Domain Admins';
+) ENGINE=MyISAM COMMENT='Postfix Admin - Domain Admins';
 
 --
 -- Dumping data for table `domain_admins`
@@ -118,7 +118,7 @@
   action varchar(255) NOT NULL default '',
   data varchar(255) NOT NULL default '',
   KEY timestamp (timestamp)
-) TYPE=MyISAM COMMENT='Postfix Admin - Log';
+) ENGINE=MyISAM COMMENT='Postfix Admin - Log';
 
 --
 -- Dumping data for table `log`
@@ -146,7 +146,7 @@
   modified datetime NOT NULL default '0000-00-00 00:00:00',
   active tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (username)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes';
+) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes';
 
 --
 -- Dumping data for table `mailbox`
@@ -173,7 +173,7 @@
   active tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (email),
   KEY email (email)
-) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation';
+) ENGINE=MyISAM COMMENT='Postfix Admin - Virtual Vacation';
 
 --
 -- Dumping data for table `vacation`

++++++ postfix-opensslconfig.patch ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:39.000000000 +0200
@@ -1,6 +1,8 @@
---- postfix-2.9.6.orig/src/tls/tls_server.c
-+++ postfix-2.9.6/src/tls/tls_server.c
-@@ -317,6 +317,7 @@ TLS_APPL_STATE *tls_server_init(const TL
+Index: src/tls/tls_server.c
+===================================================================
+--- src/tls/tls_server.c.orig
++++ src/tls/tls_server.c
+@@ -364,6 +364,7 @@ TLS_APPL_STATE *tls_server_init(const TL
       */
      SSL_load_error_strings();
      OpenSSL_add_ssl_algorithms();
@@ -8,9 +10,11 @@
  
      /*
       * First validate the protocols. If these are invalid, we can't continue.
---- postfix-2.9.6.orig/src/tls/tls_client.c
-+++ postfix-2.9.6/src/tls/tls_client.c
-@@ -323,6 +323,7 @@ TLS_APPL_STATE *tls_client_init(const TL
+Index: src/tls/tls_client.c
+===================================================================
+--- src/tls/tls_client.c.orig
++++ src/tls/tls_client.c
+@@ -307,6 +307,7 @@ TLS_APPL_STATE *tls_client_init(const TL
       */
      SSL_load_error_strings();
      OpenSSL_add_ssl_algorithms();

++++++ postfix-post-install.patch ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:39.000000000 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- conf/post-install.orig
 +++ conf/post-install
-@@ -696,7 +696,7 @@ EOF
+@@ -708,7 +708,7 @@ EOF
      # Postfix 2.2.
      # Add missing tlsmgr service to master.cf.
  

++++++ postfix-ssl-release-buffers.patch ++++++
--- /var/tmp/diff_new_pack.IWTByh/_old	2014-06-26 08:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.IWTByh/_new	2014-06-26 08:00:39.000000000 +0200
@@ -2,7 +2,7 @@
 ===================================================================
 --- src/tls/tls_client.c.orig
 +++ src/tls/tls_client.c
-@@ -382,6 +382,12 @@ TLS_APPL_STATE *tls_client_init(const TL
+@@ -356,6 +356,12 @@ TLS_APPL_STATE *tls_client_init(const TL
  	return (0);
      }
  
@@ -19,7 +19,7 @@
 ===================================================================
 --- src/tls/tls_server.c.orig
 +++ src/tls/tls_server.c
-@@ -389,6 +389,11 @@ TLS_APPL_STATE *tls_server_init(const TL
+@@ -426,6 +426,11 @@ TLS_APPL_STATE *tls_server_init(const TL
  	return (0);
      }
  

++++++ postfix-vda-v11-2.9.6.patch -> postfix-vda-v13-2.10.0.patch ++++++
--- /work/SRC/openSUSE:Factory/postfix/postfix-vda-v11-2.9.6.patch	2013-06-18 10:21:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-vda-v13-2.10.0.patch	2014-06-26 08:00:36.000000000 +0200
@@ -1,6 +1,6 @@
-diff -uNr postfix-2.9.6.orig/README_FILES/VDA_README postfix-2.9.6/README_FILES/VDA_README
---- postfix-2.9.6.orig/README_FILES/VDA_README	1970-01-01 01:00:00.000000000 +0100
-+++ postfix-2.9.6/README_FILES/VDA_README	2012-03-02 08:30:12.079537052 +0100
+diff -uNr postfix-2.10.0.orig/README_FILES/VDA_README postfix-2.10.0/README_FILES/VDA_README
+--- postfix-2.10.0.orig/README_FILES/VDA_README	1970-01-01 01:00:00.000000000 +0100
++++ postfix-2.10.0/README_FILES/VDA_README	2013-06-07 13:21:22.837143270 +0200
 @@ -0,0 +1,10 @@
 +Postfix VDA patch for maildir++ quota support by 
 +    Anderson Nadal <andernadal@gmail.com>
@@ -12,10 +12,10 @@
 +provided by this patch.
 +
 +
-diff -uNr postfix-2.9.6.orig/src/global/mail_params.h postfix-2.9.6/src/global/mail_params.h
---- postfix-2.9.6.orig/src/global/mail_params.h	2012-01-15 01:36:37.000000000 +0100
-+++ postfix-2.9.6/src/global/mail_params.h	2012-03-02 08:30:12.079537052 +0100
-@@ -2360,6 +2360,54 @@
+diff -uNr postfix-2.10.0.orig/src/global/mail_params.h postfix-2.10.0/src/global/mail_params.h
+--- postfix-2.10.0.orig/src/global/mail_params.h	2013-02-03 19:22:21.000000000 +0100
++++ postfix-2.10.0/src/global/mail_params.h	2013-06-07 13:21:22.838143270 +0200
+@@ -2367,6 +2367,54 @@
  #define DEF_VIRT_GID_MAPS		""
  extern char *var_virt_gid_maps;
  
@@ -70,9 +70,9 @@
  #define VAR_VIRT_MINUID			"virtual_minimum_uid"
  #define DEF_VIRT_MINUID			100
  extern int var_virt_minimum_uid;
-diff -uNr postfix-2.9.6.orig/src/util/file_limit.c postfix-2.9.6/src/util/file_limit.c
---- postfix-2.9.6.orig/src/util/file_limit.c	2003-10-22 20:48:36.000000000 +0200
-+++ postfix-2.9.6/src/util/file_limit.c	2012-03-02 08:30:12.110537033 +0100
+diff -uNr postfix-2.10.0.orig/src/util/file_limit.c postfix-2.10.0/src/util/file_limit.c
+--- postfix-2.10.0.orig/src/util/file_limit.c	2003-10-22 20:48:36.000000000 +0200
++++ postfix-2.10.0/src/util/file_limit.c	2013-06-07 13:21:22.839143270 +0200
 @@ -85,7 +85,11 @@
  #else
      struct rlimit rlim;
@@ -86,10 +86,18 @@
      if (setrlimit(RLIMIT_FSIZE, &rlim) < 0)
  	msg_fatal("setrlimit: %m");
  #ifdef SIGXFSZ
-diff -uNr postfix-2.9.6.orig/src/virtual/mailbox.c postfix-2.9.6/src/virtual/mailbox.c
---- postfix-2.9.6.orig/src/virtual/mailbox.c	2011-12-24 03:13:32.000000000 +0100
-+++ postfix-2.9.6/src/virtual/mailbox.c	2012-03-02 08:30:12.110537033 +0100
-@@ -70,6 +70,70 @@
+diff -uNr postfix-2.10.0.orig/src/virtual/mailbox.c postfix-2.10.0/src/virtual/mailbox.c
+--- postfix-2.10.0.orig/src/virtual/mailbox.c	2011-12-24 03:13:32.000000000 +0100
++++ postfix-2.10.0/src/virtual/mailbox.c	2013-06-07 13:23:03.044139705 +0200
+@@ -52,6 +52,7 @@
+ #include <mymalloc.h>
+ #include <stringops.h>
+ #include <set_eugid.h>
++#include <iostuff.h>
+ 
+ /* Global library. */
+ 
+@@ -70,6 +71,70 @@
  #define YES	1
  #define NO	0
  
@@ -160,6 +168,23 @@
  /* deliver_mailbox_file - deliver to recipient mailbox */
  
  static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
+@@ -80,7 +145,6 @@
+     int     mail_copy_status;
+     int     deliver_status;
+     int     copy_flags;
+-    long    end;
+     struct stat st;
+ 
+     /*
+@@ -132,7 +196,7 @@
+ 	    msg_warn("specify \"%s = no\" to ignore mailbox ownership mismatch",
+ 		     VAR_STRICT_MBOX_OWNER);
+ 	} else {
+-	    end = vstream_fseek(mp->fp, (off_t) 0, SEEK_END);
++	    vstream_fseek(mp->fp, (off_t) 0, SEEK_END);
+ 	    mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), mp->fp,
+ 					 copy_flags, "\n", why);
+ 	}
 @@ -213,62 +277,72 @@
       * Look up the mailbox owner rights. Defer in case of trouble.
       */
@@ -268,9 +293,9 @@
  
      /*
       * Cleanup.
-diff -uNr postfix-2.9.6.orig/src/virtual/maildir.c postfix-2.9.6/src/virtual/maildir.c
---- postfix-2.9.6.orig/src/virtual/maildir.c	2012-01-25 01:41:08.000000000 +0100
-+++ postfix-2.9.6/src/virtual/maildir.c	2012-03-02 08:33:47.724529361 +0100
+diff -uNr postfix-2.10.0.orig/src/virtual/maildir.c postfix-2.10.0/src/virtual/maildir.c
+--- postfix-2.10.0.orig/src/virtual/maildir.c	2012-01-25 01:41:08.000000000 +0100
++++ postfix-2.10.0/src/virtual/maildir.c	2013-06-07 13:21:22.840143270 +0200
 @@ -64,28 +64,420 @@
  #include <mbox_open.h>
  #include <dsn_util.h>
@@ -1210,19 +1235,19 @@
 +        if (*var_virt_maildir_limit_message_maps != 0 && (limit_message = mail_addr_find(virtual_maildir_limit_message_maps, state.msg_attr.user, (char **) NULL)) != 0) {
 +            errno = errnored;
 +            if (errno == EFBIG) {
-+                dsb_simple(why, "5.2.2", limit_message);
++                dsb_simple(why, "5.2.2", limit_message, NULL);
 +            }
 +            if (errno == EDQUOT) {
-+                dsb_simple(why, "4.2.2", limit_message);
++                dsb_simple(why, "4.2.2", limit_message, NULL);
 +            }
 +        }
 +        else {
 +            errno = errnored;
 +            if (errno == EFBIG) {
-+                dsb_simple(why, "5.2.2", var_virt_maildir_limit_message);
++                dsb_simple(why, "5.2.2", var_virt_maildir_limit_message, NULL);
 +            }
 +            if (errno == EDQUOT) {
-+                dsb_simple(why, "4.2.2", var_virt_maildir_limit_message);
++                dsb_simple(why, "4.2.2", var_virt_maildir_limit_message, NULL);
 +            }
 +        }
 +
@@ -1256,9 +1281,9 @@
 +
      return (deliver_status);
  }
-diff -uNr postfix-2.9.6.orig/src/virtual/virtual.c postfix-2.9.6/src/virtual/virtual.c
---- postfix-2.9.6.orig/src/virtual/virtual.c	2011-02-19 01:46:06.000000000 +0100
-+++ postfix-2.9.6/src/virtual/virtual.c	2012-03-02 08:30:12.111537033 +0100
+diff -uNr postfix-2.10.0.orig/src/virtual/virtual.c postfix-2.10.0/src/virtual/virtual.c
+--- postfix-2.10.0.orig/src/virtual/virtual.c	2011-02-19 01:46:06.000000000 +0100
++++ postfix-2.10.0/src/virtual/virtual.c	2013-06-07 13:21:22.840143270 +0200
 @@ -335,12 +335,30 @@
  char   *var_mail_spool_dir;		/* XXX dependency fix */
  bool    var_strict_mbox_owner;
@@ -1353,9 +1378,9 @@
  		       MAIL_SERVER_PRIVILEGED,
  		       0);
  }
-diff -uNr postfix-2.9.6.orig/src/virtual/virtual.h postfix-2.9.6/src/virtual/virtual.h
---- postfix-2.9.6.orig/src/virtual/virtual.h	2006-01-08 00:59:47.000000000 +0100
-+++ postfix-2.9.6/src/virtual/virtual.h	2012-03-02 08:30:12.111537033 +0100
+diff -uNr postfix-2.10.0.orig/src/virtual/virtual.h postfix-2.10.0/src/virtual/virtual.h
+--- postfix-2.10.0.orig/src/virtual/virtual.h	2006-01-08 00:59:47.000000000 +0100
++++ postfix-2.10.0/src/virtual/virtual.h	2013-06-07 13:21:22.841143270 +0200
 @@ -34,6 +34,9 @@
  extern MAPS *virtual_mailbox_maps;
  extern MAPS *virtual_uid_maps;


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit postfix for openSUSE:Factory

root＠hilbert.suse.de