pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/sendmail comms/sendmail: update to 8.16.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/9872b3bbc90b
branches: trunk
changeset: 455369:9872b3bbc90b
user: jnemeth <jnemeth%pkgsrc.org@localhost>
date: Sun Jul 04 07:57:13 2021 +0000
description:
comms/sendmail: update to 8.16.1
8.16.1/8.16.1 2020/07/05
SECURITY: If sendmail tried to reuse an SMTP session which had
already been closed by the server, then the connection
cache could have invalid information about the session.
One possible consequence was that STARTTLS was not
used even if offered. This problem has been fixed
by clearing out all relevant status information
when a closed session is encountered.
OpenSSL versions before 0.9.8 are no longer supported.
OpenSSL version 1.1.0 and 1.1.1 are supported.
Initial support for DANE (see RFC 7672 et.al.) is available if
the compile time option DANE is set. Only TLSA RR 3-1-x
is currently implemented.
New options SSLEngine and SSLEnginePath to support OpenSSL engines.
Note: this feature has so far only been tested with the
"chil" engine; please report problems with other engines
if you encounter any.
New option CRLPath to specify a directory which contains
hashes pointing to certificate revocations files.
Based on patch from Al Smith.
New rulesets tls_srv_features and tls_clt_features which
can return a (semicolon separated) list of TLS related
options, e.g., CipherList, CertFile, KeyFile,
see doc/op/op.me for details.
To automatically handle TLS interoperability problems for outgoing
mail, sendmail can now immediately try a connection again
without STARTTLS after a TLS handshake failure.
This can be configured globally via the option
TLSFallbacktoClear or per session via the 'C' flag
of tls_clt_features.
This also adds the new value "CLEAR" for the macro
{verify}: STARTTLS has been disabled internally for
a clear text delivery attempt.
Apply Timeout.starttls also to the server waiting for the TLS
handshake to begin. Based on patch from Simon Hradecky.
New compile time option TLS_EC to enable the use of elliptic
curve cryptography in STARTTLS (previously available as
_FFR_TLS_EC).
Handle MIME boundaries specified in headers which contain CRLF.
Fix detection of loopback net (it was broken when compiled
with NETINET6) and only set the macros {if_addr_out}
and {if_family_out} if the interface of the outgoing
connection does not belong to the loopback net.
Fix logic to enable a milter to delete a recipient in
DeliveryMode=interactive even if it might be subject
to alias expansion.
Log name of a milter making changes (this was missing for
some functions).
Log the actual reply of a server when an SMTP delivery problem
occurs in a "reply=" field if possible.
Log user= for failed AUTH attempts if possible. Based on
patch from Packet Hack, Jim Hranicky, Kevin A. McGrail,
and Joe Quinn.
Add CDB as map type. Note: CDB is a "Constant DataBase", i.e.,
no changes can be made after it is created, hence it
does not work with vacation(1) nor editmap(8) (except
for query mode).
Fix some memory leaks (mostly in error cases) and properly handle
copied varargs in sm_io_vfprintf(). The issues were found
using Coverity Scan and reported (including patches) by
Ondřej Lysoněk of Red Hat.
Do not override ServerSSLOptions and ClientSSLOptions when they
are specified on the command line. Based on patch from
Hiroki Sato.
Add RFC7505 Null MX support for domains that declare they do not
accept mail.
New compile time option LDAP_NETWORK_TIMEOUT which is set
automatically when LDAPMAP is used and
LDAP_OPT_NETWORK_TIMEOUT is available to enable the
new -c option for LDAP maps to specify the network timeout.
CONFIG: New FEATURE(`tls_session_features') to enable standard
rules for tls_srv_features and tls_clt_features; for
details see cf/README.
CONFIG: New options confSSL_ENGINE and confSSL_ENGINE_PATH
for SSLEngine and SSLEnginePath, respectively.
CONFIG: New options confDANE to enable DANE support.
CONFIG: New option confTLS_FALLBACK_TO_CLEAR for TLSFallbacktoClear.
CONFIG: New extension CITag: for TLS restrictions, see cf/README
for details.
CONFIG: FEATURE(`blacklist_recipients') renamed to
FEATURE(`blocklist_recipients').
CONTRIB: cidrexpand updated to support IPv6 CIDR ranges and to
canonicalize IPv6 addresses; if cidrexpand is used with IPv6
addresses then UseCompressedIPv6Addresses must be disabled.
DOC: The dns map can return multiple values in a single result
if the -z option is used.
DOC: Note to set MustQuoteChars=. due to DKIM signatures.
LIBMILTER: Fix typo in a macro. Patch from Ignacio Goyret
of Alcatel-Lucent.
LIBMILTER: Fix reference in xxfi_negotiate documentation.
Patch from Sven Neuhaus.
LIBMILTER: Fix function name in smfi_addrcpt_par documentation.
Patch from G.W. Haywood.
LIBMILTER: Fix a potential memory leak in smfi_setsymlist().
Patch from Martin Svec.
MAKEMAP: New map type "implicit" refers to the first available type,
i.e., it depends on the compile time options NEWDB, DBM,
and CDB. This can be used in conjunction with the
"implicit" map type in sendmail.cf.
Note: makemap, libsmdb, and sendmail must be compiled
with the same options (and library versions of course).
Portability:
Add support for Darwin 14-18 (Mac OS X 10.x).
New option HAS_GETHOSTBYNAME2: set if your system
supports gethostbyname2(2).
Set SM_CONF_SEM=2 for FreeBSD 12 and later due to
changes in sys/sem.h
On Linux set MAXHOSTNAMELEN (the maximum length
of a FQHN) to 256 if it is less than that value.
Added Files:
cf/feature/blocklist_recipients.m4
cf/feature/tls_failures.m4
devtools/OS/Darwin.14.x
devtools/OS/Darwin.15.x
devtools/OS/Darwin.16.x
libsmdb/smcdb.c
sendmail/ratectrl.h
diffstat:
mail/sendmail/Makefile | 14 +-
mail/sendmail/Makefile.common | 4 +-
mail/sendmail/PLIST | 5 +-
mail/sendmail/distinfo | 47 ++--
mail/sendmail/patches/patch-af | 35 ++-
mail/sendmail/patches/patch-ag | 16 +-
mail/sendmail/patches/patch-ai | 14 +-
mail/sendmail/patches/patch-an | 6 +-
mail/sendmail/patches/patch-ap | 33 +-
mail/sendmail/patches/patch-aq | 8 +-
mail/sendmail/patches/patch-ar | 30 +-
mail/sendmail/patches/patch-as | 24 +-
mail/sendmail/patches/patch-at | 180 +++++++++---------
mail/sendmail/patches/patch-au | 22 +-
mail/sendmail/patches/patch-av | 8 +-
mail/sendmail/patches/patch-aw | 27 +-
mail/sendmail/patches/patch-ax | 8 +-
mail/sendmail/patches/patch-ay | 118 +++++++++---
mail/sendmail/patches/patch-az | 48 ++--
mail/sendmail/patches/patch-bg | 19 +-
mail/sendmail/patches/patch-bk | 250 --------------------------
mail/sendmail/patches/patch-bo | 16 +-
mail/sendmail/patches/patch-bs | 12 +
mail/sendmail/patches/patch-sendmail_domain.c | 31 ---
24 files changed, 387 insertions(+), 588 deletions(-)
diffs (truncated from 1582 to 300 lines):
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/Makefile
--- a/mail/sendmail/Makefile Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/Makefile Sun Jul 04 07:57:13 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.138 2020/05/16 15:36:24 rillig Exp $
+# $NetBSD: Makefile,v 1.139 2021/07/04 07:57:13 jnemeth Exp $
PKGNAME= sendmail-${DIST_VERS}
-PKGREVISION= 9
+#PKGREVISION= 9
COMMENT= The well known Mail Transport Agent
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
@@ -55,10 +55,11 @@
cf/feature/msp.m4 cf/feature/smrsh.m4 cf/m4/proto.m4 \
cf/mailer/pop.m4 cf/mailer/usenet.m4 cf/ostype/a-ux.m4 \
cf/ostype/aix3.m4 cf/ostype/aix4.m4 cf/ostype/aix5.m4 \
- cf/ostype/amdahl-uts.m4 cf/ostype/darwin.m4 cf/ostype/dgux.m4 \
- cf/ostype/domainos.m4 cf/ostype/dragonfly.m4 \
- cf/ostype/dynix3.2.m4 cf/ostype/freebsd4.m4 \
- cf/ostype/freebsd5.m4 cf/ostype/freebsd6.m4 cf/ostype/hpux10.m4 \
+ cf/ostype/altos.m4 cf/ostype/amdahl-uts.m4 cf/ostype/bsd4.4.m4 \
+ cf/ostype/darwin.m4 cf/ostype/dgux.m4 cf/ostype/domainos.m4 \
+ cf/ostype/dragonfly.m4 cf/ostype/dynix3.2.m4 \
+ cf/ostype/freebsd4.m4 cf/ostype/freebsd5.m4 \
+ cf/ostype/freebsd6.m4 cf/ostype/hpux10.m4 cf/ostype/hpux9.m4 \
cf/ostype/irix4.m4 cf/ostype/irix5.m4 cf/ostype/irix6.m4 \
cf/ostype/isc4.1.m4 cf/ostype/maxion.m4 cf/ostype/nextstep.m4 \
cf/ostype/openbsd.m4 cf/ostype/ptx2.m4 cf/ostype/riscos4.5.m4 \
@@ -75,7 +76,6 @@
SUBST_SED.cf-paths+= -e "s|/var/run|${VARBASE}/run|g"
SUBST_SED.cf-paths+= -e "s|/usr/libexec|${PREFIX}/libexec/sendmail|g"
SUBST_SED.cf-paths+= -e "s|/usr/lib|${PREFIX}/libexec/sendmail|g"
-SUBST_SED.cf-paths+= -e "s|/system/volatile|${VARBASE}/run|g"
SUBST_NOOP_OK.cf-paths= yes # some files contain only /var
REPLACE_PERL= contrib/socketmapClient.pl contrib/socketmapServer.pl
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/Makefile.common
--- a/mail/sendmail/Makefile.common Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/Makefile.common Sun Jul 04 07:57:13 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.66 2019/12/03 18:51:02 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.67 2021/07/04 07:57:13 jnemeth Exp $
#
# used by mail/libmilter/Makefile
# used by mail/sendmail/Makefile
@@ -22,7 +22,7 @@
USE_LANGUAGES= c99
-DIST_VERS= 8.15.2
+DIST_VERS= 8.16.1
MAKE_ENV+= BSD_BINOWN=${BINOWN} BSD_BINGRP=${BINGRP} \
BSD_MANOWN=${MANOWN} BSD_MANGRP=${MANGRP} \
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/PLIST
--- a/mail/sendmail/PLIST Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/PLIST Sun Jul 04 07:57:13 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2015/07/11 10:08:32 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.25 2021/07/04 07:57:13 jnemeth Exp $
bin/hoststat
bin/mailq
bin/newaliases
@@ -101,6 +101,8 @@
share/sendmail/feature/bitdomain.m4
share/sendmail/feature/blacklist_recipients.m4
share/sendmail/feature/block_bad_helo.m4
+share/sendmail/feature/blocklist_recipients.m4
+share/sendmail/feature/check_cert_altnames.m4
share/sendmail/feature/compat_check.m4
share/sendmail/feature/conncontrol.m4
share/sendmail/feature/delay_checks.m4
@@ -143,6 +145,7 @@
share/sendmail/feature/require_rdns.m4
share/sendmail/feature/smrsh.m4
share/sendmail/feature/stickyhost.m4
+share/sendmail/feature/tls_failures.m4
share/sendmail/feature/tls_session_features.m4
share/sendmail/feature/use_client_ptr.m4
share/sendmail/feature/use_ct_file.m4
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/distinfo
--- a/mail/sendmail/distinfo Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/distinfo Sun Jul 04 07:57:13 2021 +0000
@@ -1,41 +1,40 @@
-$NetBSD: distinfo,v 1.63 2020/04/24 14:33:08 manu Exp $
+$NetBSD: distinfo,v 1.64 2021/07/04 07:57:13 jnemeth Exp $
-SHA1 (sendmail.8.15.2.tar.gz) = 5801d4b06f4e38ef228a5954a44d17636eaa5a16
-RMD160 (sendmail.8.15.2.tar.gz) = 1fe2210e1ded1fe2ee640fceb1de29f19ceaa8e4
-SHA512 (sendmail.8.15.2.tar.gz) = 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-Size (sendmail.8.15.2.tar.gz) = 2207417 bytes
+SHA1 (sendmail.8.16.1.tar.gz) = 748b6dfc47dfbb83ebfdd2e334c87032c4698eab
+RMD160 (sendmail.8.16.1.tar.gz) = f128a52f67d29b1af318cfa345971ade37554894
+SHA512 (sendmail.8.16.1.tar.gz) = d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
+Size (sendmail.8.16.1.tar.gz) = 2236402 bytes
SHA1 (patch-aa) = bd1ab754f7146d002eaf8c0347e114b4049a7776
-SHA1 (patch-af) = bd3e26b0e78eadd610713430ae6deac888176442
-SHA1 (patch-ag) = f76de45c7e8d16207670e151265b7edbca4c045c
+SHA1 (patch-af) = 21f8c93a13d038fe49f0acbe38ad1453eb67788b
+SHA1 (patch-ag) = 6dcca8944aa854f1767c7ee12fe14872a4e14d2e
SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
-SHA1 (patch-ai) = 0bd3676dce988cf1167fae09443da0d1a1363abb
+SHA1 (patch-ai) = 7a306d7239f4036cd8d80d6dbe2a07eb80f02d13
SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
-SHA1 (patch-an) = 56b8b82880b9ef8fefd7cbbe98dad30b8db753f1
+SHA1 (patch-an) = 1481dd98d6aae000e71ba1c42f3d84197a4e4dc0
SHA1 (patch-ao) = 88dd76b71ad57a8d0efdb6e8518ff01689ecf634
-SHA1 (patch-ap) = 9c83d9ed1b4d8c851c106597638763515923a4ab
-SHA1 (patch-aq) = 722382daf085ac2f4a06d0c812bb00f49bcdfd2c
-SHA1 (patch-ar) = 1ecf39ddded8504079c5c446625bf9ad9497044f
-SHA1 (patch-as) = 652b107d5f68507a0b2fb7c5402186eff96c6bc0
-SHA1 (patch-at) = 7c206df88d29671faef950276a5119ef2f525f4b
-SHA1 (patch-au) = 87e907f36482f3ca03754160bc1ee106e17e3aaa
-SHA1 (patch-av) = 1b6bd4547930507ab67427bcf8a390c0afce0fb0
-SHA1 (patch-aw) = 2fb31bda2cafb41347c80e0809976f4d24fa169a
-SHA1 (patch-ax) = adba9177404e10d5f461e1e8f0c4dd5840d78dd1
-SHA1 (patch-ay) = 94f9c633c1d15037ddd0a6ed46a4f3aaec236fc2
-SHA1 (patch-az) = 5885c524fcae3a314c07eadf661bbe6ae1c081e7
+SHA1 (patch-ap) = 60745f30d1e8c13beeb8a3acb07c51fd2f8fac22
+SHA1 (patch-aq) = 5c083d9f9f71bcc42811a3d085e936eaaa404c96
+SHA1 (patch-ar) = 4e9162c96329716f844c0c64efb9d0a2915ad1cb
+SHA1 (patch-as) = a36d4bf90f6803734bb686d5809a18ac6d8314ce
+SHA1 (patch-at) = d0fd0f3826e2309f14fefde65a8653e01cae058e
+SHA1 (patch-au) = 08a96e145a9c37ba1ba836457157f1ab781380dc
+SHA1 (patch-av) = bb6ecd69f6b0db22056b492890d2c6369cd08977
+SHA1 (patch-aw) = 89a0f2c3102f6baea966c8e604f642229ad41dc3
+SHA1 (patch-ax) = 771c9c8a951a09c80eb85233986af1fc7fedbe77
+SHA1 (patch-ay) = af4c41b9f7671920cd3db95552dc67edffaf729a
+SHA1 (patch-az) = 53738dc9d3618838a6e6fd2f0ec9c4fd1f19ae2e
SHA1 (patch-ba) = c190b11b9874f00a18b9c75b6e734f4a9dd3f68f
SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1
SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683
SHA1 (patch-bd) = 1a6d035c585838e771a1a677892b95bb82000a7b
SHA1 (patch-be) = d2f3397b7880f23f8cbd5d3c4eb5ccfe6a6ca75b
SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a
-SHA1 (patch-bg) = 17b750d84333eacd39a23aa313d5ba24dc7d2156
-SHA1 (patch-bk) = 0b0b85fb6c5c80c8419c783dc3e35d28edbdb70b
+SHA1 (patch-bg) = 716c90ff76edbdcb223111412bdd011d4a252ca6
SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd
SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9
SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9
-SHA1 (patch-bo) = d338b035b54f87fc2e786ed85204c565fcc2c140
+SHA1 (patch-bo) = ca819c8f8de9bd67b7e6d5738020c90b03c6fad8
SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb
SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2
SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36
-SHA1 (patch-sendmail_domain.c) = fafb14fb647d2f1600895aa8dc9464106906b447
+SHA1 (patch-bs) = f73a66b3f747480505b26876430135364e9aa99e
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/patches/patch-af
--- a/mail/sendmail/patches/patch-af Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/patches/patch-af Sun Jul 04 07:57:13 2021 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.12 2014/06/15 20:48:50 jnemeth Exp $
+$NetBSD: patch-af,v 1.13 2021/07/04 07:57:13 jnemeth Exp $
---- sendmail/conf.c.orig 2014-05-20 17:24:39.000000000 +0000
+--- sendmail/conf.c.orig 2020-06-04 06:27:49.000000000 +0000
+++ sendmail/conf.c
-@@ -43,6 +43,10 @@ SM_RCSID("@(#)$Id: conf.c,v 8.1191 2014-
- # include <ulimit.h>
- #endif /* HASULIMIT && defined(HPUX11) */
+@@ -47,6 +47,10 @@ SM_RCSID("@(#)$Id: conf.c,v 8.1192 2014-
+ # include "tls.h"
+ #endif
+#if !HAS_GETHOSTBYNAME2
+extern struct __res_state sm_res;
@@ -13,7 +13,7 @@
static void setupmaps __P((void));
static void setupmailers __P((void));
static void setupqueues __P((void));
-@@ -4242,13 +4246,13 @@ sm_getipnodebyname(name, family, flags,
+@@ -4312,15 +4316,15 @@ sm_getipnodebyname(name, family, flags,
if (family == AF_INET6)
{
/* From RFC2133, section 6.1 */
@@ -22,15 +22,17 @@
+ resv6 = bitset(RES_USE_INET6, sm_res.options);
+ sm_res.options |= RES_USE_INET6;
}
+ # endif /* RES_USE_INET6 */
SM_SET_H_ERRNO(0);
h = gethostbyname(name);
+ # ifdef RES_USE_INET6
if (!resv6)
- _res.options &= ~RES_USE_INET6;
+ sm_res.options &= ~RES_USE_INET6;
+ # endif
/* the function is supposed to return only the requested family */
- if (h != NULL && h->h_addrtype != family)
-@@ -4463,7 +4467,8 @@ sm_gethostbyaddr(addr, len, type)
+@@ -4536,7 +4540,8 @@ sm_gethostbyaddr(addr, len, type)
#if NETINET6
if (type == AF_INET6 &&
@@ -40,3 +42,20 @@
{
/* Avoid reverse lookup for IPv6 unspecified address */
SM_SET_H_ERRNO(HOST_NOT_FOUND);
+@@ -5690,13 +5695,13 @@ local_hostname_length(hostname)
+ {
+ size_t len_host, len_domain;
+
+- if (!*_res.defdname)
++ if (!*sm_res.defdname)
+ res_init();
+ len_host = strlen(hostname);
+- len_domain = strlen(_res.defdname);
++ len_domain = strlen(sm_res.defdname);
+ if (len_host > len_domain &&
+ (sm_strcasecmp(hostname + len_host - len_domain,
+- _res.defdname) == 0) &&
++ sm_res.defdname) == 0) &&
+ hostname[len_host - len_domain - 1] == '.')
+ return len_host - len_domain - 1;
+ else
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/patches/patch-ag
--- a/mail/sendmail/patches/patch-ag Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/patches/patch-ag Sun Jul 04 07:57:13 2021 +0000
@@ -1,25 +1,25 @@
-$NetBSD: patch-ag,v 1.14 2012/03/12 12:53:13 fhajny Exp $
+$NetBSD: patch-ag,v 1.15 2021/07/04 07:57:13 jnemeth Exp $
---- include/sm/conf.h.orig 2011-05-03 16:24:00.000000000 +0000
+--- include/sm/conf.h.orig 2020-06-04 06:27:49.000000000 +0000
+++ include/sm/conf.h
@@ -381,7 +381,7 @@ typedef int pid_t;
# ifndef __svr4__
# define __svr4__ /* use all System V Release 4 defines below */
- # endif /* ! __svr4__ */
+ # endif
-# if SOLARIS >= 21100
+# if SOLARIS >= 21100 && defined(SOLARIS_HAS_PATHS_H)
# include <paths.h>
- # endif /* SOLARIS >= 21100 */
+ # endif
# ifndef _PATH_VARRUN
-@@ -818,7 +818,11 @@ extern unsigned int sleepX __P((unsigned
+@@ -827,7 +827,11 @@ extern unsigned int sleepX __P((unsigned
# ifndef LA_TYPE
# define LA_TYPE LA_SUBR
- # endif /* ! LA_TYPE */
+ # endif
-# define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
+# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
-+# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */
++# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */
+# else
-+# define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
++# define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */
+# endif
# define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */
# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)*/
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/patches/patch-ai
--- a/mail/sendmail/patches/patch-ai Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/patches/patch-ai Sun Jul 04 07:57:13 2021 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-ai,v 1.9 2014/06/15 20:48:50 jnemeth Exp $
+$NetBSD: patch-ai,v 1.10 2021/07/04 07:57:13 jnemeth Exp $
---- sendmail/mci.c.orig 2014-03-06 17:31:31.000000000 +0000
+--- sendmail/mci.c.orig 2020-05-19 19:54:33.000000000 +0000
+++ sendmail/mci.c
@@ -20,6 +20,7 @@ SM_RCSID("@(#)$Id: mci.c,v 8.225 2013-11
- #endif /* NETINET || NETINET6 */
+ #endif
#include <dirent.h>
+#include <limits.h>
-
- static int mci_generate_persistent_path __P((const char *, char *,
- int, bool));
-@@ -744,7 +745,11 @@ mci_lock_host_statfile(mci)
+ #if STARTTLS
+ # include <tls.h>
+ #endif
+@@ -788,7 +789,11 @@ mci_lock_host_statfile(mci)
{
int save_errno = errno;
int retVal = EX_OK;
diff -r bbcff073db11 -r 9872b3bbc90b mail/sendmail/patches/patch-an
--- a/mail/sendmail/patches/patch-an Sun Jul 04 07:55:51 2021 +0000
+++ b/mail/sendmail/patches/patch-an Sun Jul 04 07:57:13 2021 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.3 2019/07/15 04:32:49 jnemeth Exp $
+$NetBSD: patch-an,v 1.4 2021/07/04 07:57:13 jnemeth Exp $
---- sendmail/Makefile.m4.orig 2015-06-19 12:59:29.000000000 +0000
+--- sendmail/Makefile.m4.orig 2020-06-08 08:35:03.000000000 +0000
+++ sendmail/Makefile.m4
@@ -4,9 +4,10 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
define(`confREQUIRE_LIBSM', `true')
@@ -9,7 +9,7 @@
-define(`bldBIN_TYPE', `G')
+dnl define(`bldBIN_TYPE', `G')
define(`bldINSTALL_DIR', `')
- define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c
queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tls.c trace.c udb.c usersmtp.c util.c version.c ')
+ define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c
queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tlsh.c tls.c trace.c udb.c usersmtp.c util.c version.c ')
Home |
Main Index |
Thread Index |
Old Index