From 4ff5275f9698beaa0eb4f2a3d2993fb56e6a3c8bb80b9682343ba60f267f2c3f Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Fri, 27 Jun 2014 23:38:12 +0000
Subject: [PATCH] Accepting request 238955 from home:computersalat:devel:mail

fix typo in update_chroot.systemd, fix config.postfix 'insserv amavis', add some dovecot stuff to main/master.cf

OBS-URL: https://build.opensuse.org/request/show/238955
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=193
---
 postfix-SuSE.tar.gz     |  4 ++--
 postfix-main.cf.patch   | 27 ++++++++++++++++++++-------
 postfix-master.cf.patch |  5 ++++-
 postfix.changes         | 12 ++++++++++++
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz
index 1c39eb5..8af559c 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:2aef0ce074b0d4c3afd91d7ee201a3df20df0a94e9506ebf05c2877b9e76efd9
-size 27344
+oid sha256:2a27dc041c9e945b5b36cef53c71f0022f50233b5ba85be5d7fa53ca501f49b1
+size 24377
diff --git a/postfix-main.cf.patch b/postfix-main.cf.patch
index 1633df8..1466a57 100644
--- a/postfix-main.cf.patch
+++ b/postfix-main.cf.patch
@@ -2,17 +2,27 @@ Index: conf/main.cf
 ===================================================================
 --- conf/main.cf.orig
 +++ conf/main.cf
-@@ -655,3 +655,115 @@ sample_directory =
+@@ -548,6 +548,7 @@ unknown_local_recipient_reject_code = 55
+ #
+ #smtpd_banner = $myhostname ESMTP $mail_name
+ #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
++smtpd_banner = $myhostname ESMTP
+ 
+ # PARALLEL DELIVERY TO THE SAME DESTINATION
+ #
+@@ -654,4 +655,120 @@ sample_directory =
+ # readme_directory: The location of the Postfix README files.
  #
  readme_directory =
- inet_protocols = ipv4
 +
 +biff = no
 +content_filter = 
 +delay_warning_time = 0h
 +disable_dns_lookups = no
 +disable_mime_output_conversion = no
++disable_vrfy_command = yes
 +inet_interfaces = all
+ inet_protocols = ipv4
 +masquerade_classes = envelope_sender, header_sender, header_recipient
 +masquerade_domains = 
 +masquerade_exceptions = 
@@ -35,6 +45,7 @@ Index: conf/main.cf
 +message_size_limit = 0
 +strict_8bitmime = no
 +strict_rfc821_envelopes = no
++smtpd_delay_reject = yes
 +smtpd_helo_required = no
 +
 +smtpd_client_restrictions = 
@@ -53,6 +64,8 @@ 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
 +############################################################
 +# TLS stuff
 +############################################################
@@ -81,7 +94,7 @@ Index: conf/main.cf
 +############################################################
 +# Start MySQL from postfixwiki.org
 +############################################################
-+#relay_domains = $mydestination, hash:/etc/postfix/relay
++relay_domains = $mydestination, hash:/etc/postfix/relay
 +virtual_alias_domains = 
 +#virtual_alias_maps = hash:/etc/postfix/virtual
 +#virtual_uid_maps = static:303
@@ -91,15 +104,15 @@ Index: conf/main.cf
 +#virtual_mailbox_domains = mysql:/etc/postfix/mysql_virtual_domains_maps.cf
 +#virtual_mailbox_limit = 0
 +#virtual_mailbox_limit_inbox = no
-+#virtual_mailbox_limit_maps = hash:/etc/postfix/vquota
-+#virtual_mailbox_limit_override = yes
 +#virtual_mailbox_maps = mysql:/etc/postfix/mysql_virtual_mailbox_maps.cf
++## For dovecot LMTP replace 'virtual' with 'lmtp:unix:private/dovecot-lmtp'
 +#virtual_transport = virtual
++## Additional for quota support
++#virtual_mailbox_limit_maps = mysql:/etc/postfix/mysql_virtual_mailbox_limit_maps.cf
++#virtual_mailbox_limit_override = yes
 +### Needs Maildir++ compatible IMAP servers, like Courier-IMAP
 +#virtual_maildir_filter = yes
 +#virtual_maildir_filter_maps = hash:/etc/postfix/vfilter
-+#virtual_mailbox_limit_maps = mysql:/etc/postfix/mysql_virtual_mailbox_limit_maps.cf
-+#virtual_mailbox_limit_override = yes
 +#virtual_maildir_limit_message = Sorry, the user's maildir has overdrawn his diskspace quota, please try again later.
 +#virtual_maildir_limit_message_maps = hash:/etc/postfix/vmsg
 +#virtual_overquota_bounce = yes
diff --git a/postfix-master.cf.patch b/postfix-master.cf.patch
index 93ce5da..242a6c0 100644
--- a/postfix-master.cf.patch
+++ b/postfix-master.cf.patch
@@ -97,7 +97,7 @@ Index: conf/master.cf
  #
  # ====================================================================
  #
-@@ -128,3 +154,7 @@ scache    unix  -       -       n
+@@ -128,3 +154,10 @@ scache    unix  -       -       n
  #mailman   unix  -       n       n       -       -       pipe
  #  flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
  #  ${nexthop} ${user}
@@ -105,3 +105,6 @@ Index: conf/master.cf
 +#procmail  unix  -       n       n       -       -       pipe
 +#  flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient}
 +#
++#dovecot   unix  -       n       n       -       -       pipe
++#  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
++#
diff --git a/postfix.changes b/postfix.changes
index b64cd99..de92bb6 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jun 27 23:16:21 UTC 2014 - chris@computersalat.de
+
+- fix typo in postfix-SuSE/update_chroot.systemd
+- fix config.postfix
+  * 'insserv amavis' -> 'chkconfig amavis on'
+- rework main.cf patch
+  * fix virtual stuff
+  * add some dovecot stuff
+- rework master.cf patch
+  * add some dovecot stuff
+
 -------------------------------------------------------------------
 Mon Jun 23 21:41:23 UTC 2014 - jamesp@vicidial.com