git: d39bd2c1388b - main - Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 01 Feb 2024 00:15:40 UTC
The branch main has been updated by gshapiro:
URL: https://cgit.FreeBSD.org/src/commit/?id=d39bd2c1388b520fcba9abed1932acacead60fba
commit d39bd2c1388b520fcba9abed1932acacead60fba
Merge: 1f1b2286fd5a 850ef5ae11d6
Author: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
AuthorDate: 2024-01-31 23:53:48 +0000
Commit: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
CommitDate: 2024-01-31 23:53:48 +0000
Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3'
Merge vendor sendmail 8.18.1 into HEAD
contrib/sendmail/KNOWNBUGS | 17 +-
contrib/sendmail/PGPKEYS | 625 +++++++-
contrib/sendmail/README | 26 +-
contrib/sendmail/RELEASE_NOTES | 215 ++-
contrib/sendmail/cf/README | 29 +-
contrib/sendmail/cf/cf/submit.cf | 15 +-
contrib/sendmail/cf/feature/check_cert_altnames.m4 | 2 +-
contrib/sendmail/cf/feature/enhdnsbl.m4 | 14 +-
contrib/sendmail/cf/feature/fips3.m4 | 16 +
contrib/sendmail/cf/feature/ldap_routing.m4 | 2 +-
contrib/sendmail/cf/hack/xconnect.m4 | 4 +-
contrib/sendmail/cf/m4/proto.m4 | 84 +-
contrib/sendmail/cf/m4/version.m4 | 2 +-
contrib/sendmail/cf/sh/makeinfo.sh | 2 +-
contrib/sendmail/contrib/buildvirtuser | 2 +-
contrib/sendmail/doc/op/Makefile | 6 +-
contrib/sendmail/doc/op/op.me | 271 ++--
contrib/sendmail/include/libsmdb/smdb.h | 2 +-
contrib/sendmail/include/sendmail/sendmail.h | 1 +
contrib/sendmail/include/sm/conf.h | 8 +-
contrib/sendmail/include/sm/fdset.h | 1 +
contrib/sendmail/include/sm/gen.h | 4 +
contrib/sendmail/include/sm/ixlen.h | 1 +
contrib/sendmail/include/sm/notify.h | 7 +-
contrib/sendmail/include/sm/os/sm_os_openbsd.h | 14 -
contrib/sendmail/include/sm/rpool.h | 2 +
contrib/sendmail/libmilter/README | 3 +
contrib/sendmail/libmilter/docs/overview.html | 2 +-
.../sendmail/libmilter/docs/smfi_getsymval.html | 17 +-
.../sendmail/libmilter/docs/smfi_replacebody.html | 2 +-
contrib/sendmail/libmilter/docs/xxfi_body.html | 2 +-
contrib/sendmail/libmilter/docs/xxfi_header.html | 4 +-
contrib/sendmail/libmilter/engine.c | 24 +-
contrib/sendmail/libsm/Makefile.m4 | 1 -
contrib/sendmail/libsm/README | 4 +-
contrib/sendmail/libsm/b-strl.c | 2 +-
contrib/sendmail/libsm/exc.html | 2 +-
contrib/sendmail/libsm/heap.c | 2 +-
contrib/sendmail/libsm/io.html | 14 +-
contrib/sendmail/libsm/ldap.c | 110 +-
contrib/sendmail/libsm/lowercase.c | 35 +-
contrib/sendmail/libsm/mpeix.c | 2 +-
contrib/sendmail/libsm/notify.c | 68 +-
contrib/sendmail/libsm/notify.h | 111 ++
contrib/sendmail/libsm/rewind.c | 2 +-
contrib/sendmail/libsm/setvbuf.c | 3 +-
contrib/sendmail/libsm/stdio.c | 2 +-
contrib/sendmail/libsm/strcaseeq.c | 12 +-
contrib/sendmail/libsm/t-ixlen.c | 56 +-
contrib/sendmail/libsm/t-notify.c | 141 +-
contrib/sendmail/libsm/t-qic.c | 16 +-
contrib/sendmail/libsm/t-streq.c | 42 +-
contrib/sendmail/libsm/t-streq.sh | 19 +
contrib/sendmail/libsm/test.c | 2 +-
contrib/sendmail/libsm/util.c | 10 +-
contrib/sendmail/libsm/vfprintf.c | 16 +-
contrib/sendmail/libsm/vfscanf.c | 2 +-
contrib/sendmail/libsmdb/smcdb.c | 2 +-
contrib/sendmail/libsmdb/smdb.c | 7 +-
contrib/sendmail/libsmdb/smdb1.c | 2 +-
contrib/sendmail/libsmdb/smdb2.c | 2 +-
contrib/sendmail/libsmdb/smndbm.c | 4 +-
contrib/sendmail/libsmutil/t-lockfile.c | 104 +-
contrib/sendmail/mail.local/mail.local.c | 2 +-
contrib/sendmail/makemap/makemap.8 | 8 +
contrib/sendmail/makemap/makemap.c | 187 ++-
contrib/sendmail/smrsh/README | 2 +-
contrib/sendmail/src/Makefile.m4 | 2 +-
contrib/sendmail/src/README | 25 +-
contrib/sendmail/src/SECURITY | 14 +-
contrib/sendmail/src/TRACEFLAGS | 16 +-
contrib/sendmail/src/alias.c | 209 ++-
contrib/sendmail/src/bf.c | 2 +-
contrib/sendmail/src/collect.c | 258 +++-
contrib/sendmail/src/conf.c | 158 +-
contrib/sendmail/src/conf.h | 8 +-
contrib/sendmail/src/control.c | 2 -
contrib/sendmail/src/daemon.c | 137 +-
contrib/sendmail/src/daemon.h | 2 +-
contrib/sendmail/src/deliver.c | 1603 +++++++++++++++-----
contrib/sendmail/src/domain.c | 482 +++++-
contrib/sendmail/src/err.c | 4 -
contrib/sendmail/src/headers.c | 32 +-
contrib/sendmail/src/helpfile | 6 +-
contrib/sendmail/src/macro.c | 59 +-
contrib/sendmail/src/main.c | 126 +-
contrib/sendmail/src/map.c | 438 ++++--
contrib/sendmail/src/map.h | 8 +
contrib/sendmail/src/mci.c | 13 +-
contrib/sendmail/src/milter.c | 27 +-
contrib/sendmail/src/mime.c | 8 +-
contrib/sendmail/src/parseaddr.c | 44 +-
contrib/sendmail/src/queue.c | 214 +--
contrib/sendmail/src/ratectrl.c | 3 +-
contrib/sendmail/src/readcf.c | 238 ++-
contrib/sendmail/src/recipient.c | 11 +-
contrib/sendmail/src/savemail.c | 4 +-
contrib/sendmail/src/sched.c | 172 +++
contrib/sendmail/src/sendmail.8 | 4 +-
contrib/sendmail/src/sendmail.h | 179 ++-
contrib/sendmail/src/sfsasl.c | 8 +-
contrib/sendmail/src/sm_resolve.c | 206 +--
contrib/sendmail/src/sm_resolve.h | 28 +-
contrib/sendmail/src/srvrsmtp.c | 465 ++++--
contrib/sendmail/src/stab.c | 6 +
contrib/sendmail/src/tls.c | 599 ++++++--
contrib/sendmail/src/tls.h | 91 +-
contrib/sendmail/src/tlsh.c | 37 +-
contrib/sendmail/src/udb.c | 16 +-
contrib/sendmail/src/usersmtp.c | 75 +-
contrib/sendmail/src/util.c | 142 +-
contrib/sendmail/src/version.c | 2 +-
contrib/sendmail/test/README | 9 +-
contrib/sendmail/vacation/vacation.1 | 25 +-
contrib/sendmail/vacation/vacation.c | 232 ++-
115 files changed, 6703 insertions(+), 2166 deletions(-)
diff --cc contrib/sendmail/cf/feature/fips3.m4
index 000000000000,0d17642a111b..0d17642a111b
mode 000000,100644..100644
--- a/contrib/sendmail/cf/feature/fips3.m4
+++ b/contrib/sendmail/cf/feature/fips3.m4
diff --cc contrib/sendmail/cf/sh/makeinfo.sh
index 1c907ccd68fa,29d6ac4a8fd6..4ab306665e24
--- a/contrib/sendmail/cf/sh/makeinfo.sh
+++ b/contrib/sendmail/cf/sh/makeinfo.sh
@@@ -54,7 -52,7 +54,7 @@@ the
else
host=`uname -n`
fi
-echo '#####' built by $user@$host on `date`
+echo '#####' built by $user@$host
echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
- echo "define(\`__HOST__', $host)dnl"
+ echo "define(\`__HOST__', \`$host')dnl"
diff --cc contrib/sendmail/libsm/notify.h
index 000000000000,a314e75a4bb2..a314e75a4bb2
mode 000000,100644..100644
--- a/contrib/sendmail/libsm/notify.h
+++ b/contrib/sendmail/libsm/notify.h
diff --cc contrib/sendmail/src/sched.c
index 000000000000,8a15bcf10f6e..8a15bcf10f6e
mode 000000,100644..100644
--- a/contrib/sendmail/src/sched.c
+++ b/contrib/sendmail/src/sched.c