From nobody Fri Oct 27 09:16:49 2023 X-Original-To: dev-commits-ports-all@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 4SGxr15RXrz4y1Nj; Fri, 27 Oct 2023 09:16:49 +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 4SGxr14fCnz3ZV3; Fri, 27 Oct 2023 09:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698398209; 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=PgWGQ7mPc54p7sFGlJQfbF634Vpkf8IKtC3zHBM/12E=; b=axs7MOVed6sQzBlFKxaiGhwA7tjrWr5WUwB2p3/4vLzQ8/poMlGOev8yvHWL0YobBtLUV3 r3vwm0X2zr1jEHIy6RgQpzqXT8PrhnpiGL9qJ9/fPBb6R9vve3asClFePjACQHGLdy5/Hz yIe9tLHg1N26SP7RKRyiKXPoLEAKsbhockb+tFYuSwLzKCtHBQbfPysn3MEgHdkZs87a3q EhtZkr7cT1waqaXMMcime/G7wLcLvqxs0Ro6QB+9oyk1jiJUoGOIMljgb5edPwgY2cpJBM BOoNg0ST4HxGKtCEOEOYxm0Va0mLKFACF8nhFWdYUTums0Lb8/YjFvNbDb0sOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698398209; 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=PgWGQ7mPc54p7sFGlJQfbF634Vpkf8IKtC3zHBM/12E=; b=CF9oZnnyaHnRJMD3Lxra8vM2dtZwe/8Y3GVhtNjkJU8AhFxPFXa9CCPuL44hBieZERDnEt qv+VyRzT+z/4GHgGSmQDfS8SLpaIDy9Ka/HT/f9otS8UevffYeQH3DQs3EiMqHDBVPPbzp aN6RHLLPgGzWLYSyus/M2Nibq7e12UYMXrYgEFC1LMCvGwXojbS/GGcHgcjxrVfEbHlkOp sfi0M0JnA8XIowPXomd6Bz4QsOdzoyuTD/YrOjSVOE3TPB//LrlHWXflEp5/2kBtxnDwn+ Lx4PA3xHw8gblNR4XVAjbtVA/CYSrGOCOEDjawnrtJ6NKneK0L+RJ1xEDvsm3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698398209; a=rsa-sha256; cv=none; b=QnvQpq28GP5gMtJk0EfUUGPYkT+91hQYQuJY7fluJp1sUZqmigGwrDmcw+cWb5M+6M3lHT GI/4PP/Z6IHdufD2rP/8V3MwVshFJn97WbhYWeKu5LM0eClRtMcFziXhqmp0U8yrgLZIIA QYwfcgFXtDY0oWA0Uqs74ke/gtKlwkw24nCL/ZWQv7SuhS3ATeU2QJsd0mcYWmCVtsz0a0 OcxfLTN55XbksJDNtuWTfTC+ClBNdTJlKUn66qnH6vxAlBm/nGtHNpLgfhAkT3BzwWJUmd BN08PVUiuXMolxfUL6ioZ6wQiugsPhJX0q5+Xi2CsSn0wNBKyolBCIm+F9+BKw== 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 4SGxr13PgKz16nR; Fri, 27 Oct 2023 09:16:49 +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 39R9GnrL059373; Fri, 27 Oct 2023 09:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R9GnN5059370; Fri, 27 Oct 2023 09:16:49 GMT (envelope-from git) Date: Fri, 27 Oct 2023 09:16:49 GMT Message-Id: <202310270916.39R9GnN5059370@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e11bc4726338 - main - mail/opensmtpd: Use the correct OpenSSL idiom to load the trust store. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e11bc472633868a658ecbb8176b2b3ede4ae6e0d Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=e11bc472633868a658ecbb8176b2b3ede4ae6e0d commit e11bc472633868a658ecbb8176b2b3ede4ae6e0d Author: Dag-Erling Smørgrav AuthorDate: 2023-10-27 09:16:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-27 09:16:43 +0000 mail/opensmtpd: Use the correct OpenSSL idiom to load the trust store. Fixes: bde578cbfcf9 PR: 274322 MFH: 2023Q4 Approved by: fluffy Differential Revision: https://reviews.freebsd.org/D42123 --- mail/opensmtpd/Makefile | 2 +- mail/opensmtpd/files/patch-mk_smtpd_Makefile.in | 6 +++--- mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index 771230a5b80e..4bf5a859e556 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -1,6 +1,6 @@ PORTNAME= opensmtpd PORTVERSION= 7.3.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= p2 PORTEPOCH= 1 CATEGORIES= mail diff --git a/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in b/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in index e1597ed92f0e..3604c0868c76 100644 --- a/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in +++ b/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in @@ -1,8 +1,8 @@ ---- mk/smtpd/Makefile.in.orig 2019-10-26 11:56:36 UTC +--- mk/smtpd/Makefile.in.orig 2023-09-16 18:13:47 UTC +++ mk/smtpd/Makefile.in -@@ -1404,13 +1404,7 @@ install-exec-hook: $(CONFIGFILES) $(MANPAGES) - $(MKDIR_P) $(DESTDIR)$(bindir) +@@ -1471,13 +1471,7 @@ install-exec-hook: $(CONFIGFILES) $(MANPAGES) $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)7 $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - - @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \ diff --git a/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c b/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c new file mode 100644 index 000000000000..cd033b41dace --- /dev/null +++ b/mail/opensmtpd/files/patch-openbsd-compat_libtls_tls.c @@ -0,0 +1,16 @@ +--- openbsd-compat/libtls/tls.c.orig 2023-09-16 18:11:28 UTC ++++ openbsd-compat/libtls/tls.c +@@ -584,10 +584,10 @@ tls_configure_ssl_verify(struct tls *ctx, SSL_CTX *ssl + + /* If no CA has been specified, attempt to load the default. */ + if (ctx->config->ca_mem == NULL && ctx->config->ca_path == NULL) { +- if (tls_config_load_file(&ctx->error, "CA", tls_default_ca_cert_file(), +- &ca_mem, &ca_len) != 0) ++ if (!SSL_CTX_set_default_verify_paths(ssl_ctx)) { ++ tls_set_error(ctx, "failed to load default trust store"); + goto err; +- ca_free = ca_mem; ++ } + } + + if (ca_mem != NULL) {