Accepting request 238444 from server:mail

1 OBS-URL: https://build.opensuse.org/request/show/238444 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=113
2014-06-26 06:00:25 +00:00
parent 7609892e77 13da999654
commit 8c59ee266f
12 changed files with 200 additions and 64 deletions
--- a/add_missed_library.patch
+++ b/add_missed_library.patch
@@ -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
 
-
--- a/ipv6_disabled.patch
+++ b/ipv6_disabled.patch
@@ -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);
--- a/postfix-SuSE.tar.gz
+++ b/postfix-SuSE.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7a9df868759290e2688179983aa7a073e619dd5bf1b5d724a9bfc9ac687a7ee
-size 27394
+oid sha256:2aef0ce074b0d4c3afd91d7ee201a3df20df0a94e9506ebf05c2877b9e76efd9
+size 27344
--- a/postfix-db6.diff
+++ b/postfix-db6.diff
@@ -8,10 +8,10 @@ src: allow compilation against libdb-6.0
 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);
--- a/postfix-master.cf.patch
+++ b/postfix-master.cf.patch
@@ -2,7 +2,7 @@ Index: conf/master.cf
 ===================================================================
 --- 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 @@ Index: conf/master.cf
 #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 @@ Index: conf/master.cf
 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 @@ Index: conf/master.cf
 #
 # ====================================================================
 #
-@@ -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}
--- a/postfix-mysql.tar.bz2
+++ b/postfix-mysql.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cff3c067d45ff6a9c7ce1c7ac47c155955fe55b965ef1bf030b1bd912ce55479
-size 1743
+oid sha256:b9dd4272ad39b157d99653c0adbe51fb38f1fc675b48e51f9c646dbde60d3e42
+size 1966
--- a/postfix-opensslconfig.patch
+++ b/postfix-opensslconfig.patch
@@ -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();
--- a/postfix-post-install.patch
+++ b/postfix-post-install.patch
@@ -2,7 +2,7 @@ Index: conf/post-install
 ===================================================================
 --- 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.
 
--- a/postfix-ssl-release-buffers.patch
+++ b/postfix-ssl-release-buffers.patch
@@ -2,7 +2,7 @@ Index: src/tls/tls_client.c
 ===================================================================
 --- 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 @@ Index: src/tls/tls_server.c
 ===================================================================
 --- 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);
     }
 
--- a/postfix-vda-v13-2.10.0.patch
+++ b/postfix-vda-v13-2.10.0.patch
@@ -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 @@ diff -uNr postfix-2.9.6.orig/README_FILES/VDA_README postfix-2.9.6/README_FILES/
 +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 @@ diff -uNr postfix-2.9.6.orig/src/global/mail_params.h postfix-2.9.6/src/global/m
 #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 @@ diff -uNr postfix-2.9.6.orig/src/util/file_limit.c postfix-2.9.6/src/util/file_l
     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 @@ diff -uNr postfix-2.9.6.orig/src/virtual/mailbox.c postfix-2.9.6/src/virtual/mai
 /* 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 @@ diff -uNr postfix-2.9.6.orig/src/virtual/mailbox.c postfix-2.9.6/src/virtual/mai
 
     /*
      * 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 @@ diff -uNr postfix-2.9.6.orig/src/virtual/maildir.c postfix-2.9.6/src/virtual/mai
 +        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 @@ diff -uNr postfix-2.9.6.orig/src/virtual/maildir.c postfix-2.9.6/src/virtual/mai
 +
     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 @@ diff -uNr postfix-2.9.6.orig/src/virtual/virtual.c postfix-2.9.6/src/virtual/vir
 		       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;
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Wed Feb 12 15:10:27 UTC 2014 - varkoly@suse.com

--- a/postfix.spec
+++ b/postfix.spec
@@ -31,7 +31,7 @@ Source3:        %{name}-mysql.tar.bz2
 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 @@ Patch11:        %{name}-master.cf.patch
 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,18 +158,18 @@ PostgreSQL.
 %prep
 %{?gpg_verify: %gpg_verify %{S:1}}
 %setup -q -a 2 -a 3
-%patch   -p1
-%patch1  -p1
-%patch2  -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3
 %patch10
 %patch11
 %patch12
 %patch20
-%patch21 -p1
+%patch21
 %patch100 -p1
-%patch -P 101 -p1
-%patch102 -p0
+%patch101
+%patch102
 # ---------------------------------------------------------------------------

 %build
@@ -415,10 +415,33 @@ fi
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{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