From a32809a57b23b654aaa9bf54d7e7532e71e2ac4ae0375da8d511dcc559698422 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Tue, 17 May 2011 22:52:01 +0000 Subject: [PATCH] Accepting request 70502 from home:computersalat:devel:mail fix master.cf OBS-URL: https://build.opensuse.org/request/show/70502 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=77 --- postfix-2.8.3-master.cf.patch | 59 +++++++++++++++++++++++++++++++++++ postfix-SuSE.patch | 28 +++++++++++++++-- postfix.changes | 9 ++++-- postfix.spec | 10 +++--- 4 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 postfix-2.8.3-master.cf.patch diff --git a/postfix-2.8.3-master.cf.patch b/postfix-2.8.3-master.cf.patch new file mode 100644 index 0000000..f31bf8e --- /dev/null +++ b/postfix-2.8.3-master.cf.patch @@ -0,0 +1,59 @@ +diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf +--- postfix-2.8.3-orig/conf/master.cf 2010-12-31 15:14:51.000000000 +0100 ++++ postfix-2.8.3/conf/master.cf 2011-05-17 23:56:45.000000000 +0200 +@@ -9,6 +9,11 @@ + # (yes) (yes) (yes) (never) (100) + # ========================================================================== + smtp inet n - n - - smtpd ++#amavis unix - - n - 4 smtp ++# -o smtp_data_done_timeout=1200 ++# -o smtp_send_xforward_command=yes ++# -o disable_dns_lookups=yes ++# -o max_use=20 + #smtp inet n - n - 1 postscreen + #smtpd pass - - n - - smtpd + #dnsblog unix - - n - 0 dnsblog +@@ -50,6 +55,26 @@ + virtual unix - n n - - virtual + lmtp unix - - n - - lmtp + anvil unix - - n - 1 anvil ++#localhost:10025 inet n - n - - smtpd ++# -o content_filter= ++# -o smtpd_delay_reject=no ++# -o smtpd_client_restrictions=permit_mynetworks,reject ++# -o smtpd_helo_restrictions= ++# -o smtpd_sender_restrictions= ++# -o smtpd_recipient_restrictions=permit_mynetworks,reject ++# -o smtpd_data_restrictions=reject_unauth_pipelining ++# -o smtpd_end_of_data_restrictions= ++# -o smtpd_restriction_classes= ++# -o mynetworks=127.0.0.0/8 ++# -o smtpd_error_sleep_time=0 ++# -o smtpd_soft_error_limit=1001 ++# -o smtpd_hard_error_limit=1000 ++# -o smtpd_client_connection_count_limit=0 ++# -o smtpd_client_connection_rate_limit=0 ++# -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_address_mappings ++# -o local_header_rewrite_clients= ++# -o local_recipient_maps= ++# -o relay_recipient_maps= + scache unix - - n - 1 scache + # + # ==================================================================== +@@ -84,7 +109,7 @@ + # Also specify in main.cf: cyrus_destination_recipient_limit=1 + # + #cyrus unix - n n - - pipe +-# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} ++# user=cyrus argv=/usr/lib/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} + # + # ==================================================================== + # +@@ -117,3 +142,7 @@ + #mailman unix - n n - - pipe + # flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py + # ${nexthop} ${user} ++# ++#procmail unix - n n - - pipe ++# flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient} ++# diff --git a/postfix-SuSE.patch b/postfix-SuSE.patch index 3be3bf9..1384b67 100644 --- a/postfix-SuSE.patch +++ b/postfix-SuSE.patch @@ -1,6 +1,6 @@ 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/SuSEconfig.postfix 2011-05-17 22:10:03.000000000 +0200 ++++ postfix-SuSE/SuSEconfig.postfix 2011-05-18 00:29:48.000000000 +0200 @@ -143,7 +143,6 @@ if [ "$CAPATH" ] then @@ -102,9 +102,33 @@ diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix fi ALLMAPS="hash:/etc/aliases" +@@ -903,14 +920,16 @@ + $line = " ".$1; + } + # next should match +- # # -o smtpd_client_restrictions= ++ # # -o smtpd_client_restrictions=permit_mynetworks,reject + # and not +- # # -o smtpd_client_restrictions=permit_sasl_authenticated,reject +- } elsif ( /^\#?\s\s(-o\s+smtpd_client_restrictions=.*)/) { +- if ( $use_amavis ne "yes" ) { +- $line = "# ".$1; +- } else { +- $line = " ".$1; ++ # # -o smtpd_client_restrictions=permit_sasl_authenticated,reject ++ } elsif ( /^\#?\s\s(-o\s+smtpd_client_restrictions=)(.*)/) { ++ if ( $2 eq "permit_mynetworks,reject") { ++ if ( $use_amavis ne "yes" ) { ++ $line = "# ".$1.$2; ++ } else { ++ $line = " ".$1.$2; ++ } + } + } elsif ( /\#?\s\s(-o\s+smtpd_helo_restrictions=.*)/) { + if ( $use_amavis ne "yes" ) { 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/sysconfig.postfix 2011-05-17 22:10:03.000000000 +0200 ++++ postfix-SuSE/sysconfig.postfix 2011-05-18 00:28:16.000000000 +0200 @@ -198,9 +198,8 @@ # 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. diff --git a/postfix.changes b/postfix.changes index 0614895..e29a7b3 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,9 +1,14 @@ ------------------------------------------------------------------- -Tue May 17 20:13:50 UTC 2011 - chris@computersalat.de +Tue May 17 22:31:46 UTC 2011 - chris@computersalat.de +- fix master.cf + o fix missing + - amavis unix - - n - 4 smtp + - localhost:10025 inet n - n - - smtpd + o add master.cf patch - rework patches o main.cf (add two missing sasl vars) - o postfix-SuSE (SuSEconfig, cleanup those vars) + o postfix-SuSE (SuSEconfig, cleanup those vars,...) ------------------------------------------------------------------- Sun May 15 14:16:03 UTC 2011 - chris@computersalat.de diff --git a/postfix.spec b/postfix.spec index 04ccb7b..adec812 100644 --- a/postfix.spec +++ b/postfix.spec @@ -36,9 +36,10 @@ Patch1: dynamic_maps_pie.patch Patch2: pointer_to_literals.patch Patch3: ipv6_disabled.patch Patch10: %{name}-2.8.3-main.cf.patch -Patch11: %{name}-2.8.3-post-install.patch -Patch12: %{name}-vda-v10-2.8.1.patch -Patch13: %{name}-SuSE.patch +Patch11: %{name}-2.8.3-master.cf.patch +Patch12: %{name}-2.8.3-post-install.patch +Patch20: %{name}-vda-v10-2.8.1.patch +Patch30: %{name}-SuSE.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent @@ -146,7 +147,8 @@ PostgreSQL. %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 +%patch20 -p1 +%patch30 -p0 # --------------------------------------------------------------------------- %build