Accepting request 45513 from server:mail

checked in (request 45513)

OBS-URL: https://build.opensuse.org/request/show/45513
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=50

postfix-SuSE.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46ae3f570cbb4f30e61e1cbebc7d05f02efd40b1c5023abf6185e496f22a2c08
-size 21717
+oid sha256:4345b476f574bfb2808bec8ef294bb1add8eb9492ef315bdf6f6e1e8d972f37a
+size 21666

postfix.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Thu Aug 12 18:57:14 UTC 2010 - varkoly@novell.com
-
-- Remove obsolate postscripts
-- bnc#625657 - SuSEconfig.postfix and smtp_use_tls 
-- bnc#622873 - postfix doesn't start if ipv6 is disabled
-
 -------------------------------------------------------------------
 Tue Jul  6 15:04:30 UTC 2010 - chris@computersalat.de
 

postfix.spec

@@ -444,6 +444,27 @@ fi
 %post
 # We never have to run suseconfig for postfix after installation
 # We only start postfix own upgrade-configuration by update
+if [ ${1:-0} -gt 1 ]; then
+	#echo "executing upgrade-configuration"
+	#/usr/sbin/%{name} set-permissions upgrade-configuration  setgid_group=%{pf_setgid_group}
+	#New map in 11.2 #TODO remove it later
+	. /etc/sysconfig/postfix
+	RELAY=`echo $POSTFIX_MAP_LIST | grep -P " relay | relay$"`
+	if [ -z "$RELAY" ]
+	then
+		sed -i "s/^POSTFIX_MAP_LIST=.*/POSTFIX_MAP_LIST=\"$POSTFIX_MAP_LIST relay\"/" /etc/sysconfig/postfix 
+	fi
+	if [ ! -e /var/adm/BNC-555814.fixed ]
+	then
+		touch /var/adm/BNC-555814.fixed
+		. /etc/sysconfig/mail
+		if [ "$CONFIG_TYPE" = "undef" ]
+		then
+			sed -i 's/SMTPD_LISTEN_REMOTE=.*/SMTPD_LISTEN_REMOTE=""/'   /etc/sysconfig/mail
+			postconf -e 'inet_interfaces = localhost'
+		fi
+	fi
+fi
 %{fillup_and_insserv -y postfix}
 %{fillup_only -an mail}
 /sbin/ldconfig