--- a/components/sendmail/Makefile Tue Aug 11 16:13:01 2015 -0700
+++ b/components/sendmail/Makefile Wed Aug 05 15:22:29 2015 -0700
@@ -23,17 +23,17 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= sendmail
-COMPONENT_VERSION= 8.15.1
+COMPONENT_VERSION= 8.15.2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= ftp://ftp.sendmail.org/pub/sendmail/
COMPONENT_ARCHIVE= $(COMPONENT_NAME).$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:ed1f9e0f2a1a58c9ff94950264a2fc186d6fd237bac66b175d79a2b89a950746
+ sha256:24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).sig
COMPONENT_BUGDB= utility/sendmail
-TPNO= 21799
+TPNO= 23958
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/justmake.mk
@@ -58,7 +58,7 @@
ARCH = sun4
endif
FILE_DIR=$(COMPONENT_DIR)/files
-M4_ARG=-DSUN_HIDE_INTERNAL_DETAILS
+M4_ARG=-D_NO_MAKEINFO_
SM_BUILD_SUB_DIR=obj.SunOS.$(OS_VERSION).$(ARCH)
SM_BUILD_DIR=$(@D)/$(SM_BUILD_SUB_DIR)
--- a/components/sendmail/patches/README.patch Tue Aug 11 16:13:01 2015 -0700
+++ b/components/sendmail/patches/README.patch Wed Aug 05 15:22:29 2015 -0700
@@ -1,7 +1,7 @@
# This patch is Solaris-specific and thus has not been contributed upstream.
---- sendmail-8.15.1/cf/README.~1~ 2014-09-17 11:34:33.000000000 -0700
-+++ sendmail-8.15.1/cf/README 2015-02-27 13:05:45.063619464 -0800
+--- sendmail-8.15.1.30/cf/README.~1~ 2015-05-22 06:42:27.000000000 -0700
++++ sendmail-8.15.1.30/cf/README 2015-05-23 15:44:42.381819318 -0700
@@ -4,12 +4,10 @@
This document describes the sendmail configuration files. It
explains how to create a sendmail.cf file for use with sendmail.
@@ -49,9 +49,9 @@
-*******************************************************************
-
- +----------------------------+
- | A BRIEF INTRODUCTION TO M4 |
-@@ -197,20 +186,6 @@
+ Note:
+ Some rulesets, features, and options are only useful if the sendmail
+@@ -217,20 +206,6 @@
messages; in the worst case it might be ok to change the value
directly in the generated .cf file, which however is not advised.
@@ -72,7 +72,7 @@
+----------------+
| FILE LOCATIONS |
+----------------+
-@@ -319,8 +294,7 @@
+@@ -339,8 +314,7 @@
corresponding queue file types as explained in
doc/op/op.me. See also QUEUE GROUP DEFINITIONS.
MSP_QUEUE_DIR [/var/spool/clientmqueue] The directory containing
@@ -82,7 +82,7 @@
STATUS_FILE [/etc/mail/statistics] The file containing status
information.
LOCAL_MAILER_PATH [/bin/mail] The program used to deliver local mail.
-@@ -350,17 +324,6 @@
+@@ -370,17 +344,6 @@
LOCAL_SHELL_DIR [$z:/] The directory search path in which the
shell should run.
LOCAL_MAILER_QGRP [undefined] The queue group for the local mailer.
@@ -100,7 +100,7 @@
SMTP_MAILER_FLAGS [undefined] Flags added to SMTP mailer. Default
flags are `mDFMuX' for all SMTP-based mailers; the
"esmtp" mailer adds `a'; "smtp8" adds `8'; and
-@@ -417,17 +380,6 @@
+@@ -437,17 +400,6 @@
the UUCP mailers and which are converted to MIME will
be labeled with this character set.
UUCP_MAILER_QGRP [undefined] The queue group for the UUCP mailers.
@@ -118,7 +118,7 @@
PROCMAIL_MAILER_PATH [/usr/local/bin/procmail] The path to the procmail
program. This is also used by
FEATURE(`local_procmail').
-@@ -442,60 +394,9 @@
+@@ -462,60 +414,9 @@
PROCMAIL_MAILER_MAX [undefined] If set, the maximum size message that
will be accepted by the procmail mailer.
PROCMAIL_MAILER_QGRP [undefined] The queue group for the procmail mailer.
@@ -179,7 +179,7 @@
LOCAL_PROG_QGRP [undefined] The queue group for the prog mailer.
Note: to tweak Name_MAILER_FLAGS use the macro MODIFY_MAILER_FLAGS:
-@@ -613,18 +514,6 @@
+@@ -633,18 +534,6 @@
See the section below describing UUCP mailers in more
detail.
@@ -198,7 +198,7 @@
procmail An interface to procmail (does not come with sendmail).
This is designed to be used in mailertables. For example,
a common question is "how do I forward all mail for a given
-@@ -647,37 +536,6 @@
+@@ -667,37 +556,6 @@
Of course there are other ways to solve this particular
problem, e.g., a catch-all entry in a virtusertable.
@@ -236,7 +236,7 @@
The local mailer accepts addresses of the form "user+detail", where
the "+detail" is not used for mailbox matching but is available
to certain local mail programs (in particular, see
-@@ -1393,12 +1251,6 @@
+@@ -1413,12 +1271,6 @@
user@site for relaying. This feature changes that
behavior. It should not be needed for most installations.
@@ -249,7 +249,7 @@
preserve_luser_host
Preserve the name of the recipient host if LUSER_RELAY is
used. Without this option, the domain part of the
-@@ -1435,7 +1287,7 @@
+@@ -1455,7 +1307,7 @@
FEATURE and introduce new settings via DAEMON_OPTIONS().
msp Defines config file for Message Submission Program.
@@ -258,7 +258,7 @@
to use it. An optional argument can be used to override
the default of `[localhost]' to use as host to send all
e-mails to. Note that MX records will be used if the
-@@ -1579,78 +1431,6 @@
+@@ -1603,78 +1455,6 @@
has been compiled with the options MAP_REGEX and
DNSMAP.
@@ -337,7 +337,7 @@
+--------------------+
| USING UUCP MAILERS |
+--------------------+
-@@ -2438,7 +2218,7 @@
+@@ -2462,7 +2242,7 @@
map entries. This feature allows spammers to abuse your mail server
by specifying a return address that you enabled in your access file.
This may be harder to figure out for spammers, but it should not
@@ -346,7 +346,7 @@
allow relaying for roaming users.
-@@ -2906,8 +2686,7 @@
+@@ -2930,8 +2710,7 @@
tokenization. It might be simpler to use a regex map and apply it
to $&{currHeader}.
2. There are no default rulesets coming with this distribution of
@@ -356,7 +356,7 @@
3. When using a default ruleset for headers, the name of the header
currently being checked can be found in the $&{hdr_name} macro.
-@@ -3208,101 +2987,6 @@
+@@ -3264,101 +3043,6 @@
(version=${tls_version} cipher=${cipher} bits=${cipher_bits} verify=${verify})
@@ -458,7 +458,7 @@
+--------------------------------+
| ADDING NEW MAILERS OR RULESETS |
+--------------------------------+
-@@ -3628,8 +3312,6 @@
+@@ -3684,8 +3368,6 @@
This list is shown in four columns: the name you define, the default
value for that definition, the option or macro that is affected
(either Ox for an option or Dx for a macro), and a brief description.
@@ -467,7 +467,7 @@
Some options are likely to be deprecated in future versions -- that is,
the option is only included to provide back-compatibility. These are
-@@ -3853,8 +3535,6 @@
+@@ -3915,8 +3597,6 @@
(e.g., :include: file) to be opened.
confTO_LHLO Timeout.lhlo [2m] The timeout waiting for a response
to an LMTP LHLO command.
@@ -476,7 +476,7 @@
confTO_STARTTLS Timeout.starttls
[1h] The timeout waiting for a
response to an SMTP STARTTLS command.
-@@ -4220,46 +3900,6 @@
+@@ -4282,46 +3962,6 @@
memory-buffered transcript (xf)
file before a disk-based file is
used.
@@ -523,7 +523,7 @@
confTLS_SRV_OPTIONS TLSSrvOptions If this option is 'V' no client
verification is performed, i.e.,
the server doesn't ask for a
-@@ -4323,7 +3963,7 @@
+@@ -4386,7 +4026,7 @@
[undefined] Defines {daemon_flags}
for direct submissions.
confUSE_MSP UseMSP [undefined] Use as mail submission
@@ -532,7 +532,7 @@
confDELIVER_BY_MIN DeliverByMin [0] Minimum time for Deliver By
SMTP Service Extension (RFC 2852).
confREQUIRES_DIR_FSYNC RequiresDirfsync [true] RequiresDirfsync can
-@@ -4469,8 +4109,7 @@
+@@ -4532,8 +4172,7 @@
| MESSAGE SUBMISSION PROGRAM |
+----------------------------+
@@ -542,7 +542,7 @@
a few hints how for those who want to tweak the default configuration
for it (which is installed as submit.cf).
-@@ -4485,13 +4124,10 @@
+@@ -4548,13 +4187,10 @@
of the default background mode.
- FEATURE(stickyhost) and LOCAL_RELAY to send unqualified addresses
to the LOCAL_RELAY instead of the default relay.
@@ -559,7 +559,7 @@
FEATURE(`nocanonify', `canonify_hosts')
define(`confDIRECT_SUBMISSION_MODIFIERS', `C')
-@@ -4507,39 +4143,10 @@
+@@ -4570,39 +4206,10 @@
can cause security problems.
Other things don't work well with the MSP and require tweaking or
--- a/components/sendmail/patches/cfhead.m4.patch Tue Aug 11 16:13:01 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# This patch is Solaris-specific and thus has not been contributed upstream.
---- sendmail-8.14.7/cf/m4/cfhead.m4 2010-01-07 10:20:19.000000000 -0800
-+++ sendmail-8.14.7/cf/m4/cfhead.m4 2012-12-10 14:37:14.550919110 -0800
-@@ -5,6 +5,9 @@
- # Copyright (c) 1988, 1993
- # The Regents of the University of California. All rights reserved.
- #
-+# Copyright 1993, 1997-2006 Sun Microsystems, Inc. All rights reserved.
-+# Use is subject to license terms.
-+#
- # By using this file, you agree to the terms and conditions set
- # forth in the LICENSE file which can be found at the top level of
- # the sendmail distribution.
-@@ -16,12 +19,14 @@
- #####
- ##### SENDMAIL CONFIGURATION FILE
- #####
-+ifdef(`SUN_HIDE_INTERNAL_DETAILS',,
- ifdef(`__win32__', `dnl', `dnl
- ifdef(`TEMPFILE', `dnl', `define(`TEMPFILE', maketemp(/tmp/cfXXXXXX))dnl
- syscmd(sh _CF_DIR_`'sh/makeinfo.sh _CF_DIR_ > TEMPFILE)dnl
- include(TEMPFILE)dnl
- syscmd(rm -f TEMPFILE)dnl')')
- #####
-+)dnl
- ######################################################################
- #####
- ##### DO NOT EDIT THIS FILE! Only edit the source .mc file.
--- a/components/sendmail/patches/proto.m4.patch Tue Aug 11 16:13:01 2015 -0700
+++ b/components/sendmail/patches/proto.m4.patch Wed Aug 05 15:22:29 2015 -0700
@@ -21,7 +21,7 @@
divert(-1)
dnl if MAILER(`local') not defined: do it ourself; be nice
-@@ -597,7 +600,7 @@
+@@ -603,7 +606,7 @@
_OPTION(ControlSocketName, `confCONTROL_SOCKET_NAME', `/var/spool/mqueue/.control')
# Maximum MIME header length to protect MUAs
--- a/components/sendmail/patches/x-ipv6-compression.patch Tue Aug 11 16:13:01 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-This patch was developed in-house, contributed upstream, and accepted with
-minor modifications for 8.15.2; when that release comes out, it should no
-longer be needed.
-
---- sendmail-8.15.1/RELEASE_NOTES.~1~ 2015-03-02 10:53:48.866427766 -0800
-+++ sendmail-8.15.1/RELEASE_NOTES 2015-03-02 10:55:13.925190180 -0800
-@@ -5,6 +5,13 @@
- of the sendmail configuration files, the date of release, and a
- summary of the changes in that release.
-
-+ CONFIG: New option UseCompressedIPv6Addresses to select between
-+ compressed and uncompressed IPv6 addresses. The default
-+ value depends on the compile-time option IPV6_FULL:
-+ For 1 the default is False, for 0 it is True, thus
-+ preserving the current behaviour. Based on patch from
-+ John Beck of Oracle.
-+
- 8.15.1/8.15.1 2014/12/06
- SECURITY: Properly set the close-on-exec flag for file descriptors
- (except stdin, stdout, and stderr) before executing mailers.
---- sendmail-8.15.1/cf/README.~2~ 2015-03-02 10:56:39.888131319 -0800
-+++ sendmail-8.15.1/cf/README 2015-03-02 10:56:39.926065186 -0800
-@@ -3454,6 +3454,12 @@
- cached but otherwise idle connection
- to a host will prevent other sendmails
- from connecting to the other host.
-+confUSE_COMPRESSED_IPV6_ADDRESSES
-+ UseCompressedIPv6Addresses
-+ [undefined] If set, use the compressed
-+ form of IPv6 addresses, such as
-+ IPV6:::1, instead of the uncompressed
-+ form, such as IPv6:0:0:0:0:0:0:0:1.
- confUSE_ERRORS_TO* UseErrorsTo [False] Use the Errors-To: header to
- deliver error messages. This should
- not be necessary because of general
---- sendmail-8.15.1/cf/m4/proto.m4.~2~ 2015-03-02 10:59:56.762362990 -0800
-+++ sendmail-8.15.1/cf/m4/proto.m4 2015-03-02 10:59:56.821388655 -0800
-@@ -329,6 +329,9 @@
- # use Errors-To: header?
- _OPTION(UseErrorsTo, `confUSE_ERRORS_TO', `False')
-
-+# use compressed IPv6 address format?
-+_OPTION(UseCompressedIPv6Addresses, `confUSE_COMPRESSED_IPV6_ADDRESSES', `')
-+
- # log level
- _OPTION(LogLevel, `confLOG_LEVEL', `10')
-
---- sendmail-8.15.1/doc/op/op.me.~1~
-+++ sendmail-8.15.1/doc/op/op.me
-@@ -8360,6 +8360,12 @@ are always unsafe.
- Note: use
- .b DontBlameSendmail
- instead; this option is deprecated.
-+.ip UseCompressedIPv6Addresses
-+[no short name]
-+If set, the compressed format of IPv6 addresses,
-+such as IPV6:::1, will be used,
-+instead of the uncompressed format,
-+such as IPv6:0:0:0:0:0:0:0:1.
- .ip UseErrorsTo
- [l]
- If there is an
---- sendmail-8.15.1/sendmail/conf.c.~1~ 2014-11-07 10:01:17.000000000 -0800
-+++ sendmail-8.15.1/sendmail/conf.c 2015-03-02 11:02:56.829822173 -0800
-@@ -379,6 +379,9 @@
- }
- else
- InetMode = AF_INET;
-+#if !IPV6_FULL
-+ UseCompressedIPv6Addresses = true;
-+#endif
- #else /* NETINET6 */
- InetMode = AF_INET;
- #endif /* NETINET6 */
-@@ -5756,7 +5759,7 @@
- "HES_GETMAILHOST",
- #endif
- #if IPV6_FULL
-- /* Use uncompressed IPv6 address format (no "::") */
-+ /* Use uncompressed IPv6 address format (no "::") by default */
- "IPV6_FULL",
- #endif
- #if LDAPMAP
---- a/sendmail/daemon.c
-+++ b/sendmail/daemon.c
-@@ -4261,12 +4261,10 @@ anynet_ntop(s6a, dst, dst_len)
- return NULL;
- dst += sz;
- dst_len -= sz;
--# if IPV6_FULL
-- ap = sm_inet6_ntop(s6a, dst, dst_len);
--# else /* IPV6_FULL */
-- ap = (char *) inet_ntop(AF_INET6, s6a, dst, dst_len);
--# endif /* IPV6_FULL */
--
-+ if (UseCompressedIPv6Addresses)
-+ ap = (char *) inet_ntop(AF_INET6, s6a, dst, dst_len);
-+ else
-+ ap = sm_inet6_ntop(s6a, dst, dst_len);
- /* Restore pointer to beginning of string */
- if (ap != NULL)
- ap = d;
---- sendmail-8.15.1/sendmail/readcf.c.~1~ 2014-10-22 09:33:53.000000000 -0700
-+++ sendmail-8.15.1/sendmail/readcf.c 2015-03-02 11:04:38.892714939 -0800
-@@ -2473,6 +2473,8 @@
- # define O_ADDBCC 0xeb
- { "AddBcc", O_ADDBCC, OI_NONE },
- #endif
-+#define O_USECOMPRESSEDIPV6ADDRESSES 0xec
-+ { "UseCompressedIPv6Addresses", O_USECOMPRESSEDIPV6ADDRESSES, OI_NONE },
-
- { NULL, '\0', OI_NONE }
- };
-@@ -4277,6 +4279,9 @@
- AddBcc = atobool(val);
- break;
- #endif
-+ case O_USECOMPRESSEDIPV6ADDRESSES:
-+ UseCompressedIPv6Addresses = atobool(val);
-+ break;
-
- default:
- if (tTd(37, 1))
---- sendmail-8.15.1/sendmail/sendmail.h.~1~ 2014-11-07 05:26:39.000000000 -0800
-+++ sendmail-8.15.1/sendmail/sendmail.h 2015-03-02 11:05:51.115921999 -0800
-@@ -2384,6 +2384,7 @@
- EXTERN bool WorkAroundBrokenAAAA; /* some nameservers return SERVFAIL on AAAA queries */
- EXTERN bool UseErrorsTo; /* use Errors-To: header (back compat) */
- EXTERN bool UseNameServer; /* using DNS -- interpret h_errno & MX RRs */
-+EXTERN bool UseCompressedIPv6Addresses; /* for more specific zero-subnet matches */
- EXTERN char InetMode; /* default network for daemon mode */
- EXTERN char OpMode; /* operation mode, see below */
- EXTERN char SpaceSub; /* substitution for <lwsp> */
Binary file tools/.gnupg/pubring.gpg has changed