Hello community,
here is the log from the commit of package sendmail for openSUSE:Factory
checked in at 2014-05-27 12:03:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sendmail (Old)
and /work/SRC/openSUSE:Factory/.sendmail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sendmail"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sendmail/sendmail.changes 2014-04-02
17:25:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail.changes 2014-05-27
12:03:05.000000000 +0200
@@ -1,0 +2,23 @@
+Mon May 26 11:54:39 UTC 2014 - wer...@suse.de
+
+- Add patch sendmail-fd-passing-libmilter.patch from Debian sendmail
+ maintainer Mikhail Gusarov to support systemd socket activation
+ support also in libmilter (bnc#879790)
+- Be aware that /var/run is a symbolic link to /run a tmpfs file
+ system
+
+-------------------------------------------------------------------
+Fri May 23 09:03:04 UTC 2014 - wer...@suse.de
+
+- Update to sendmail 8.14.9
+ * Properly set the close-on-exec flag for file descriptors
+ (except stdin, stdout, and stderr) before executing mailers.
+ * Fix a misformed comment in conf.c: "/*" within comment
+ which may cause a compilation error on some systems.
+ Problem reported by John Beck of Oracle.
+ * Fix regression in auto-detection of libraries when only
+ shared libraries are available. Problem reported by
+ Bryan Costales.
+- Modify patch sendmail-8.14.8.dif which is now sendmail-8.14.9.dif
+
+-------------------------------------------------------------------
Old:
----
sendmail-8.14.8.dif
sendmail.8.14.8.tar.gz
New:
----
sendmail-8.14.9.dif
sendmail-fd-passing-libmilter.patch
sendmail.8.14.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.fyVFpF/_old 2014-05-27 12:03:07.000000000 +0200
+++ /var/tmp/diff_new_pack.fyVFpF/_new 2014-05-27 12:03:07.000000000 +0200
@@ -68,7 +68,7 @@
%{?systemd_requires}
Conflicts: smail postfix postfix-tls
Obsoletes: sendmail-tls
-Version: 8.14.8
+Version: 8.14.9
Release: 0
Summary: BSD Sendmail
License: SUSE-Sendmail
@@ -82,7 +82,7 @@
Source6: sendmail.systemd
Source7: sendmail-client.systemd
# PATCH-FIX-OPENSUSE: Add our m4 extensions and maintenance scripts
-Patch0: sendmail-8.14.8.dif
+Patch0: sendmail-8.14.9.dif
# PATCH-FIX-OPENSUSE: if select(2) is interrupted the timeout become undefined
Patch1: sendmail-8.14.7-select.dif
# PATCH-FIX-OPENSUSE: Do not warn about unsued variable
@@ -91,6 +91,8 @@
Patch3: sendmail-db6.diff
# PATCH-FIX-UPSTREAM: Detect shared libraries
Patch4: sendmail-8.14.8-m4header.patch
+# PATCH-FIX-DEBIAN: systemd socket activation support for libmilter
+Patch5: sendmail-fd-passing-libmilter.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir}
%global _mailcnfdir %{_sysconfdir}/mail
@@ -171,11 +173,14 @@
%patch0 -p 0 -b .p0
%patch3 -p1
%patch4 -p0
+%patch5 -p1
tar --strip-components=1 -xf %{S:1}
set -f
cat <<-EOF > file-list
%%defattr(-,root,root)
+%if %{with sysvinit}
%%ghost %%dir %%attr(1750,root,root) %{_localstatedir}/run/sendmail
+%endif
%%dir %%attr(0750,root,root) %{_localstatedir}/lib/sendmail
%%attr(0600,root,root)
%{_localstatedir}/lib/sendmail/statistics
%%attr(0600,root,root) %{_mailcnfdir}/statistics
@@ -283,8 +288,10 @@
chown -R root:root %{buildroot}%{_localstatedir}/spool/mqueue
chmod 0700 %{buildroot}%{_localstatedir}/spool/mqueue
chmod 0700 %{buildroot}%{_localstatedir}/spool/mqueue/.hoststat
+%if %{with sysvinit}
mkdir -p %{buildroot}%{_localstatedir}/run/sendmail
chmod 1750 %{buildroot}%{_localstatedir}/run/sendmail
+%endif
mkdir -p %{buildroot}%{_localstatedir}/lib/sendmail
chmod 0750 %{buildroot}%{_localstatedir}/lib/sendmail
touch %{buildroot}%{_localstatedir}/lib/sendmail/statistics
@@ -430,7 +437,9 @@
%if %{defined verify_permissions}
%verifyscript
+%if %{with sysvinit}
%verify_permissions -e %{_localstatedir}/run/sendmail/
+%endif
%verify_permissions -e %{_localstatedir}/spool/mqueue/
%verify_permissions -e %{_sysconfdir}/sendmail.cf
%if %{with sysvinit}
@@ -481,7 +490,9 @@
fi
%endif
%if %{defined set_permissions}
+%if %{with sysvinit}
%set_permissions %{_localstatedir}/run/sendmail/
+%endif
%set_permissions %{_localstatedir}/spool/mqueue/
%set_permissions %{_sysconfdir}/sendmail.cf
%if %{with sysvinit}
++++++ sendmail-8.14.8.dif -> sendmail-8.14.9.dif ++++++
--- /work/SRC/openSUSE:Factory/sendmail/sendmail-8.14.8.dif 2014-04-02
17:25:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail-8.14.9.dif
2014-05-27 12:03:04.000000000 +0200
@@ -89,7 +89,7 @@
R< > $+ $: < $H > $1 try hub', `dnl')
ifdef(`LOCAL_RELAY', `dnl
--- cf/mailer/cyrus.m4
-+++ cf/mailer/cyrus.m4 2014-04-01 08:36:47.290235545 +0000
++++ cf/mailer/cyrus.m4 2014-05-23 09:36:13.158235601 +0000
@@ -36,7 +36,7 @@ PUSHDIVERT(-1)
#
@@ -101,27 +101,27 @@
_DEFIFNOT(`CYRUS_BB_MAILER_FLAGS', `u')
@@ -51,6 +51,7 @@ POPDIVERT
- VERSIONID(`$Id: cyrus.m4,v 8.24 2013/11/22 20:51:14 ca Exp $ (Carnegie
Mellon)')
+ VERSIONID(`$Id: cyrus.m4,v 8.24 2013-11-22 20:51:14 ca Exp $ (Carnegie
Mellon)')
+MAILER_DEFINITIONS
Mcyrus, P=CYRUS_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMnPq',
CYRUS_MAILER_FLAGS), `CYRUS'), S=EnvFromL, R=EnvToL/HdrToL,
ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX,
')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix,_CYRUS_QGRP
A=CYRUS_MAILER_ARGS
--- cf/mailer/fax.m4
-+++ cf/mailer/fax.m4 2014-04-01 08:37:48.618235495 +0000
++++ cf/mailer/fax.m4 2014-05-23 09:36:31.514966633 +0000
@@ -30,6 +30,7 @@ POPDIVERT
- VERSIONID(`$Id: fax.m4,v 8.17 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: fax.m4,v 8.17 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mfax, P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24,
M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix,_FAX_QGRP
A=FAX_MAILER_ARGS
--- cf/mailer/local.m4
-+++ cf/mailer/local.m4 2014-04-01 08:38:11.646235238 +0000
++++ cf/mailer/local.m4 2014-05-23 09:36:42.562235682 +0000
@@ -34,6 +34,7 @@ POPDIVERT
- VERSIONID(`$Id: local.m4,v 8.60 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: local.m4,v 8.60 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
#
@@ -136,7 +136,7 @@
_OPTINS(`LOCAL_MAILER_MAX', `M=', `,
')_OPTINS(`LOCAL_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`LOCAL_MAILER_MAXRCPTS',
`r=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `,
')T=DNS/RFC822/LOCAL_MAILER_DSN_DIAGNOSTIC_CODE,_LOCAL_QGRP
A=LOCAL_MAILER_ARGS
--- cf/mailer/mail11.m4
-+++ cf/mailer/mail11.m4 2014-04-01 08:38:33.114235312 +0000
++++ cf/mailer/mail11.m4 2014-05-23 09:36:55.046735686 +0000
@@ -34,7 +34,7 @@ R$* < @ $=w .DECNET. > $#_LOCAL_ $: $1
R$+ < @ $+ .DECNET. > $#mail11 $@ $2 $: $1 DECnet user
POPDIVERT
@@ -148,7 +148,7 @@
@@ -44,6 +44,7 @@ POPDIVERT
- VERSIONID(`$Id: mail11.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: mail11.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
SMail11To
@@ -166,50 +166,50 @@
+ T=DNS/X-DECnet/X-Unix,_MAIL11_QGRP
+ A=MAIL11_MAILER_ARGS
--- cf/mailer/phquery.m4
-+++ cf/mailer/phquery.m4 2014-04-01 08:38:53.871265702 +0000
++++ cf/mailer/phquery.m4 2014-05-23 09:37:04.554235775 +0000
@@ -27,6 +27,7 @@ POPDIVERT
- VERSIONID(`$Id: phquery.m4,v 8.18 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: phquery.m4,v 8.18 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mph, P=PH_MAILER_PATH, F=_MODMF_(CONCAT(`nrDFM', PH_MAILER_FLAGS),
`PH'), S=EnvFromL, R=EnvToL/HdrToL,
T=DNS/RFC822/X-Unix,_PH_QGRP
A=PH_MAILER_ARGS
--- cf/mailer/pop.m4
-+++ cf/mailer/pop.m4 2014-04-01 08:39:15.539000680 +0000
++++ cf/mailer/pop.m4 2014-05-23 09:37:15.726235076 +0000
@@ -25,6 +25,7 @@ POPDIVERT
- VERSIONID(`$Id: pop.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: pop.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mpop, P=POP_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMq',
POP_MAILER_FLAGS), `POP'), S=EnvFromL, R=EnvToL/HdrToL,
T=DNS/RFC822/X-Unix,_POP_QGRP
A=POP_MAILER_ARGS
--- cf/mailer/procmail.m4
-+++ cf/mailer/procmail.m4 2014-04-01 08:39:33.366236087 +0000
++++ cf/mailer/procmail.m4 2014-05-23 09:37:25.958235560 +0000
@@ -29,6 +29,7 @@ POPDIVERT
- VERSIONID(`$Id: procmail.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: procmail.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mprocmail, P=PROCMAIL_MAILER_PATH, F=_MODMF_(CONCAT(`DFM',
PROCMAIL_MAILER_FLAGS), `PROCMAIL'), S=EnvFromSMTP/HdrFromSMTP,
R=EnvToSMTP/HdrFromSMTP,
ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX,
')T=DNS/RFC822/X-Unix,_PROCMAIL_QGRP
A=PROCMAIL_MAILER_ARGS
--- cf/mailer/qpage.m4
-+++ cf/mailer/qpage.m4 2014-04-01 08:40:04.398735589 +0000
++++ cf/mailer/qpage.m4 2014-05-23 09:37:35.702235284 +0000
@@ -26,6 +26,7 @@ POPDIVERT
- VERSIONID(`$Id: qpage.m4,v 8.11 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: qpage.m4,v 8.11 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Mqpage, P=QPAGE_MAILER_PATH, F=_MODMF_(QPAGE_MAILER_FLAGS, `QPAGE'),
M=QPAGE_MAILER_MAX, T=DNS/RFC822/X-Unix,_QPAGE_QGRP
A=QPAGE_MAILER_ARGS
--- cf/mailer/smtp.m4
-+++ cf/mailer/smtp.m4 2014-04-01 08:40:24.995107993 +0000
++++ cf/mailer/smtp.m4 2014-05-23 09:37:58.482235124 +0000
@@ -33,6 +33,7 @@ POPDIVERT
- VERSIONID(`$Id: smtp.m4,v 8.66 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: smtp.m4,v 8.66 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
#
@@ -224,20 +224,20 @@
_OPTINS(`SMTP_MAILER_MAX', `M=', `,
')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS',
`r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `,
')T=DNS/RFC822/SMTP,_SMTP_QGRP
A=SMTP_MAILER_ARGS
--- cf/mailer/usenet.m4
-+++ cf/mailer/usenet.m4 2014-04-01 08:40:57.818235720 +0000
++++ cf/mailer/usenet.m4 2014-05-23 09:38:08.798236154 +0000
@@ -23,6 +23,7 @@ POPDIVERT
- VERSIONID(`$Id: usenet.m4,v 8.23 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: usenet.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
+MAILER_DEFINITIONS
Musenet, P=USENET_MAILER_PATH, F=_MODMF_(USENET_MAILER_FLAGS, `USENET'),
S=EnvFromL, R=EnvToL,
_OPTINS(`USENET_MAILER_MAX', `M=', `,
')T=X-Usenet/X-Usenet/X-Unix,_USENET_QGRP
A=USENET_MAILER_ARGS $u
--- cf/mailer/uucp.m4
-+++ cf/mailer/uucp.m4 2014-04-01 08:41:20.952951026 +0000
++++ cf/mailer/uucp.m4 2014-05-23 09:38:19.742235616 +0000
@@ -26,6 +26,7 @@ POPDIVERT
- VERSIONID(`$Id: uucp.m4,v 8.45 2013/11/22 20:51:14 ca Exp $')
+ VERSIONID(`$Id: uucp.m4,v 8.45 2013-11-22 20:51:14 ca Exp $')
+LOCAL_RULESETS
#
@@ -470,7 +470,7 @@
# 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
+@@ -35,3 +35,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'))')
@@ -742,7 +742,7 @@
nothing can replace looking at what your own system generates.
.)f
--- include/sm/conf.h
-+++ include/sm/conf.h 2014-04-01 08:43:11.106236552 +0000
++++ include/sm/conf.h 2014-04-01 08:43:11.000000000 +0000
@@ -1457,23 +1457,47 @@ extern void *malloc();
# define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
# endif /* !defined(KERNEL_VERSION) */
@@ -864,7 +864,7 @@
define(`bldSOURCES', `main.c engine.c listener.c worker.c handler.c comm.c
smfi.c signal.c sm_gethost.c monitor.c LIBMILTER_EXTRAS ')
define(`confBEFORE', `LIBMILTER_EXTRAS')
--- libsm/Makefile.m4
-+++ libsm/Makefile.m4 2014-04-01 08:45:20.686235313 +0000
++++ libsm/Makefile.m4 2014-04-01 08:45:21.000000000 +0000
@@ -4,8 +4,11 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
define(`confREQUIRE_LIBSM', `true')
++++++ sendmail-client.systemd ++++++
--- /var/tmp/diff_new_pack.fyVFpF/_old 2014-05-27 12:03:07.000000000 +0200
+++ /var/tmp/diff_new_pack.fyVFpF/_new 2014-05-27 12:03:07.000000000 +0200
@@ -30,17 +30,17 @@
done
#
-# Make sure that configuration is uptodate
-#
-if test -x /usr/bin/make ; then
- /usr/bin/make -C /etc/mail > /dev/null 2>&1
-fi
-
-#
# Create /var/run/sendmail if not exit
#
-test -d /var/run || /bin/mkdir --mode 0755 /var/run
-test -d /var/run/sendmail || /bin/mkdir --mode 1750 /var/run/sendmail
+if test ! -d /var/run ; then
+ if test -d /run ; then
+ /bin/ln -sf /run /var/run
+ else
+ /bin/mkdir -m 0755 /var/run
+ fi
+fi
+test -d /var/run/sendmail || /bin/mkdir --mode 1750 /var/run/sendmail
+test -x /usr/bin/chkstat && /usr/bin/chkstat -n --set --system
/var/run/sendmail
#
# Some default permissions
@@ -50,6 +50,11 @@
/bin/chmod 0600 $pidfile
#
+# Make sure that configuration is uptodate
+#
+test -x /usr/bin/make && /usr/bin/make -C /etc/mail > /dev/null 2>&1
+
+#
# Check for DaemonPortOptions
#
PortOpts=$($sed -rn '/^O[[:blank:]]+DaemonPortOptions=.*Name=MTA.*$/I {
++++++ sendmail-fd-passing-libmilter.patch ++++++
Description: systemd-like socket activation support for libmilter
Author: Mikhail Gusarov <dotted...@debian.org
diff --git a/libmilter/docs/smfi_setconn.html b/libmilter/docs/smfi_setconn.html
index 70a510e..013f04e 100644
--- a/libmilter/docs/smfi_setconn.html
+++ b/libmilter/docs/smfi_setconn.html
@@ -43,6 +43,7 @@ Set the socket through which this filter should communicate
with sendmail.
<LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe.
<LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket.
<LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket.
+ <LI><CODE>fd:number</CODE> -- Pre-opened file descriptor.
</UL>
</TD></TR>
</TABLE>
diff --git a/libmilter/listener.c b/libmilter/listener.c
index 48c552f..2249a1f 100644
--- a/libmilter/listener.c
+++ b/libmilter/listener.c
@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name)
L_socksize = sizeof addr.sin6;
}
#endif /* NETINET6 */
+ else if (strcasecmp(p, "fd") == 0)
+ {
+ addr.sa.sa_family = AF_UNSPEC;
+ L_socksize = sizeof (_SOCK_ADDR);
+ }
else
{
smi_log(SMI_LOG_ERR, "%s: unknown socket type %s",
@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name)
}
#endif /* NETINET || NETINET6 */
- sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
+ if (addr.sa.sa_family == AF_UNSPEC)
+ {
+ char *end;
+ sock = strtol(colon, &end, 10);
+ if (*end != '\0' || sock < 0)
+ {
+ smi_log(SMI_LOG_ERR, "%s: expected positive integer as
fd, got %s", name, colon);
+ return INVALID_SOCKET;
+ }
+ }
+ else
+ {
+ sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
+ }
+
if (!ValidSocket(sock))
{
smi_log(SMI_LOG_ERR,
@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name)
#if NETUNIX
addr.sa.sa_family != AF_UNIX &&
#endif /* NETUNIX */
+ addr.sa.sa_family != AF_UNSPEC &&
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt,
sizeof(sockopt)) == -1)
{
@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name)
}
#endif /* NETUNIX */
- if (bind(sock, &addr.sa, L_socksize) < 0)
+ if (addr.sa.sa_family != AF_UNSPEC &&
+ bind(sock, &addr.sa, L_socksize) < 0)
{
smi_log(SMI_LOG_ERR,
"%s: Unable to bind to port %s: %s",
@@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
# ifdef BSD4_4_SOCKADDR
cliaddr.sa.sa_len == 0 ||
# endif /* BSD4_4_SOCKADDR */
- cliaddr.sa.sa_family != L_family))
+ (L_family != AF_UNSPEC && cliaddr.sa.sa_family !=
L_family)))
{
(void) closesocket(connfd);
connfd = INVALID_SOCKET;
++++++ sendmail.8.14.8.tar.gz -> sendmail.8.14.9.tar.gz ++++++
++++ 9062 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
