diff --git a/postfix-SUSE.tar.gz b/postfix-SUSE.tar.gz index a85a420..4cd4685 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:60e45b1fe04caeaf0b5c0e70acc9cc6d1b96a30806b6b1ffe94e04478e47f2b5 -size 23699 +oid sha256:ee48dacaa660042da238ec994b08a55e235f152621a95adbf2e1dbcf29c893f0 +size 23890 diff --git a/postfix-main.cf.patch b/postfix-main.cf.patch index c2beb5e..48de84a 100644 --- a/postfix-main.cf.patch +++ b/postfix-main.cf.patch @@ -50,7 +50,7 @@ Index: conf/main.cf # PARALLEL DELIVERY TO THE SAME DESTINATION # -@@ -673,4 +674,140 @@ sample_directory = +@@ -673,4 +674,141 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = @@ -154,6 +154,7 @@ Index: conf/main.cf +# Start MySQL from postfixwiki.org +############################################################ +relay_domains = $mydestination, lmdb:/etc/postfix/relay ++relay_recipient_maps = lmdb:/etc/postfix/relay_recipients +#virtual_alias_domains = +#virtual_alias_maps = lmdb:/etc/postfix/virtual +#virtual_uid_maps = static:303 diff --git a/postfix-master.cf.patch b/postfix-master.cf.patch index bda2107..7594042 100644 --- a/postfix-master.cf.patch +++ b/postfix-master.cf.patch @@ -14,15 +14,61 @@ Index: conf/master.cf #smtp inet n - n - 1 postscreen #smtpd pass - - n - - smtpd #dnsblog unix - - n - 0 dnsblog -@@ -19,6 +24,7 @@ smtp inet n - n +@@ -17,30 +22,32 @@ smtp inet n - n + # Choose one: enable submission for loopback clients only, or for any client. + #127.0.0.1:submission inet n - n - - smtpd #submission inet n - n - - smtpd - # -o syslog_name=postfix/submission - # -o smtpd_tls_security_level=encrypt -+# -o content_filter=smtp:[127.0.0.1]:10024 - # -o smtpd_sasl_auth_enable=yes - # -o smtpd_tls_auth_only=yes - # -o smtpd_reject_unlisted_recipient=no -@@ -69,6 +75,26 @@ lmtp unix - - n +-# -o syslog_name=postfix/submission +-# -o smtpd_tls_security_level=encrypt +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_tls_auth_only=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/submission ++# -o smtpd_tls_security_level=encrypt ++# -o content_filter=smtp:[127.0.0.1]:10024 ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_tls_auth_only=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING + # Choose one: enable smtps for loopback clients only, or for any client. + #127.0.0.1:smtps inet n - n - - smtpd + #smtps inet n - n - - smtpd +-# -o syslog_name=postfix/smtps +-# -o smtpd_tls_wrappermode=yes +-# -o smtpd_sasl_auth_enable=yes +-# -o smtpd_reject_unlisted_recipient=no +-# -o smtpd_client_restrictions=$mua_client_restrictions +-# -o smtpd_helo_restrictions=$mua_helo_restrictions +-# -o smtpd_sender_restrictions=$mua_sender_restrictions +-# -o smtpd_recipient_restrictions= +-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -o syslog_name=postfix/smtps ++# -o smtpd_tls_wrappermode=yes ++# -o content_filter=smtp:[127.0.0.1]:10024 ++# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_reject_unlisted_recipient=no ++# -o smtpd_client_restrictions=$mua_client_restrictions ++# -o smtpd_helo_restrictions=$mua_helo_restrictions ++# -o smtpd_sender_restrictions=$mua_sender_restrictions ++# -o smtpd_recipient_restrictions= ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject ++# -o milter_macro_daemon_name=ORIGINATING + #628 inet n - n - - qmqpd + pickup unix n - n 60 1 pickup + cleanup unix n - n - 0 cleanup +@@ -69,6 +76,26 @@ lmtp unix - - n anvil unix - - n - 1 anvil scache unix - - n - 1 scache postlog unix-dgram n - n - 1 postlogd @@ -49,7 +95,7 @@ Index: conf/master.cf # # ==================================================================== # Interfaces to non-Postfix software. Be sure to examine the manual -@@ -102,7 +128,7 @@ postlog unix-dgram n - n +@@ -102,7 +129,7 @@ postlog unix-dgram n - n # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe @@ -58,7 +104,7 @@ Index: conf/master.cf # # ==================================================================== # -@@ -135,3 +161,10 @@ postlog unix-dgram n - n +@@ -135,3 +162,10 @@ postlog unix-dgram n - n #mailman unix - n n - - pipe # flags=FRX user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py # ${nexthop} ${user} diff --git a/postfix-mysql.tar.bz2 b/postfix-mysql.tar.bz2 index ca56c2f..d4b7a7d 100644 --- a/postfix-mysql.tar.bz2 +++ b/postfix-mysql.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d03df46c3c5e5842cfef7138d81d8584bc917f03428d2449a94a2a854fdf423b -size 3243 +oid sha256:3be757b4857bb888c6cf56b464147d451e1188c665f844582281f29b9ba2a914 +size 3274 diff --git a/postfix.changes b/postfix.changes index b8c64d6..a4037c8 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Jun 23 22:28:52 UTC 2021 - Christian Wittmer + +- postfix-mysql + * add mysql_relay_recipient_maps.cf +- postfix-SUSE + * rework sysconfig.postfix, add + - POSTFIX_RELAY_RECIPIENTS + - POSTFIX_BACKUPMX + * add relay_recipients + * rework config.postfix for main.cf + - is_backupmx + - relay_recipient_maps + ------------------------------------------------------------------- Fri Jun 18 17:11:05 UTC 2021 - Callum Farmer @@ -16,6 +30,15 @@ Mon Jun 14 15:46:54 UTC 2021 - Michael Ströder * Typo (introduced: Postfix 3.4): silent_discard should be silent-discard in BDAT_README. +------------------------------------------------------------------- +Sun Jun 6 12:51:35 UTC 2021 - Christian Wittmer + +- fix postfix-master.cf.patch + * set correct indentation (again) for options of + - submission (needs 3 spaces) + - smtps (needs 4 spaces) + to make config.postfix work nicely again + ------------------------------------------------------------------- Wed Jun 2 00:26:36 UTC 2021 - Marcus Rueckert diff --git a/postfix.spec b/postfix.spec index bc2dc17..927007a 100644 --- a/postfix.spec +++ b/postfix.spec @@ -299,6 +299,7 @@ install -m 644 %{name}-SUSE/permissions %{buildroot}%{_sysconfdir}/permissions.d install -m 644 %{name}-SUSE/sender_canonical %{buildroot}%{_sysconfdir}/%{name}/sender_canonical install -m 644 %{name}-SUSE/relay %{buildroot}%{_sysconfdir}/%{name}/relay install -m 644 %{name}-SUSE/relay_ccerts %{buildroot}%{_sysconfdir}/%{name}/relay_ccerts +install -m 644 %{name}-SUSE/relay_recipients %{buildroot}%{_sysconfdir}/%{name}/relay_recipients install -m 600 %{name}-SUSE/sasl_passwd %{buildroot}%{_sysconfdir}/%{name}/sasl_passwd mkdir -p %{buildroot}%{_sysconfdir}/sasl2 install -m 600 %{name}-SUSE/smtpd.conf %{buildroot}%{_sysconfdir}/sasl2/smtpd.conf @@ -490,6 +491,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/master.cf %config(noreplace) %{_sysconfdir}/%{name}/relay %config(noreplace) %{_sysconfdir}/%{name}/relay_ccerts +%config(noreplace) %{_sysconfdir}/%{name}/relay_recipients %config(noreplace) %{_sysconfdir}/%{name}/sasl_passwd %config(noreplace) %{_sysconfdir}/%{name}/sender_canonical %config(noreplace) %{_sysconfdir}/%{name}/virtual