From 168e82144cba3203b4c06b565c5368b1452936b5a92772407a3ce472d0a4cf2e Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Wed, 19 Apr 2017 22:34:52 +0000 Subject: [PATCH] Accepting request 489488 from home:computersalat:devel:mail revert changes of postfix-main.cf.patch from rev=261 OBS-URL: https://build.opensuse.org/request/show/489488 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=265 --- postfix-main.cf.patch | 23 ++++++++++++++++++----- postfix.changes | 9 +++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/postfix-main.cf.patch b/postfix-main.cf.patch index 7a1d270..bc63611 100644 --- a/postfix-main.cf.patch +++ b/postfix-main.cf.patch @@ -10,11 +10,24 @@ Index: conf/main.cf # PARALLEL DELIVERY TO THE SAME DESTINATION # -@@ -673,4 +674,121 @@ sample_directory = +@@ -673,4 +674,136 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = + ++############################################################ ++# ++# before changing values manually consider editing ++# /etc/sysconfig/postfix ++# and run ++# config.postfix ++# ++# if you miss a feature of config.postfix then just send a ++# mail to chris@computersalat.de ++# patches for new feature(s) are also welcome :) ++# ++############################################################ ++ +biff = no +content_filter = +delay_warning_time = 0h @@ -64,10 +77,10 @@ Index: conf/main.cf +smtp_sasl_security_options = +smtp_sasl_password_maps = +smtpd_sasl_auth_enable = no -+#smtpd_sasl_path = private/auth -+#smtpd_sasl_type = dovecot -+#smtpd_sasl_path = smtpd -+#smtpd_sasl_type = cyrus ++# cyrus : smtpd_sasl_type = cyrus, smtpd_sasl_path = smtpd ++# dovecot : smtpd_sasl_type = dovecot, smtpd_sasl_path = private/auth ++smtpd_sasl_path = ++smtpd_sasl_type = +############################################################ +# TLS stuff +############################################################ diff --git a/postfix.changes b/postfix.changes index 30cf7a3..86c4575 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 19 20:36:03 UTC 2017 - chris@computersalat.de + +- revert changes of postfix-main.cf.patch from rev=261 + * config.postfix will not 'enable' (remove #) var, but place + modified (enabled) var at end of file, far away from place + where it should be + * keep vars enabled but empty + ------------------------------------------------------------------- Thu Apr 13 09:18:45 UTC 2017 - werner@suse.de