From 3656374f36bab92fd26e853871f16c70df36d8fe72ee9ffbeb7cf4605add60e0 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 27 Nov 2009 12:42:46 +0000
Subject: [PATCH] Accepting request 24958 from server:mail

Copy from server:mail/postfix based on submit request 24958 from user varkoly

OBS-URL: https://build.opensuse.org/request/show/24958
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=39
---
 postfix-SuSE.tar.gz |  4 ++--
 postfix.changes     | 13 +++++++++++++
 postfix.spec        | 13 +++++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz
index 7908ecf..c6781ae 100644
--- a/postfix-SuSE.tar.gz
+++ b/postfix-SuSE.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81bb95c7b712f3ac4a1356917992e7c5e650e03b192f9a35117351360386cc97
-size 21145
+oid sha256:7afaff6370e91c230ad99ae9b52da61671c70109fb227d6ae3a854315311030c
+size 21013
diff --git a/postfix.changes b/postfix.changes
index b8c574e..130767d 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Nov 16 17:14:39 CET 2009 - varkoly@suse.de
+
+- bnc#555814 – VUL-0: SMTPD_LISTEN_REMOTE="yes" by default
+- bnc#555732 - Invalid $(hostname -i) usage SuSEconfig.postfix 
+- bnc#547928 – Postfix does not start during boot process
+- Avoid append relay multiple times in POSTFIX_MAP_LIST 
+
+-------------------------------------------------------------------
+Mon Oct 26 14:36:55 CET 2009 - varkoly@suse.de
+
+- bnc#549612 – SuSEconfig.postfix 
+
 -------------------------------------------------------------------
 Mon Sep 28 09:22:54 CEST 2009 - varkoly@suse.de
 
diff --git a/postfix.spec b/postfix.spec
index f5c3e99..56e30e2 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -22,7 +22,7 @@
 Name:           postfix
 Summary:        A fast, secure, and flexible mailer
 Version:        2.6.1
-Release:        1
+Release:        2
 License:        IBM Public License ..
 Group:          Productivity/Networking/Email/Servers
 Url:            http://www.postfix.org/
@@ -445,7 +445,16 @@ if [ ${1:-0} -gt 1 ]; then
 	/usr/sbin/%{name} set-permissions upgrade-configuration  setgid_group=%{pf_setgid_group}
 	#New map in 11.2 #TODO remove it later
 	. /etc/sysconfig/postfix
-	sed -i "s/^POSTFIX_MAP_LIST=.*/POSTFIX_MAP_LIST=\"$POSTFIX_MAP_LIST relay\"/" /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
+		sed -i 's/SMTPD_LISTEN_REMOTE=.*/SMTPD_LISTEN_REMOTE=""/'   /etc/sysconfig/mail
+		touch /var/adm/BNC-555814.fixed
+	fi
 fi
 ldconfig
 # ---------------------------------------------------------------------------