rpm/postfix
SHA256
1
0
Fork 0
forked from pool/postfix
Code Pull Requests Activity

Accepting request 70490 from home:computersalat:devel:mail

Browse Source 
rework main.cf, postfix-SuSE patch

OBS-URL: https://build.opensuse.org/request/show/70490
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=76
This commit is contained in:
Christian Wittmer 2011-05-17 20:15:24 +00:00 committed by Git OBS Bridge
parent f80fb45e86
commit 758442180e
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
postfix-2.8.3-main.cf.patch
View File

@ -1,7 +1,7 @@
diff -ruN postfix-2.8.3-orig/conf/main.cf postfix-2.8.3/conf/main.cf diff -ruN postfix-2.8.3-orig/conf/main.cf postfix-2.8.3/conf/main.cf
--- postfix-2.8.3-orig/conf/main.cf 2007-12-18 14:50:25.000000000 +0100 --- postfix-2.8.3-orig/conf/main.cf 2007-12-18 14:50:25.000000000 +0100
+++ postfix-2.8.3/conf/main.cf 2011-05-15 13:12:35.000000000 +0200 +++ postfix-2.8.3/conf/main.cf 2011-05-17 22:05:14.000000000 +0200
@@ -649,3 +649,117 @@ @@ -649,3 +649,119 @@
# readme_directory: The location of the Postfix README files. # readme_directory: The location of the Postfix README files.
# #
readme_directory = readme_directory =
@ -50,6 +50,8 @@ diff -ruN postfix-2.8.3-orig/conf/main.cf postfix-2.8.3/conf/main.cf
+# SASL stuff +# SASL stuff
+############################################################ +############################################################
+smtp_sasl_auth_enable = no +smtp_sasl_auth_enable = no
+smtp_sasl_security_options =
+smtp_sasl_password_maps =
+smtpd_sasl_auth_enable = no +smtpd_sasl_auth_enable = no
+############################################################ +############################################################
+# TLS stuff +# TLS stuff
@ -80,8 +82,8 @@ diff -ruN postfix-2.8.3-orig/conf/main.cf postfix-2.8.3/conf/main.cf
+# Start MySQL from postfixwiki.org +# Start MySQL from postfixwiki.org
+############################################################ +############################################################
+#relay_domains = $mydestination, hash:/etc/postfix/relay +#relay_domains = $mydestination, hash:/etc/postfix/relay
+#virtual_alias_maps = hash:/etc/postfix/virtual
+virtual_alias_domains = +virtual_alias_domains =
+#virtual_alias_maps = hash:/etc/postfix/virtual
+#virtual_uid_maps = static:303 +#virtual_uid_maps = static:303
+#virtual_gid_maps = static:303 +#virtual_gid_maps = static:303
+#virtual_minimum_uid = 303 +#virtual_minimum_uid = 303

17
postfix-SuSE.patch
View File

@ -1,6 +1,6 @@
diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
--- postfix-SuSE-orig/SuSEconfig.postfix 2011-05-11 10:30:56.000000000 +0200 --- postfix-SuSE-orig/SuSEconfig.postfix 2011-05-11 10:30:56.000000000 +0200
+++ postfix-SuSE/SuSEconfig.postfix 2011-05-15 15:42:17.000000000 +0200 +++ postfix-SuSE/SuSEconfig.postfix 2011-05-17 22:10:03.000000000 +0200
@@ -143,7 +143,6 @@ @@ -143,7 +143,6 @@
if [ "$CAPATH" ] if [ "$CAPATH" ]
then then
@ -34,7 +34,16 @@ diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
$PCONF -e "readme_directory = @readme_directory@" $PCONF -e "readme_directory = @readme_directory@"
$PCONF -e "html_directory = @html_directory@" $PCONF -e "html_directory = @html_directory@"
$PCONF -e "sample_directory = @sample_directory@" $PCONF -e "sample_directory = @sample_directory@"
@@ -557,19 +557,28 @@ @@ -517,6 +517,8 @@
$PCONF -e "smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd"
else
$PCONF -e "smtp_sasl_auth_enable = no"
+ $PCONF -e "smtp_sasl_security_options = "
+ $PCONF -e "smtp_sasl_password_maps = "
fi
if test "$POSTFIX_SMTP_AUTH_SERVER" == "yes"; then
@@ -557,19 +559,28 @@
fi fi
if test "$POSTFIX_SMTP_TLS_SERVER" == "yes" -o "$POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT" == "yes"; then if test "$POSTFIX_SMTP_TLS_SERVER" == "yes" -o "$POSTFIX_SMTP_TLS_SERVER_LEGACY_SUPPORT" == "yes"; then
$PCONF -e "smtpd_use_tls = yes" $PCONF -e "smtpd_use_tls = yes"
@ -67,7 +76,7 @@ diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
fi fi
if test "$POSTFIX_SMTP_TLS_CLIENT" == "no"; then if test "$POSTFIX_SMTP_TLS_CLIENT" == "no"; then
@@ -585,16 +594,22 @@ @@ -585,16 +596,22 @@
$PCONF -e "smtp_enforce_tls = yes" $PCONF -e "smtp_enforce_tls = yes"
fi fi
if test "$POSTFIX_SMTP_TLS_CLIENT" = "yes" -o "$POSTFIX_SMTP_TLS_CLIENT" = "must" ; then if test "$POSTFIX_SMTP_TLS_CLIENT" = "yes" -o "$POSTFIX_SMTP_TLS_CLIENT" = "must" ; then
@ -95,7 +104,7 @@ diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
ALLMAPS="hash:/etc/aliases" ALLMAPS="hash:/etc/aliases"
diff -ruN postfix-SuSE-orig/sysconfig.postfix postfix-SuSE/sysconfig.postfix diff -ruN postfix-SuSE-orig/sysconfig.postfix postfix-SuSE/sysconfig.postfix
--- postfix-SuSE-orig/sysconfig.postfix 2011-05-11 10:30:56.000000000 +0200 --- postfix-SuSE-orig/sysconfig.postfix 2011-05-11 10:30:56.000000000 +0200
+++ postfix-SuSE/sysconfig.postfix 2011-05-14 18:00:01.000000000 +0200 +++ postfix-SuSE/sysconfig.postfix 2011-05-17 22:10:03.000000000 +0200
@@ -198,9 +198,8 @@ @@ -198,9 +198,8 @@
# Note: This only has effect, if POSTFIX_BASIC_SPAM_PREVENTION is set # Note: This only has effect, if POSTFIX_BASIC_SPAM_PREVENTION is set
# to either "medium" or "hard" or "custom". If left empty, no RBL checks will take place. # to either "medium" or "hard" or "custom". If left empty, no RBL checks will take place.

7
postfix.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 17 20:13:50 UTC 2011 - chris@computersalat.de
- rework patches
o main.cf (add two missing sasl vars)
o postfix-SuSE (SuSEconfig, cleanup those vars)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 15 14:16:03 UTC 2011 - chris@computersalat.de Sun May 15 14:16:03 UTC 2011 - chris@computersalat.de