Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2026-11-05 18:19:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new.3759290 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfix" Thu Nov 5 18:19:16 2026 rev:281 rq:1394788 version:3.11.7 Changes: -------- +++ only whitespace diff in changes, re-diffing --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2026-10-24 22:03:30.154783452 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new.3759290/postfix.changes 2026-11-05 18:19:21.453302316 +0100 @@ -1,0 +2,13 @@ +Tue Oct 27 20:38:42 UTC 2026 - [email protected] + +- config.postfix: + * Fix timezone + * /usr/sbin/postconf: fatal: -e, -X, or -# accepts no multi-line input + * master.cf generation +- update patches + * postfix-main.cf.patch + * postfix-master.cf.patch +- rebase patch + * postfix-vda-v14-3.0.3.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ postfix.spec: same change ++++++ postfix-config.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-config/config.postfix new/postfix-config/config.postfix --- old/postfix-config/config.postfix 2026-08-10 23:00:25.528764551 +0200 +++ new/postfix-config/config.postfix 2026-10-27 20:50:38.518642910 +0100 @@ -40,7 +40,7 @@ printf 'copying missing %s from %s\n' "${dst}" "${i}" cp -afL "${i}" "${dst}" elif [[ ! -d "${dst}" ]] && [[ "${i}" -nt "${dst}" ]] || [[ "${i}" -ot "${dst}" ]]; then - printf 'updating %s from %si\n' "${dst}" "${i}" + printf 'updating %s from %s\n' "${dst}" "${i}" cp -afL "${i}" "${dst}" fi done @@ -290,6 +290,7 @@ if [[ -L /etc/localtime ]]; then # switch back to symlink because of Invalid cross-device link LOCALTIME_READLINK=$(readlink /etc/localtime) + cpifnewer "/usr/share/zoneinfo/*" usr/share/zoneinfo cp -af "${LOCALTIME_READLINK}" "${LOCALTIME_READLINK#/}" ln -sf .."${LOCALTIME_READLINK}" etc/localtime else @@ -548,45 +549,61 @@ $PCONF -e "smtpd_helo_required = yes" $PCONF -e "strict_rfc821_envelopes = no" if [ -n "$POSTFIX_SMTPD_CLIENT_RESTRICTIONS" ]; then - s_clnt_restrictions=${POSTFIX_SMTPD_CLIENT_RESTRICTIONS/\ \+/,/ } + # /usr/sbin/postconf: fatal: -e, -X, or -# accepts no multi-line input + s_clnt_restrictions=$( + printf '%s\n' "${POSTFIX_SMTPD_CLIENT_RESTRICTIONS}" | + sed -E ':a;N;$!ba; s/^[[:space:],]+//; s/[[:space:],]+$//; s/[[:blank:]]*,?[[:blank:]]*\n[[:blank:]]*/, /g' + ) else - echo 1>&2 "No smtpd_client_restrictions defined ... setting to medium ..." - s_clnt_restrictions="reject_unauth_pipelining, reject_unknown_client" + echo 1>&2 "No smtpd_client_restrictions defined ... setting to medium ..." + s_clnt_restrictions="reject_unauth_pipelining, reject_unknown_client" fi if [ -n "$POSTFIX_RBL_HOSTS" ]; then - rblhosts=${POSTFIX_RBL_HOSTS//,/ } - maps_rbl="" - for i in $rblhosts; do - if [ -z "$maps_rbl" ]; then - maps_rbl="reject_rbl_client $i" - else - maps_rbl="$maps_rbl, reject_rbl_client $i" - fi - done - $PCONF -e "smtpd_client_restrictions = $s_clnt_restrictions, $maps_rbl" + rblhosts=${POSTFIX_RBL_HOSTS//,/ } + maps_rbl="" + for i in $rblhosts; do + if [ -z "$maps_rbl" ]; then + maps_rbl="reject_rbl_client $i" + else + maps_rbl="$maps_rbl, reject_rbl_client $i" + fi + done + $PCONF -e "smtpd_client_restrictions = $s_clnt_restrictions, $maps_rbl" else - $PCONF -e "smtpd_client_restrictions = $s_clnt_restrictions" + $PCONF -e "smtpd_client_restrictions = $s_clnt_restrictions" fi if [ -n "$POSTFIX_SMTPD_HELO_RESTRICTIONS" ]; then - helo_restrictions=${POSTFIX_SMTPD_HELO_RESTRICTIONS/\ \+/,/ } - $PCONF -e "smtpd_helo_restrictions = $helo_restrictions" + # /usr/sbin/postconf: fatal: -e, -X, or -# accepts no multi-line input + helo_restrictions=$( + printf '%s\n' "${POSTFIX_SMTPD_HELO_RESTRICTIONS}" | + sed -E ':a;N;$!ba; s/^[[:space:],]+//; s/[[:space:],]+$//; s/[[:blank:]]*,?[[:blank:]]*\n[[:blank:]]*/, /g' + ) + $PCONF -e "smtpd_helo_restrictions = $helo_restrictions" else - $PCONF -e "smtpd_helo_restrictions = reject_unauth_pipelining, reject_unknown_client" + $PCONF -e "smtpd_helo_restrictions = reject_unauth_pipelining, reject_unknown_client" fi if [ -n "$POSTFIX_SMTPD_SENDER_RESTRICTIONS" ]; then - sender_restrictions=${POSTFIX_SMTPD_SENDER_RESTRICTIONS/\ \+/,/ } - $PCONF -e "smtpd_sender_restrictions = $sender_restrictions" + # /usr/sbin/postconf: fatal: -e, -X, or -# accepts no multi-line input + sender_restrictions=$( + printf '%s\n' "${POSTFIX_SMTPD_SENDER_RESTRICTIONS}" | + sed -E ':a;N;$!ba; s/^[[:space:],]+//; s/[[:space:],]+$//; s/[[:blank:]]*,?[[:blank:]]*\n[[:blank:]]*/, /g' + ) + $PCONF -e "smtpd_sender_restrictions = $sender_restrictions" else - $PCONF -e "smtpd_sender_restrictions = $DEF_DB_TYPE:/etc/postfix/access, reject_unknown_sender_domain" + $PCONF -e "smtpd_sender_restrictions = $DEF_DB_TYPE:/etc/postfix/access, reject_unknown_sender_domain" fi if [ -n "$POSTFIX_SMTPD_RECIPIENT_RESTRICTIONS" ]; then - rcpt_restrictions=${POSTFIX_SMTPD_RECIPIENT_RESTRICTIONS/\ \+/,/ } + # /usr/sbin/postconf: fatal: -e, -X, or -# accepts no multi-line input + rcpt_restrictions=$( + printf '%s\n' "${POSTFIX_SMTPD_RECIPIENT_RESTRICTIONS}" | + sed -E ':a;N;$!ba; s/^[[:space:],]+//; s/[[:space:],]+$//; s/[[:blank:]]*,?[[:blank:]]*\n[[:blank:]]*/, /g' + ) fi if [ -z "$POSTFIX_SMTPD_RECIPIENT_RESTRICTIONS" ]; then - echo 1>&2 "No smtp_recipient_restrictions defined ... setting to medium ..." - $PCONF -e "smtpd_recipient_restrictions = permit_mynetworks, reject_unauth_destination" + echo 1>&2 "No smtp_recipient_restrictions defined ... setting to medium ..." + $PCONF -e "smtpd_recipient_restrictions = permit_mynetworks, reject_unauth_destination" else - $PCONF -e "smtpd_recipient_restrictions = $rcpt_restrictions" + $PCONF -e "smtpd_recipient_restrictions = $rcpt_restrictions" fi ;; *) @@ -1106,6 +1123,12 @@ } else { $line = " ".$1; } + } elsif ( /^\#?\s\s(-o\s+smtp_tls_security_level=.*)/ ) { + if ( $use_amavis ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } ## end amavis } elsif( /^\#?\s*(local\s+unix.*)/ ) { if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } @@ -1135,12 +1158,24 @@ } else { $line = " ".$1; } + } elsif( /^\#?\s{3}(-o\s+smtpd_forbid_unauth_pipelining=.*)/ ) { + if ( $tlsserver ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } } elsif( /^\#?\s{3}(-o\s+smtpd_tls_security_level=.*)/ ) { if ( $tlsserver ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } + } elsif( /^\#?\s{3}(-o\s+content_filter=.*)/ ) { + if ( $tlsserver eq "yes" && $use_amavis eq "yes") { + $line = " ".$1; + } else { + $line = "# ".$1; + } } elsif( /^\#?\s{3}(-o\s+smtpd_sasl_auth_enable=.*)/ ) { if ( $tlsserver eq "yes" && $authserver eq "yes") { $line = " ".$1; @@ -1153,14 +1188,14 @@ } else { $line = "# ".$1; } - } elsif( /^\#?\s{3}(-o\s+smtpd_relay_restrictions=.*)/ ) { + } elsif( /^\#?\s{3}(-o\s+smtpd_relay_restrictions=.*)/ ) { if ( $tlsserver ne "yes" ) { $line = "# ".$1; } else { $line = " ".$1; } ## end submission - ## smtps + ## submissions (smtps) } elsif( /^\#?\s*(smtps\s+inet.*?smtpd)/ ) { if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } if ( $sslserver ne "yes" ) { @@ -1181,6 +1216,12 @@ } else { $line = " ".$1; } + } elsif( /^\#?\s{4}(-o\s+smtpd_forbid_unauth_pipelining=.*)/ ) { + if ( $sslserver ne "yes" ) { + $line = "# ".$1; + } else { + $line = " ".$1; + } } elsif( /^\#?\s{4}(-o\s+smtpd_tls_wrappermode=.*)/ ) { if ( $sslserver ne "yes" ) { $line = "# ".$1; @@ -1205,7 +1246,7 @@ } else { $line = " ".$1; } - ## end smtps + ## end submissions (smtps) ## tlsmgr } elsif( /^\#?\s*(tlsmgr\s+unix.*)/ ) { if( defined $normalize->{$1} ) { next; } else { $normalize->{$1} = 1; } ++++++ postfix-main.cf.patch ++++++ --- /var/tmp/diff_new_pack.Tfdxnq/_old 2026-11-05 18:19:25.592472637 +0100 +++ /var/tmp/diff_new_pack.Tfdxnq/_new 2026-11-05 18:19:25.603473089 +0100 @@ -80,7 +80,7 @@ +masquerade_classes = envelope_sender, header_sender, header_recipient +masquerade_domains = +masquerade_exceptions = -+#myhostname = ++myhostname = +mydestination = $myhostname, localhost.$mydomain, localhost +mynetworks_style = subnet +#mynetworks = ++++++ postfix-master.cf.patch ++++++ --- /var/tmp/diff_new_pack.Tfdxnq/_old 2026-11-05 18:19:25.657475311 +0100 +++ /var/tmp/diff_new_pack.Tfdxnq/_new 2026-11-05 18:19:25.668475764 +0100 @@ -2,7 +2,7 @@ =================================================================== --- conf/master.cf.orig +++ conf/master.cf -@@ -10,6 +10,11 @@ +@@ -10,6 +10,12 @@ # (yes) (yes) (no) (never) (100) # ========================================================================== smtp inet n - n - - smtpd @@ -11,10 +11,11 @@ +# -o smtp_send_xforward_command=yes +# -o smtp_dns_support_level=disabled +# -o max_use=20 ++# -o smtp_tls_security_level=none #smtp inet n - n - 1 postscreen #smtpd pass - - n - - smtpd #dnsblog unix - - n - 0 dnsblog -@@ -17,34 +22,36 @@ smtp inet n - n +@@ -17,44 +23,46 @@ 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 @@ -27,11 +28,12 @@ -# -o smtpd_hide_client_session=yes -# -o smtpd_reject_unlisted_recipient=no +# -o syslog_name=postfix/submission -+# -o smtpd_forbid_unauth_pipelining=no ++# -o smtpd_forbid_unauth_pipelining=yes +# -o smtpd_tls_security_level=encrypt -+# -o content_filter=smtp:[127.0.0.1]:10024 ++# -o content_filter=amavis:[127.0.0.1]:10024 +# -o smtpd_sasl_auth_enable=yes +# -o smtpd_tls_auth_only=yes ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +# -o local_header_rewrite_clients=static:all +# -o smtpd_hide_client_session=yes +# -o smtpd_reject_unlisted_recipient=no @@ -48,12 +50,11 @@ +# -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 smtpd_recipient_restrictions=$mua_recipient_restrictions +# -o milter_macro_daemon_name=ORIGINATING # Choose one: enable submissions for loopback clients only, or for any client. #127.0.0.1:submissions inet n - n - - smtpd - #submissions inet n - n - - smtpd +-#submissions inet n - n - - smtpd -# -o syslog_name=postfix/submissions -# -o smtpd_forbid_unauth_pipelining=no -# -o smtpd_tls_wrappermode=yes @@ -61,18 +62,35 @@ -# -o local_header_rewrite_clients=static:all -# -o smtpd_hide_client_session=yes -# -o smtpd_reject_unlisted_recipient=no ++#smtps inet n - n - - smtpd +# -o syslog_name=postfix/submissions -+# -o smtpd_forbid_unauth_pipelining=no ++# -o smtpd_forbid_unauth_pipelining=yes +# -o smtpd_tls_wrappermode=yes -+# -o content_filter=smtp:[127.0.0.1]:10024 ++# -o content_filter=amavis:[127.0.0.1]:10024 +# -o smtpd_sasl_auth_enable=yes ++# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject +# -o local_header_rewrite_clients=static:all +# -o smtpd_hide_client_session=yes +# -o smtpd_reject_unlisted_recipient=no # Instead of specifying complex smtpd_<xxx>_restrictions here, # specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions" # here, and specify mua_<xxx>_restrictions in main.cf (where -@@ -83,6 +90,26 @@ lmtp unix - - n + # "<xxx>" is "client", "helo", "sender", "relay", or "recipient"). +-# -o smtpd_client_restrictions= +-# -o smtpd_helo_restrictions= +-# -o smtpd_sender_restrictions= +-# -o smtpd_relay_restrictions= +-# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject +-# -o milter_macro_daemon_name=ORIGINATING ++# -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=$mua_recipient_restrictions ++# -o milter_macro_daemon_name=ORIGINATING + #628 inet n - n - - qmqpd + pickup unix n - n 60 1 pickup + cleanup unix n - n - 0 cleanup +@@ -83,6 +91,26 @@ lmtp unix - - n anvil unix - - n - 1 anvil scache unix - - n - 1 scache postlog unix-dgram n - n - 1 postlogd @@ -99,7 +117,7 @@ # # ==================================================================== # Interfaces to non-Postfix software. Be sure to examine the manual -@@ -116,7 +143,7 @@ postlog unix-dgram n - n +@@ -116,7 +144,7 @@ postlog unix-dgram n - n # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe @@ -108,7 +126,7 @@ # # ==================================================================== # -@@ -149,3 +176,10 @@ postlog unix-dgram n - n +@@ -149,3 +177,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-vda-v14-3.0.3.patch ++++++ --- /var/tmp/diff_new_pack.Tfdxnq/_old 2026-11-05 18:19:25.802481278 +0100 +++ /var/tmp/diff_new_pack.Tfdxnq/_new 2026-11-05 18:19:25.816481854 +0100 @@ -19,7 +19,7 @@ =================================================================== --- src/global/mail_params.h.orig +++ src/global/mail_params.h -@@ -2620,6 +2620,54 @@ extern char *var_virt_uid_maps; +@@ -2742,6 +2742,54 @@ extern char *var_virt_uid_maps; #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; @@ -255,7 +255,7 @@ if (msg_verbose) msg_info("%s[%d]: set user_attr: %s, uid = %lu, gid = %lu", myname, state.level, usr_attr.mailbox, -@@ -285,10 +349,18 @@ int deliver_mailbox(LOCAL_STATE stat +@@ -285,10 +351,18 @@ int deliver_mailbox(LOCAL_STATE stat */ #define LAST_CHAR(s) (s[strlen(s) - 1])
