From nobody Thu Feb 01 00:15:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQKDs22wLz58bm3; Thu, 1 Feb 2024 00:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQKDs1XsFz4Gps; Thu, 1 Feb 2024 00:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnwtRWUIY2iw9tNeMRJEvaFzeykqry4GbMw/+bEegQ0=; b=QFwSiH1wXtjjDXynZD627pI3u49kj4p8NoiApHvs4rJw48R9E1SPMe6ZhqRMhZ62v0TCeD atC/13yl2fgG2hKfQZ8YK2GfgabMf03WFEM3yjRyF/CaryeiAmh3hIQpuTi88rS2xN7S6W sBmFXzcrSWfEHyAOMutuYPtL/8KlOQdchguJ9gMEYrzuzEbaP8tJLetFOtMnmuBwn/uR8k xYV0BOGvIY5JQzBKMTAzzcHmdq5dSETeb9xOe7dQKDtJs14/MSta6dhlETK5WR66TgGs3S YOgUnfwuIUahciQA9MDEbAx/AA3tBkkRAaCYvCUy9Y08urIW+d88YSOYCmFC2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnwtRWUIY2iw9tNeMRJEvaFzeykqry4GbMw/+bEegQ0=; b=fSOhy4A9otCbWDj6Ou4tKdRt/xEXiLvwb3LPz49mfGRPNmIfT3pw2/HnbusOAF7IFWgjZt TjtlwvMQA0Lao1imFsk7JXmA0Rq/aa0N2TOcXVToBNJQ8wlOCn/wqEBFlwT0QjyiwbwSUD S38tbZ73DFZJ7s5FiH6YU+t32o67qk6bZBLoCBHfU1MM03K19x0LeSJVDM+enFJUjLJwbn 13j0lCS8UxJ6JaphGTTdZh5xkciADKRawfazWKYyNAm++wuuKdXoneNIEuSEG6kc+aU1hz svOw8Nj9YX27osBTDLXJtfKZMsiK4E16d3IQpXuQGhqKdVGtoH1gq1nJnQECaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706746541; a=rsa-sha256; cv=none; b=vPakaqkfOfk+HD4hHNYB5oK872f65VCKh5Vuamxq8X0mSE/h5zhzSZ8pN/kbzmlrgrS8AO jFPX93IfaR1PlA/RubUmMPwUMUvs7lnYLxGDnWa6aRQXjotyn42WWxiSKyzIi4uWMQtvNj 4Ckn9st3vVgbaWlmRyvCjE7f9Ro/7saWIh9ZhhqMEPTHvJxiFlCKxD0DUxjnOxmdBuwgpG BGV/1KJ9Gdy0Cm8bQuT+F53I9+s7PDNHLXVHc2Bwkn0gYvxinKp5PD+MPlRYEUoYWWfSdm m6TF/a+IOdT+ykJAN604pyHWHg+5H68r/zCHnoAxT66u4uBCbhTGgcZkRHJZog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQKDs0TQwzgHH; Thu, 1 Feb 2024 00:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4110Fe20036155; Thu, 1 Feb 2024 00:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4110FeY5036152; Thu, 1 Feb 2024 00:15:40 GMT (envelope-from git) Date: Thu, 1 Feb 2024 00:15:40 GMT Message-Id: <202402010015.4110FeY5036152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: d39bd2c1388b - main - Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d39bd2c1388b520fcba9abed1932acacead60fba Auto-Submitted: auto-generated 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 AuthorDate: 2024-01-31 23:53:48 +0000 Commit: Gregory Neil Shapiro 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