From 3cb9d1d661fd0ce234754ec62c043f8a655e10b2b12218a4d864a0c962df7bdf Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 3 Dec 2022 07:52:41 +0000 Subject: [PATCH] Accepting request 1035682 from home:varkoly:branches:server:mail - postfix default main.cf myhostname default causes conflict (bsc#1192173) Use the postfix build in defaults for myhostname and mydestination - postfix default main.cf myhostname default causes conflict (bsc#1192173) Use the postfix build in defaults for myhostname and mydestination OBS-URL: https://build.opensuse.org/request/show/1035682 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=449 --- postfix-bdb.changes | 7 +++++++ postfix-main.cf.patch | 10 +++------- postfix.changes | 7 +++++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/postfix-bdb.changes b/postfix-bdb.changes index 7d1093a..94677fe 100644 --- a/postfix-bdb.changes +++ b/postfix-bdb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 14 15:07:44 UTC 2022 - Peter Varkoly + +- postfix default main.cf myhostname default causes conflict + (bsc#1192173) + Use the postfix build in defaults for myhostname and mydestination + ------------------------------------------------------------------- Sun Oct 9 12:00:55 UTC 2022 - Michael Ströder diff --git a/postfix-main.cf.patch b/postfix-main.cf.patch index 7f4fa5d..2b0c699 100644 --- a/postfix-main.cf.patch +++ b/postfix-main.cf.patch @@ -1,7 +1,5 @@ -Index: conf/main.cf -=================================================================== ---- conf/main.cf.orig -+++ conf/main.cf +--- conf/main.cf.orig 2022-11-14 15:57:24.689108581 +0100 ++++ conf/main.cf 2022-11-14 16:02:33.255317483 +0100 @@ -285,7 +285,7 @@ unknown_local_recipient_reject_code = 55 # #mynetworks = 168.100.3.0/28, 127.0.0.0/8 @@ -50,7 +48,7 @@ Index: conf/main.cf # PARALLEL DELIVERY TO THE SAME DESTINATION # -@@ -682,4 +683,151 @@ sample_directory = +@@ -682,4 +683,149 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = @@ -79,8 +77,6 @@ Index: conf/main.cf +masquerade_classes = envelope_sender, header_sender, header_recipient +masquerade_domains = +masquerade_exceptions = -+mydestination = $myhostname, localhost.$mydomain -+myhostname = localhost +mynetworks_style = subnet +relayhost = + diff --git a/postfix.changes b/postfix.changes index 7d1093a..3c66bbe 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 14 15:05:42 UTC 2022 - Peter Varkoly + +- postfix default main.cf myhostname default causes conflict + (bsc#1192173) + Use the postfix build in defaults for myhostname and mydestination + ------------------------------------------------------------------- Sun Oct 9 12:00:55 UTC 2022 - Michael Ströder