Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sendmail for openSUSE:Factory
checked in at 2021-01-29 14:56:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sendmail (Old)
and /work/SRC/openSUSE:Factory/.sendmail.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sendmail"
Fri Jan 29 14:56:30 2021 rev:100 rq:867124 version:8.16.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sendmail/sendmail.changes 2020-11-02
09:37:52.737465160 +0100
+++ /work/SRC/openSUSE:Factory/.sendmail.new.28504/sendmail.changes
2021-01-29 14:56:49.265485027 +0100
@@ -1,0 +2,13 @@
+Wed Jan 27 09:21:03 UTC 2021 - Dr. Werner Fink <wer...@suse.de>
+
+- Move SMTPD_LISTEN_REMOTE hack into valid code of update script
+- Change location of update script in fillup/sysconfig files
+
+-------------------------------------------------------------------
+Tue Jan 26 18:32:51 UTC 2021 - Dr. Werner Fink <wer...@suse.de>
+
+- Add better support for IPv6
+- Fix bug in udage of fillup_only macro to get sysconfig file for
+ sendmail written by fillup
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.RNDqz0/_old 2021-01-29 14:56:51.205487881 +0100
+++ /var/tmp/diff_new_pack.RNDqz0/_new 2021-01-29 14:56:51.209487887 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sendmail
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -549,7 +549,7 @@
%if %{with sysvinit}
%{fillup_and_insserv -nY sendmail sendmail}
%else
-%{fillup_only -an sendmail}
+%{fillup_only -n sendmail}
%service_add_post sendmail.service sendmail-client.service sendmail-client.path
PATH=bin:usr/bin:$PATH
if type -p systemctl > /dev/null 2>&1 ; then
++++++ sendmail-suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sendmail-suse/suse/permissions
new/sendmail-suse/suse/permissions
--- old/sendmail-suse/suse/permissions 2020-10-27 15:37:24.000000000 +0100
+++ new/sendmail-suse/suse/permissions 2020-06-10 15:22:03.992862297 +0200
@@ -3,7 +3,10 @@
/etc/init.d/sendmail root:root 0744
/etc/mail/auth/ root:root 0750
/etc/mail/certs/ root:root 0750
+/var/spool/clientmqueue/ mail:mail 0770
/var/spool/mqueue/ root:root 0700
-/usr/libexec/sendmail.d/bin/ root:root 0755
-/usr/libexec/sendmail.d/bin/smrsh root:root 0511
-/usr/libexec/sendmail.d/bin/mail.local root:root 0511
+/var/spool/mail root:root 1777
+/usr/lib/sendmail.d/bin/ root:root 0755
+/usr/lib/sendmail.d/bin/smrsh root:root 0511
+/usr/lib/sendmail.d/bin/mail.local root:root 0511
+/var/run/sendmail root:root 1750
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sendmail-suse/suse/permissions.paranoid
new/sendmail-suse/suse/permissions.paranoid
--- old/sendmail-suse/suse/permissions.paranoid 2020-10-27 15:37:18.000000000
+0100
+++ new/sendmail-suse/suse/permissions.paranoid 2020-06-10 15:22:01.609098276
+0200
@@ -3,7 +3,10 @@
/etc/init.d/sendmail root:root 0744
/etc/mail/auth/ root:root 0750
/etc/mail/certs/ root:root 0750
+/var/spool/clientmqueue/ mail:mail 0750
/var/spool/mqueue/ root:root 0700
-/usr/libexec/sendmail.d/bin/ root:root 0755
-/usr/libexec/sendmail.d/bin/smrsh root:root 0511
-/usr/libexec/sendmail.d/bin/mail.local root:root 0511
+/var/spool/mail root:root 1755
+/usr/lib/sendmail.d/bin/ root:root 0755
+/usr/lib/sendmail.d/bin/smrsh root:root 0511
+/usr/lib/sendmail.d/bin/mail.local root:root 0511
+/var/run/sendmail root:root 1750
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sendmail-suse/suse/sysconfig.mail-sendmail
new/sendmail-suse/suse/sysconfig.mail-sendmail
--- old/sendmail-suse/suse/sysconfig.mail-sendmail 2017-11-29
11:17:49.000000000 +0100
+++ new/sendmail-suse/suse/sysconfig.mail-sendmail 2021-01-27
09:51:42.261759160 +0100
@@ -1,8 +1,8 @@
-## Path: Network/Mail/General
-## Description: General configuration of mail interface
-## Type: yesno
-## Default: yes
-## Config: sendmail,postfix
+## Path: Network/Mail/General
+## Description: General configuration of mail interface
+## Type: yesno
+## Default: yes
+## Config: sendmail,postfix
#
# Set this to no, if /usr/lib/sendmail.d/update should not generate the
# configuration # files (e.g. you want to generate your /etc/sendmail.cf
@@ -12,18 +12,18 @@
#
MAIL_CREATE_CONFIG="yes"
-## Type: string
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# From:-Line in email and News postings
# (otherwise the FQDN is used)
#
FROM_HEADER=""
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
#
# Set this to "yes" if mails from remote should be accepted
# this is necessary for any mail server.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sendmail-suse/suse/sysconfig.sendmail
new/sendmail-suse/suse/sysconfig.sendmail
--- old/sendmail-suse/suse/sysconfig.sendmail 2013-10-01 12:40:29.000000000
+0200
+++ new/sendmail-suse/suse/sysconfig.sendmail 2021-01-27 09:53:08.772096987
+0100
@@ -1,10 +1,10 @@
-## Path: Network/Mail/Sendmail
-## Description: Configuration of sendmail
-## Type: string
-## Default: ""
-## Config: sendmail
-## ServiceReload: sendmail
-## Command: /usr/lib/sendmail.d/update
+## Path: Network/Mail/Sendmail
+## Description: Configuration of sendmail
+## Type: string
+## Default: ""
+## Config: sendmail
+## ServiceReload: sendmail
+## Command: /usr/libexec/sendmail.d/update
#
# smarthost - this host gets all outgoing email from us
# normally used for uucp-connected sites or for dialup connections
@@ -12,9 +12,9 @@
#
SENDMAIL_SMARTHOST=""
-## Type: string(localhost)
-## Default: localhost
-## Command: /usr/lib/sendmail.d/update
+## Type: string(localhost)
+## Default: localhost
+## Command: /usr/libexec/sendmail.d/update
#
# sendmail assumes the following space-separated host-names to be
# the local host (this must just be used for names differrent to the
@@ -35,18 +35,18 @@
#
SENDMAIL_LOCALHOST="localhost"
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
# enable this to change also the recipient address.
# Don't use this feature, if you don't have the full /etc/aliases
# and the full /etc/passwd on your host.
#
SENDMAIL_ALLMASQUERADE="no"
-## Type: string
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# do not deliver any email locally, but send all email to another host
# this can just be used with another system that has the same users on it
@@ -54,9 +54,9 @@
#
SENDMAIL_RELAY=""
-## Type: string
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# Used if no SENDMAIL_RELAY is defined to place all mails for unknown local
# names or unknown local aliases to the configured user name.
@@ -66,9 +66,9 @@
#
SENDMAIL_LUSER=""
-## Type: yesno
-## Default: yes
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: yes
+## Command: /usr/libexec/sendmail.d/update
#
# Turns on the access database feature. The access db gives you the ability
# to allow or refuse to accept mail from specified domains for administrative
@@ -80,9 +80,9 @@
#
USE_ACCESS_DB="yes"
-## Type: string
-## Default: "-L sendmail -Am -bd -q30m -om"
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: "-L sendmail -Am -bd -q30m -om"
+## Command: /usr/libexec/sendmail.d/update
#
# with what parameters should sendmail be started?
# normal sites use "-Am -bd -q30m -om".
@@ -95,9 +95,9 @@
#
SENDMAIL_ARGS="-L sendmail -Am -bd -q30m -om"
-## Type: string
-## Default: "-L sendmail-client -Ac -qp1m"
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: "-L sendmail-client -Ac -qp1m"
+## Command: /usr/libexec/sendmail.d/update
#
# with what parameters should sendmail _client_ be started?
# This is used to start the sendmail client daemon which runs as user
@@ -112,18 +112,18 @@
#
SENDMAIL_CLIENT_ARGS="-L sendmail-client -Ac -qp1m"
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
#
# sendmail will only queue email in /var/spool/mqueue and will only start
# to deliver it if "sendmail -q" is run
#
SENDMAIL_EXPENSIVE="no"
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
#
# sendmail will not try to canonify hostnames in your email
# so much less DNS-queries are send
@@ -135,9 +135,9 @@
#
SENDMAIL_NOCANONIFY="no"
-## Type: string
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# A null client is a machine that can only send mail. It receives no
# mail from the network, and it does not deliver any mail locally.
@@ -147,9 +147,9 @@
#
NULLCLIENT=""
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
#
# This option mostly forbids DNS-queries. It requires a well configured
# /etc/hosts. Sendmail users should also read /etc/sysconfig/sendmail
@@ -160,9 +160,9 @@
#
NODNS="no"
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
#
# If set to yes, mail that will be delivered via smtp will stay
# in the queue unless someone issues "sendmail -q" or equivalent.
@@ -170,18 +170,18 @@
#
DIALUP="no"
-## Type: string
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# these domains can additional to the local domains be changed
# in /etc/mail/genericstable
#
SENDMAIL_GENERICS_DOMAIN=""
-## Type: string
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# this is useful if you have several domains with disjoint namespaces
# hosted on the same machine. Include them as space-separated list
@@ -197,9 +197,9 @@
#
MASQUERADE_DOMAINS=""
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
#
# this is usefull if FROM_HEADER is set and you want to replay all
# all names within MASQUERADE_DOMAINS even if some names with several
@@ -207,9 +207,9 @@
#
MASQUERADE_ENTIRE_DOMAIN="no"
-## Type: yesno
-## Default: no
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: no
+## Command: /usr/libexec/sendmail.d/update
#
# map (un)qualified domains to qualified domains in mail headers.
# This can be used to provide domain name mapping in the file
@@ -219,9 +219,9 @@
#
DOMAINTABLE="no"
-## Type: list(gssapi,otp,digest-md5,cram-md5,plain,login,all)
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: list(gssapi,otp,digest-md5,cram-md5,plain,login,all)
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# enable SMTP AUTHENTICATION to other servers if required, possible
# values are e.g. plain, gssapi, digest-md5, and cram-md5.
@@ -234,9 +234,9 @@
#
SMTP_AUTH_MECHANISMS=""
-## Type: list(gssapi,otp,digest-md5,cram-md5,plain,login,all)
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: list(gssapi,otp,digest-md5,cram-md5,plain,login,all)
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# enable SMTP AUTHENTICATION as a server, for an explanation read
# /usr/share/sendmail/README, /usr/share/doc/packages/sendmail/op.txt.bz2,
@@ -249,9 +249,9 @@
#
SMTP_AUTH_SERVER=""
-## Type: list(server,client,both)
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: list(server,client,both)
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# STARTTLS certification, for an explanation read
# /usr/share/doc/packages/sendmail/op.txt.bz2 and
@@ -264,9 +264,9 @@
#
STARTTLS=""
-## Type: yesno
-## Default: yes
-## Command: /usr/lib/sendmail.d/update
+## Type: yesno
+## Default: yes
+## Command: /usr/libexec/sendmail.d/update
#
# Normally all upper case letters of the keys in the db files of sendmail
# will be folded to lower case. You may change this to "no" and break the
@@ -274,9 +274,9 @@
#
SENDMAIL_DB_FOLD="yes"
-## Type: string
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: string
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# Use real-time black-hole lists. Sendmail will refuse to receive mail from
# any IP number which is listed in any of the RBL lookups given here.
@@ -291,7 +291,7 @@
## Type: integer(1000000:10000000)
## Default: 2000000
-## Command: /usr/lib/sendmail.d/update
+## Command: /usr/libexec/sendmail.d/update
#
# The maximum size of UUCP mesages in bytes. For real modem connection this
# should not more than 1MB. For ISDN/DSL you may choose much more if the
@@ -302,7 +302,7 @@
## Type: integer(1:50000)
## Default: 25
-## Command: /usr/lib/sendmail.d/update
+## Command: /usr/libexec/sendmail.d/update
#
# The standard port for Simple Mail Transfer Protocol (SMTP).
# This is the default port for any local and remote mail
@@ -310,20 +310,20 @@
#
SENDMAIL_MTA_PORT=25
-## Type: list("",a,b,c,f,s,u,A,C,E,O,S)
-## Default: ""
-## Command: /usr/lib/sendmail.d/update
+## Type: list("",a,b,c,f,s,u,A,C,E,O,S)
+## Default: ""
+## Command: /usr/libexec/sendmail.d/update
#
# Add one or more Modifier characters to the standard SENDMAIL_MTA_PORT
# For a reference read /usr/share/doc/packages/sendmail/op.txt.bz2 or
# /usr/share/doc/packages/sendmail/op.ps.bz2 the part about the
# DaemonPortOptions=options.
#
-SENDMAIL_MTA_MODIFIER=
+SENDMAIL_MTA_MODIFIER=""
## Type: integer(1:50000)
## Default: 587
-## Command: /usr/lib/sendmail.d/update
+## Command: /usr/libexec/sendmail.d/update
#
# Used if STARTTLS is set to `server' or `both'. Accordingly to RFC 6409
# this is the submission port for the (Extended) Simple Mail Transfer Protocol
@@ -332,3 +332,12 @@
# as by the and of 1998, this was revoked when STARTTLS had been specified.
#
SENDMAIL_MTA_SSL_PORT=587
+
+## Type: yesno
+## Default: yes
+## Command: /usr/libexec/sendmail.d/update
+#
+# Nowadays IPv6 is common, therefore enable it
+#
+SENDMAIL_USE_IPV6="yes"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sendmail-suse/suse/update.sendmail
new/sendmail-suse/suse/update.sendmail
--- old/sendmail-suse/suse/update.sendmail 2017-11-29 11:13:04.000000000
+0100
+++ new/sendmail-suse/suse/update.sendmail 2021-01-27 10:14:47.119163513
+0100
@@ -127,8 +127,24 @@
if test -n "$SENDMAIL_MTA_MODIFIER" ; then
DAEMON_OPTIONS="${DAEMON_OPTIONS:+${DAEMON_OPTIONS},
}Modifier=${SENDMAIL_MTA_MODIFIER}"
fi
+ if test "$SMTPD_LISTEN_REMOTE" != yes ; then
+ if test "$SENDMAIL_USE_IPV6" = yes ; then
+ AddressV4="127.0.0.1"
+ AddressV6="::1"
+ else
+ Address="127.0.0.1"
+ fi
+ DAEMON_OPTIONS="${DAEMON_OPTIONS:+${DAEMON_OPTIONS}, }Addr="
+ fi
if test -n "$DAEMON_OPTIONS" ; then
- echo "DAEMON_OPTIONS(\`Name=MTA,${DAEMON_OPTIONS}')dnl"
+ if test "$SENDMAIL_USE_IPV6" = yes ; then
+ echo "DAEMON_OPTIONS(\`Name=MTA-v4, Family=inet,
${DAEMON_OPTIONS}${AddressV4+"$AddressV4"}')dnl"
+ echo "DAEMON_OPTIONS(\`Name=MTA-v6, Family=inet6,
${DAEMON_OPTIONS}${AddressV6+"$AddressV6"}')dnl"
+ else
+ echo "DAEMON_OPTIONS(\`Name=MTA,
${DAEMON_OPTIONS}${Address+"$Address"}')dnl"
+ fi
+ elif test "$SENDMAIL_USE_IPV6" = yes ; then
+ echo "define(\`_NETINET6_')dnl"
fi
if test "${USE_ACCESS_DB,,}" = yes ; then
echo "FEATURE(\`access_db', \`hash -T<TMPF> -o
/etc/mail/access.db')dnl"
++++++ sendmail.service ++++++
--- /var/tmp/diff_new_pack.RNDqz0/_old 2021-01-29 14:56:51.429488211 +0100
+++ /var/tmp/diff_new_pack.RNDqz0/_new 2021-01-29 14:56:51.433488216 +0100
@@ -31,11 +31,9 @@
ExecStartPre=-/bin/echo 'Initializing SMTP port (sendmail)'
ExecStartPre=-/etc/mail/system/sm.pre
Environment="SENDMAIL_ARGS=-L sendmail -Am -bd -q30m -om"
-Environment=SENDMAIL_PORT_OPTS=
EnvironmentFile=-/etc/sysconfig/mail
EnvironmentFile=-/etc/sysconfig/sendmail
-EnvironmentFile=-/var/run/sendmail/port
-ExecStart=/usr/sbin/sendmail $SENDMAIL_PORT_OPTS $SENDMAIL_ARGS
+ExecStart=/usr/sbin/sendmail $SENDMAIL_ARGS
ExecReload=/bin/kill -HUP $MAINPID
[Install]
++++++ sendmail.systemd ++++++
--- /var/tmp/diff_new_pack.RNDqz0/_old 2021-01-29 14:56:51.449488240 +0100
+++ /var/tmp/diff_new_pack.RNDqz0/_new 2021-01-29 14:56:51.449488240 +0100
@@ -35,25 +35,4 @@
test -d /var/run/sendmail || /bin/mkdir --mode 1750 /var/run/sendmail
#
-# Handle SMTPD_LISTEN_REMOTE from /etc/sysconfig/sendmail
-# that is write out environment file to be read by the
-# systemd service unit file for sendmail MTA.
-#
-if test ! -s $port -o $cfg -nt $port -o $sysconf -nt $port ; then
- . $sysconf
- umask 066
- if test "$SMTPD_LISTEN_REMOTE" != "yes" ; then
- PortOpts=$($sed -rn '/^O[[:blank:]]+DaemonPortOptions=.*Name=MTA.*$/I {
- s/[[:blank:]]+//g
- s/^O[^=]+=(.*)/\1/p
- }' $cfg)
- PortOpts="${PortOpts:+${PortOpts},}Addr=127.0.0.1"
- echo SENDMAIL_PORT_OPTS="\"-O DaemonPortOptions=${PortOpts}\""
- else
- echo SENDMAIL_PORT_OPTS="\"\""
- fi > $port
-
-fi
-
-#
# end of /etc/mail/system/sm.pre
