Hello community,
here is the log from the commit of package sendmail for openSUSE:Factory
checked in at Mon Aug 15 09:59:27 CEST 2011.
--------
--- sendmail/sendmail.changes 2011-05-31 12:18:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/sendmail/sendmail.changes 2011-08-12 16:49:26.000000000 +0200
@@ -1,0 +2,26 @@
+Fri Aug 12 14:47:38 UTC 2011 - werner@suse.de
+
+- Use Pre exec files for configuration on the fly
+
+-------------------------------------------------------------------
+Thu Aug 11 15:17:58 UTC 2011 - werner@suse.de
+
+- Socket activation does not work for sendmail even with -bs
+ on the command line of sendmail and StandardInput=socket
+
+-------------------------------------------------------------------
+Mon Aug 8 15:14:52 UTC 2011 - werner@suse.de
+
+- The approach of using makefiles requires make for sendmail
+
+-------------------------------------------------------------------
+Fri Aug 5 12:23:05 UTC 2011 - werner@suse.de
+
+- Make /var7run a ghost entry in spec as this is a tmpfs now and
+ create it at start of sendmail if it does not exist (bnc#710279)
+- First try of using systemd unit configration files for both
+ sendmail MTA and sendmail MT client. Try to start them on
+ demand using systemd unit socket files for both local and remote
+ network as well as systemd unit path file for local mail queue
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
sendmail-client.path
sendmail-client.service
sendmail-client.systemd
sendmail.service
sendmail.systemd
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.i3YSOd/_old 2011-08-15 09:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.i3YSOd/_new 2011-08-15 09:54:12.000000000 +0200
@@ -26,18 +26,26 @@
Group: Productivity/Networking/Email/Servers
PreReq: %fillup_prereq %insserv_prereq
PreReq: /bin/mv /bin/rm /bin/sed
+PreReq: permissions
+%if 0%{?suse_version} > 1130
PreReq: sysvinit(network) sysvinit(syslog)
+%endif
Provides: sendcf smailcfg smtp_daemon sendmail-tls
-Requires: filesystem procmail netcfg m4 /bin/fuser
+Requires: filesystem procmail netcfg m4 /bin/fuser make
Conflicts: smail postfix postfix-tls
Obsoletes: sendmail-tls
AutoReqProv: on
Version: 8.14.5
-Release: 1
+Release: 2
Summary: BSD Sendmail
Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail-%{version}.tar.bz2
Source1: FAQ.sendmail-8.14.bz2
Source2: sendmail-rpmlintrc
+Source3: sendmail-client.path
+Source4: sendmail.service
+Source5: sendmail-client.service
+Source6: sendmail.systemd
+Source7: sendmail-client.systemd
Patch0: sendmail-%{version}.dif
Patch1: sendmail-8.13.5-select.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -82,7 +90,7 @@
%package -n rmail
Version: 8.14.3
-Release: 61
+Release: 62
Summary: Rmail of the BSD Sendmail
License: PERMISSIVE-OSI-COMPLIANT
Group: Productivity/Networking/Email/Servers
@@ -105,7 +113,7 @@
set -f
cat <<-EOF > file-list
%%defattr(-,root,root)
- %%dir %%attr(1750,root,root) %{_localstatedir}/run/sendmail
+ %%ghost %%dir %%attr(1750,root,root) %{_localstatedir}/run/sendmail
%%dir %%attr(0750,root,root) %{_localstatedir}/lib/sendmail
%%attr(0600,root,root) %{_localstatedir}/lib/sendmail/statistics
%%attr(0600,root,root) %{_mailcnfdir}/statistics
@@ -175,6 +183,10 @@
mkdir -p %{buildroot}%{_mandir}/man5
mkdir -p %{buildroot}%{_mandir}/man8
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+%if 0%{?suse_version} > 1140
+ mkdir -p %{buildroot}/lib/systemd/system
+ mkdir -p %{buildroot}/%{_mailcnfdir}/system
+%endif
make \
DESTDIR=%{buildroot} \
SUBDIRS="%{SUBDIRS}" \
@@ -298,6 +310,17 @@
make DESTDIR=%{buildroot} short
PATH=$OPATH
popd
+%if 0%{?suse_version} > 1140
+ #
+ # systemd unit conf files
+ install -m 0644 %{S:3} %{buildroot}/lib/systemd/system/
+ install -m 0644 %{S:4} %{buildroot}/lib/systemd/system/
+ install -m 0644 %{S:5} %{buildroot}/lib/systemd/system/
+ install -m 0644 %{S:6} %{buildroot}/%{_mailcnfdir}/system/sm.pre
+ install -m 0644 %{S:7} %{buildroot}/%{_mailcnfdir}/system/sm-client.pre
+ chmod 0755 %{buildroot}/%{_mailcnfdir}/system/sm.pre
+ chmod 0755 %{buildroot}/%{_mailcnfdir}/system/sm-client.pre
+%endif
#
# Remove some files we don't wish to package
#
@@ -307,6 +330,20 @@
%clean
rm -rf %{buildroot}
+%if %{defined verify_permissions}
+%verifyscript
+%verify_permissions -e %{_localstatedir}/run/sendmail/
+%verify_permissions -e %{_localstatedir}/spool/mqueue/
+%verify_permissions -e %{_sysconfdir}/sendmail.cf
+%verify_permissions -e %{_sysconfdir}/init.d/sendmail
+%verify_permissions -e %{_mailcnfdir}/auth/
+%verify_permissions -e %{_mailcnfdir}/certs/
+%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/
+%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/mail.local
+%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/smrsh
+%verify_permissions -e %{_sbindir}/sendmail
+%endif
+
%pre
# Check for rc.config:
if test -f etc/rc.config ; then
@@ -361,9 +398,31 @@
fi
%{fillup_and_insserv -nY sendmail sendmail}
%{fillup_only -an mail}
+if test -x bin/systemctl ; then
+ bin/systemctl enable sendmail.service >/dev/null 2>&1 || :
+ bin/systemctl enable sendmail-client.service >/dev/null 2>&1 || :
+ bin/systemctl enable sendmail-client.path >/dev/null 2>&1 || :
+fi
+%if %{defined set_permissions}
+%set_permissions %{_localstatedir}/run/sendmail/
+%set_permissions %{_localstatedir}/spool/mqueue/
+%set_permissions %{_sysconfdir}/sendmail.cf
+%set_permissions %{_sysconfdir}/init.d/sendmail
+%set_permissions %{_mailcnfdir}/auth/
+%set_permissions %{_mailcnfdir}/certs/
+%set_permissions %{_prefix}/lib/sendmail.d/bin/
+%set_permissions %{_prefix}/lib/sendmail.d/bin/mail.local
+%set_permissions %{_prefix}/lib/sendmail.d/bin/smrsh
+%set_permissions %{_sbindir}/sendmail
+%endif
%preun
%{stop_on_removal sendmail}
+if test -x bin/systemctl ; then
+ bin/systemctl disable sendmail.service >/dev/null 2>&1 || :
+ bin/systemctl disable sendmail-client.service >/dev/null 2>&1 || :
+ bin/systemctl disable sendmail-client.path >/dev/null 2>&1 || :
+fi
%postun
%{restart_on_update sendmail}
@@ -376,6 +435,9 @@
# %dir %attr(0750,root,mail) %{_sysconfdir}/aliases.d
%dir %attr(0750,root,root) %{_mailcnfdir}/auth
%dir %attr(0750,root,root) %{_mailcnfdir}/certs
+%if 0%{?suse_version} > 1140
+%dir %attr(0750,root,root) %{_mailcnfdir}/system
+%endif
%config(noreplace) %{_sysconfdir}/sendmail.cf
# %{_sysconfdir}/aliases is part of netcfg
# %config(noreplace) %{_sysconfdir}/aliases
@@ -407,6 +469,13 @@
%config %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/sendmail
%config %attr(0744,root,root) %{_sysconfdir}/init.d/sendmail
%config %attr(0755,root,root) /sbin/conf.d/SuSEconfig.sendmail
+%if 0%{?suse_version} > 1140
+%config %attr(0644,root,root) /lib/systemd/system/sendmail-client.path
+%config %attr(0644,root,root) /lib/systemd/system/sendmail.service
+%config %attr(0644,root,root) /lib/systemd/system/sendmail-client.service
+%config %attr(0755,root,root) %{_mailcnfdir}/system/sm.pre
+%config %attr(0755,root,root) %{_mailcnfdir}/system/sm-client.pre
+%endif
%{_bindir}/hoststat
%{_bindir}/mailq
%{_bindir}/newaliases
++++++ uucp.spec ++++++
--- /var/tmp/diff_new_pack.i3YSOd/_old 2011-08-15 09:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.i3YSOd/_new 2011-08-15 09:54:12.000000000 +0200
@@ -26,7 +26,7 @@
Recommends: stunnel
AutoReqProv: on
Version: 1.07
-Release: 432
+Release: 433
Summary: Taylor UUCP
Source0: uucp-1.07.tar.bz2
Source1: uucpcfg.tar.bz2
++++++ sendmail-8.14.5.dif ++++++
--- /var/tmp/diff_new_pack.i3YSOd/_old 2011-08-15 09:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.i3YSOd/_new 2011-08-15 09:54:12.000000000 +0200
@@ -228,7 +228,7 @@
+divert(0)dnl
--- cf/m4/cfhead.m4
+++ cf/m4/cfhead.m4 2008-02-20 18:00:46.000000000 +0000
-@@ -303,6 +303,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_
+@@ -304,6 +304,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_
define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
define(`confMILTER_MACROS_EOM', `{msg_id}')
@@ -839,15 +839,6 @@
while (<CF>)
{
chomp;
---- devtools/M4/header.m4
-+++ devtools/M4/header.m4 2008-09-30 13:06:57.000000000 +0000
-@@ -34,3 +34,6 @@ define(`PUSHDIVERT', `pushdef(`__D__', d
- define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
- define(`APPENDDEF', `define(`$1', ifdef(`$1', `$1 $2', `$2'))')
- define(`PREPENDDEF', `define(`$1', ifdef(`$1', `$2 $1', `$2'))')
-+define(`REPLACEDEF', `define(`_$1', `esyscmd(`x='$1`;echo -n ${x//$2/$3}')')dnl
-+define(`$1', _$1)dnl
-+undefine(`_$1')')
--- devtools/M4/UNIX/manpage.m4
+++ devtools/M4/UNIX/manpage.m4 2007-04-05 13:33:07.000000000 +0000
@@ -69,7 +69,7 @@ ifdef(`confNO_MAN_INSTALL', `divert(-1)'
@@ -869,8 +860,17 @@
+ ${CC} -M ${O} ${COPTS} ${SRCS} >> Makefile
# End of $RCSfile: CC-M.m4,v $
+--- devtools/M4/header.m4
++++ devtools/M4/header.m4 2008-09-30 13:06:57.000000000 +0000
+@@ -34,3 +34,6 @@ define(`PUSHDIVERT', `pushdef(`__D__', d
+ define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
+ define(`APPENDDEF', `define(`$1', ifdef(`$1', `$1 $2', `$2'))')
+ define(`PREPENDDEF', `define(`$1', ifdef(`$1', `$2 $1', `$2'))')
++define(`REPLACEDEF', `define(`_$1', `esyscmd(`x='$1`;echo -n ${x//$2/$3}')')dnl
++define(`$1', _$1)dnl
++undefine(`_$1')')
--- devtools/Site/site.config.m4
-+++ devtools/Site/site.config.m4 2010-01-26 14:58:44.791429617 +0000
++++ devtools/Site/site.config.m4 2010-01-26 14:58:45.000000000 +0000
@@ -0,0 +1,158 @@
+dnl
+dnl Sendmail site file for SuSE Linux
@@ -1114,7 +1114,7 @@
the syntax.
.)f
Most messages are a sequence of
-@@ -1515,7 +1515,7 @@ The disk based host information is store
+@@ -1518,7 +1518,7 @@ The disk based host information is store
directory called
.b \&.hoststat \**.
.(f
@@ -1123,7 +1123,7 @@
.b HostStatusDirectory
option;
it can, of course, go anywhere you like in your filesystem.
-@@ -1566,7 +1566,7 @@ and sendmail knows about it,
+@@ -1569,7 +1569,7 @@ and sendmail knows about it,
will use the native version.
Ultrix, Solaris, and DEC OSF/1 are examples of such systems\**.
.(f
@@ -1132,7 +1132,7 @@
but since the APIs are apparently not available in the libraries
.i sendmail
does not use the native service switch in this release.
-@@ -1659,7 +1659,7 @@ will not have the desired effect
+@@ -1662,7 +1662,7 @@ will not have the desired effect
(except on prep.ai.MIT.EDU,
and they probably don't want me)\**.
.(f
@@ -1141,7 +1141,7 @@
will permit aliasing;
this is normally limited to the local mailer.
.)f
-@@ -1674,7 +1674,7 @@ are comments.
+@@ -1677,7 +1677,7 @@ are comments.
The second form is processed by the
.i ndbm \|(3)\**
.(f
@@ -1150,7 +1150,7 @@
.i gdbm
package does not work.
.)f
-@@ -1812,7 +1812,7 @@ Before
+@@ -1815,7 +1815,7 @@ Before
will access the database,
it checks to insure that this entry exists\**.
.(f
@@ -1159,7 +1159,7 @@
.b AliasWait
option is required in the configuration
for this action to occur.
-@@ -2235,7 +2235,7 @@ Some options have security implications.
+@@ -2238,7 +2238,7 @@ Some options have security implications.
Sendmail allows you to set these,
but relinquishes its set-user-ID or set-group-ID permissions thereafter\**.
.(f
@@ -1168,7 +1168,7 @@
thus, if you are executing as root,
as from root's crontab file or during system startup
the root permissions will still be honored.
-@@ -2603,7 +2603,7 @@ the time to wait for another command.
+@@ -2606,7 +2606,7 @@ the time to wait for another command.
The timeout waiting for a reply to an IDENT query
[5s\**, unspecified].
.(f
@@ -1177,7 +1177,7 @@
.)f
.ip lhlo
The wait for a reply to an LMTP LHLO command
-@@ -3852,7 +3852,7 @@ and
+@@ -3855,7 +3855,7 @@ and
is looked up in the host database(s)
and replaced by the canonical name\**.
.(f
@@ -1186,7 +1186,7 @@
completely equivalent
to $(host \fIhostname\fP$).
In particular, a
-@@ -3937,7 +3937,7 @@ part.
+@@ -3940,7 +3940,7 @@ part.
If the mailer is local
the host part may be omitted\**.
.(f
@@ -1195,7 +1195,7 @@
.q "per user"
extensions.
For example, in the address
-@@ -4678,7 +4678,7 @@ for interpolation into argv's for mailer
+@@ -4681,7 +4681,7 @@ for interpolation into argv's for mailer
or for other contexts.
The ones marked \(dg are information passed into sendmail\**,
.(f
@@ -1204,7 +1204,7 @@
all of these macros have reasonable defaults.
Previous versions required that they be defined.
.)f
-@@ -5204,7 +5204,7 @@ and then passing that to
+@@ -5208,7 +5208,7 @@ and then passing that to
.i gethostbyname (3)
which is supposed to return the canonical version of that host name.\**
.(f
@@ -1213,7 +1213,7 @@
.i gethostname
might return
.q foo
-@@ -5232,7 +5232,7 @@ it is imperative that the config file se
+@@ -5236,7 +5236,7 @@ it is imperative that the config file se
.b $j
to the fully qualified domain name\**.
.(f
@@ -1222,7 +1222,7 @@
.b $j
at all, so up until 8.6,
config files
-@@ -6929,7 +6929,7 @@ will run as this user.
+@@ -6933,7 +6933,7 @@ will run as this user.
Defaults to 1:1.
The value can also be given as a symbolic user name.\**
.(f
@@ -1231,7 +1231,7 @@
.b g
option has been combined into the
.b DefaultUser
-@@ -7659,7 +7659,7 @@ noactualrecipient Don't put X-Actual-Rec
+@@ -7663,7 +7663,7 @@ noactualrecipient Don't put X-Actual-Rec
which reveal the actual account that addresses map to.
.)b
.(f
@@ -1240,7 +1240,7 @@
the
.b noreceipts
flag turns off support for RFC 1891
-@@ -7899,7 +7899,7 @@ If set to a non-zero (non-root) value,
+@@ -7903,7 +7903,7 @@ If set to a non-zero (non-root) value,
.i sendmail
will change to this user id shortly after startup\**.
.(f
@@ -1249,7 +1249,7 @@
it changes to this user after accepting a connection
but before reading any
.sm SMTP
-@@ -8530,7 +8530,7 @@ line may have an optional
+@@ -8534,7 +8534,7 @@ line may have an optional
to indicate that this configuration file uses modifications
specific to a particular vendor\**.
.(f
@@ -1258,7 +1258,7 @@
to the list of recognized vendors by editing the routine
.i setvendor
in
-@@ -9707,7 +9707,7 @@ gets their outgoing mail stamped as
+@@ -9711,7 +9711,7 @@ gets their outgoing mail stamped as
but people not listed in the database use the local hostname.
.sh 3 "Creating the database\**"
.(f
@@ -1267,7 +1267,7 @@
Other features are available which provide similar functionality,
e.g., virtual hosting and mapping local addresses into a
generic form as explained in cf/README.
-@@ -10264,7 +10264,7 @@ and
+@@ -10268,7 +10268,7 @@ and
fields are always scanned on ARPANET mail
to determine the sender\**;
.(f
@@ -1276,7 +1276,7 @@
this information is contained in the envelope.
The older ARPANET protocols did not completely distinguish
envelope from header.
-@@ -10492,7 +10492,7 @@ The distribution includes several possib
+@@ -10496,7 +10496,7 @@ The distribution includes several possib
If you are porting to a new environment
you may need to add some new tweaks.\**
.(f
@@ -1285,7 +1285,7 @@
sendmail@Sendmail.ORG.
.)f
.sh 2 "Configuration in sendmail/daemon.c"
-@@ -11336,7 +11336,7 @@ the following is a queue file sent to
+@@ -11340,7 +11340,7 @@ the following is a queue file sent to
and
.q bostic@okeeffe.CS.Berkeley.EDU \**:
.(f
@@ -1295,7 +1295,7 @@
nothing can replace looking at what your own system generates.
.)f
--- include/sm/conf.h
-+++ include/sm/conf.h 2011-05-31 12:06:28.875925609 +0200
++++ include/sm/conf.h 2011-05-31 10:06:28.875925609 +0000
@@ -1457,23 +1457,47 @@ extern void *malloc();
# define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
# endif /* !defined(KERNEL_VERSION) */
@@ -1332,7 +1332,7 @@
# define HASUNSETENV 1 /* has unsetenv(3) call */
# define ERRLIST_PREDEFINED /* don't declare sys_errlist */
# define GIDSET_T gid_t /* from