Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package postfix for openSUSE:Factory checked
in at 2021-07-02 13:26:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/postfix (Old)
and /work/SRC/openSUSE:Factory/.postfix.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfix"
Fri Jul 2 13:26:20 2021 rev:202 rq:902527 version:3.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2021-06-16
20:33:45.147008733 +0200
+++ /work/SRC/openSUSE:Factory/.postfix.new.2625/postfix.changes
2021-07-02 13:26:24.873250580 +0200
@@ -1,0 +2,19 @@
+Wed Jun 23 22:28:52 UTC 2021 - Christian Wittmer <ch...@computersalat.de>
+
+- 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 <gm...@opensuse.org>
+
+- Add now working CONFIG parameter to sysusers generator
+
+-------------------------------------------------------------------
@@ -12,0 +32,9 @@
+
+-------------------------------------------------------------------
+Sun Jun 6 12:51:35 UTC 2021 - Christian Wittmer <ch...@computersalat.de>
+
+- 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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ postfix.spec ++++++
--- /var/tmp/diff_new_pack.3k1BlX/_old 2021-07-02 13:26:25.977242014 +0200
+++ /var/tmp/diff_new_pack.3k1BlX/_new 2021-07-02 13:26:25.981241983 +0200
@@ -238,8 +238,8 @@
SHLIB_RPATH="-Wl,-rpath,%{pf_shlib_directory} -Wl,-z,relro,-z,now"
make %{?_smp_mflags}
# Create postfix user
-%sysusers_generate_pre %{SOURCE12} postfix
-%sysusers_generate_pre %{SOURCE13} vmail
+%sysusers_generate_pre %{SOURCE12} postfix postfix-user.conf
+%sysusers_generate_pre %{SOURCE13} vmail postfix-vmail-user.conf
# ---------------------------------------------------------------------------
%install
@@ -299,6 +299,7 @@
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 @@
%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
++++++ postfix-SUSE.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SUSE/config.postfix
new/postfix-SUSE/config.postfix
--- old/postfix-SUSE/config.postfix 2021-03-10 16:25:15.291653816 +0100
+++ new/postfix-SUSE/config.postfix 2021-06-24 00:22:12.589769519 +0200
@@ -262,6 +262,8 @@
# needed when for WITH_MYSQL
export POSTFIX_WITH_MYSQL
export POSTFIX_RELAY_DOMAINS
+ export POSTFIX_RELAY_RECIPIENTS
+ export POSTFIX_BACKUPMX
export DEF_DB_TYPE
MCF_DIR=$TMPDIR
export MCF_DIR
@@ -739,8 +741,15 @@
$with_mysql = lc($with_mysql);
+my $is_backupmx =
+ defined $ENV{POSTFIX_BACKUPMX} ? $ENV{POSTFIX_BACKUPMX} : "no";
+
+$is_backupmx = lc($is_backupmx);
+
my $pf_relay_domains = $ENV{POSTFIX_RELAY_DOMAINS};
+my $pf_relay_recipients = $ENV{POSTFIX_RELAY_RECIPIENTS};
+
my $def_db_type = $ENV{DEF_DB_TYPE};
open(MNCF,"<$mncf") || die "unable to open $mncf: $!";
@@ -754,7 +763,7 @@
} elsif ($with_ldap eq "yes" && $with_mysql ne "yes") {
$line = $1."$def_db_type:/etc/postfix/virtual
ldap:/etc/postfix/ldap_aliases.cf";
} elsif ($with_mysql eq "yes" && $with_ldap ne "yes") {
- $line = $1."$def_db_type:/etc/postfix/virtual
mysql:/etc/postfix/mysql_virtual_alias_maps.cf
mysql:/etc/postfix/mysql_virtual_alias_domain_maps.cf
mysql:/etc/postfix/mysql_virtual_alias_domain_catchall_maps.cf";
+ $line = $1."$def_db_type:/etc/postfix/virtual
mysql:/etc/postfix/mysql_virtual_alias_maps.cf
mysql:/etc/postfix/mysql_virtual_alias_domain_maps.cf
mysql:/etc/postfix/mysql_virtual_alias_domain_catchall_maps.cf";
} elsif ($with_mysql eq "yes" && $with_ldap eq "yes") {
$line = $1."$def_db_type:/etc/postfix/virtual
ldap:/etc/postfix/ldap_aliases.cf
mysql:/etc/postfix/mysql_virtual_alias_maps.cf
mysql:/etc/postfix/mysql_virtual_alias_domain_maps.cf
mysql:/etc/postfix/mysql_virtual_alias_domain_catchall_maps.cf";
}
@@ -836,6 +845,16 @@
} else {
$line = $1."\$mydestination $def_db_type:/etc/postfix/relay
mysql:/etc/postfix/mysql_relay_domains_maps.cf $pf_relay_domains";
}
+ } elsif ( /^(relay_recipient_maps\s=\s).*/ ) {
+ if ($is_backupmx ne "yes") {
+ $line = $1."hash:/etc/postfix/relay_recipients";
+ } elsif ($with_mysql ne "yes") {
+ $line = $1."hash:/etc/postfix/relay_recipients";
+ } elsif ($with_mysql eq "yes") {
+ $line = $1."hash:/etc/postfix/relay_recipients
mysql:/etc/postfix/mysql_relay_recipient_maps.cf $pf_relay_recipients";
+ } else {
+ $line = $1."hash:/etc/postfix/relay_recipients
$pf_relay_recipients";
+ }
} else {
$line = $_;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SUSE/relay_recipients
new/postfix-SUSE/relay_recipients
--- old/postfix-SUSE/relay_recipients 1970-01-01 01:00:00.000000000 +0100
+++ new/postfix-SUSE/relay_recipients 2021-06-24 00:15:31.470653294 +0200
@@ -0,0 +1,2 @@
+# for relaying user@domain
+# u...@domain.de OK
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SUSE/sysconfig.postfix
new/postfix-SUSE/sysconfig.postfix
--- old/postfix-SUSE/sysconfig.postfix 2021-01-27 16:11:35.035521646 +0100
+++ new/postfix-SUSE/sysconfig.postfix 2021-06-24 00:14:22.166810833 +0200
@@ -181,7 +181,7 @@
# within the directory /etc/postfix. Optionally a file mode can be appended
# using a colon as separator
#
-POSTFIX_MAP_LIST="virtual transport access canonical sender_canonical
relocated sasl_passwd:600 relay_ccerts helo_access relay"
+POSTFIX_MAP_LIST="virtual transport access canonical sender_canonical
relocated sasl_passwd:600 relay_ccerts helo_access relay relay_recipients"
## Type: string
## Default: ""
@@ -194,6 +194,26 @@
POSTFIX_RELAY_DOMAINS=""
## Type: string
+## Default: ""
+# Defaults by config.postfix:
+# without MySQL: hash:/etc/postfix/relay_recipients
+# with MySQL and Backup MX: hash:/etc/postfix/virtual
mysql:/etc/postfix/mysql_relay_recipient_maps.cf
+#
+# It is not used when POSTFIX_BACKUPMX="no"
+#
+# Here you can add further *maps.cf files if needed
+#
+POSTFIX_RELAY_RECIPIENTS=""
+
+## Type: yesno
+## Default: yes
+## Config: postfix
+#
+# Set this to 'yes' when this MTA is acting as Backup MX
+#
+POSTFIX_BACKUPMX="no"
+
+## Type: string
## Default: lmdb:/etc/postfix/transport
#
# The list of transport_maps postfix should look for
++++++ postfix-main.cf.patch ++++++
--- /var/tmp/diff_new_pack.3k1BlX/_old 2021-07-02 13:26:26.113240959 +0200
+++ /var/tmp/diff_new_pack.3k1BlX/_new 2021-07-02 13:26:26.117240928 +0200
@@ -50,7 +50,7 @@
# 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 @@
+# 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
++++++ postfix-master.cf.patch ++++++
--- /var/tmp/diff_new_pack.3k1BlX/_old 2021-07-02 13:26:26.125240866 +0200
+++ /var/tmp/diff_new_pack.3k1BlX/_new 2021-07-02 13:26:26.125240866 +0200
@@ -14,15 +14,61 @@
#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 @@
#
# ====================================================================
# 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 @@
#
# ====================================================================
#
-@@ -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}
++++++ postfix-mysql.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-mysql/mysql_relay_recipient_maps.cf
new/postfix-mysql/mysql_relay_recipient_maps.cf
--- old/postfix-mysql/mysql_relay_recipient_maps.cf 1970-01-01
01:00:00.000000000 +0100
+++ new/postfix-mysql/mysql_relay_recipient_maps.cf 2021-06-24
00:11:39.359180452 +0200
@@ -0,0 +1,5 @@
+user = postfix
+password = postfix
+hosts = your.mx.mail.domain
+dbname = postfix
+query = SELECT goto FROM alias WHERE address='%s' AND active='1'
