From nobody Tue Apr 28 16:58:35 2026 X-Original-To: dev-commits-ports-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 4g4mpz3wjGz6bmQ1 for ; Tue, 28 Apr 2026 16:58:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4mpz29fgz3Z3t for ; Tue, 28 Apr 2026 16:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777395515; 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=q58GST1VECbwxWDj2PFORa2Q9ANyJb37Y3ibAu3oOk8=; b=DvUTVwXBVvXy3SCH6CYIQVLZpx7dGQ7q8ZtrVISD7irEj7DC0+uZSsft8eO/zUqt83eye1 xvMhUGRVc4+BSQNX5zHv4gW0IjbI8gq6M0eGuVqzV3wPna7iNtmkvLm8p8lAE5S7+BkxnV CZ3rubgJEJUP7guaeWXzBoxHudyplSYVg+1cxbUu+bpzi+CRAb0i4locF/vJFAiVSNGXSv 8n+Vc9bLFDqGiITL3IKpdOFJnwqQA2+fxX82qyOm+zI7MLolyn6HcyEnyUBbD0C66Rh2tl MjQnPTX4SC7IYttYMsFsuSo8/BYcBv5DZnb7joJRc99t+h5f/b56G9/0lUQJlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777395515; a=rsa-sha256; cv=none; b=JnEVNKquCSvMPIPRZfPOh61mCLW9qqpRLUU3eFjMiUI45rmHBvql7OPFFiFZ86jc1gz71B iV0sGvDO3bvYEjz5cKMo3Gxa/Cts3dalidjowy1Rj9lLpDhtL7sWIzIu9uymfdg+yROAWu Q52k0BtW0RP/D4zjN+SfKnwzmIrn7J0FTl88USEvtKbWYy662OIHX/18Et71VYWTCoowVK Yuf4Nh8oeTnrYv59i2aySzUbD4Jk81/Y4nHkBq+vjdTJ+bQWvnuYzYmDyTpM5Aaxm2KL9s PpiGuEa7u2yFeQAMN6tVgQbl4zfBv6kUMTkp8xg2965/1jpvHR984imIdj+vdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777395515; 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=q58GST1VECbwxWDj2PFORa2Q9ANyJb37Y3ibAu3oOk8=; b=T4NOr2TkeHlLcb4EeMZuS0LjaWU46l3BO8WiFiWRS3KZZmnPI4CMWBp0DMZECdhLazTJn1 eG/5ti8GpHFSomagHM9l1T4ozDIyM7wT9AbSN+J+OzRTYQO8XssQT5n+sDHmZlE/9gx/XI xB1wG5Sx2yK7EtmjLSDGRdnXVEvcK0xO+wveMSOF5449Jlw2qT9cVEPOHjiANacFgKDCit qFSGD1CGldkE1tUJ/iVQUWeqV4nz1ErzwXGl21dUmQ0vgsbNKYweSo1VLSwdpUOU24x70q T7/GTkhhIAcowLK3KyWfnr5p1lXE+pxVzl4wFUjIfDyUqMBdbIPywenI8e8P6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4mpz1bBGz12Fk for ; Tue, 28 Apr 2026 16:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19403 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Apr 2026 16:58:35 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 1f29b1929b82 - main - security/krb5-devel: update to the latest MIT/KRB5 github commit List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f29b1929b8217b102eeb2d2ce3ca836801622d4 Auto-Submitted: auto-generated Date: Tue, 28 Apr 2026 16:58:35 +0000 Message-Id: <69f0e73b.19403.1ece0ee7@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f29b1929b8217b102eeb2d2ce3ca836801622d4 commit 1f29b1929b8217b102eeb2d2ce3ca836801622d4 Author: Cy Schubert AuthorDate: 2026-04-28 15:02:39 +0000 Commit: Cy Schubert CommitDate: 2026-04-28 16:58:23 +0000 security/krb5-devel: update to the latest MIT/KRB5 github commit Support for OpenSSL 1.1.1 has been removed by upstream in this update. --- security/krb5-devel/Makefile | 4 +-- security/krb5-devel/distinfo | 6 ++--- ...lugins_preauth_pkinit_pkinit__crypto__openssl.c | 30 ++++++++-------------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 2f646b746585..3c2377b09eb5 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -8,8 +8,8 @@ PKGNAME_X= -${FLAVOR:S/default//} .endif PKGNAMESUFFIX= ${PKGNAME_X:S/--/-/:C/-$//} -HASH= f8a0bee0a -MIT_COMMIT_DATE= 2026.03.23 +HASH= 0138cbef6 +MIT_COMMIT_DATE= 2026.04.23 PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 diff --git a/security/krb5-devel/distinfo b/security/krb5-devel/distinfo index 9995bc93bef9..04b3817650dc 100644 --- a/security/krb5-devel/distinfo +++ b/security/krb5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1774455077 -SHA256 (krb5-krb5-1.23.2026.03.23-f8a0bee0a_GH0.tar.gz) = 48005a52e92099f588737782ece32092e5197ba4bee4cc67bf2d312cfb7361ad -SIZE (krb5-krb5-1.23.2026.03.23-f8a0bee0a_GH0.tar.gz) = 4678952 +TIMESTAMP = 1777387626 +SHA256 (krb5-krb5-1.23.2026.04.23-0138cbef6_GH0.tar.gz) = 7543ad7544514c562089c68b1d16abeab98236fe7b8cb73f6ab8c30ee70a84ea +SIZE (krb5-krb5-1.23.2026.04.23-0138cbef6_GH0.tar.gz) = 4677660 diff --git a/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c b/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c index a26d295ebf75..65f7fc262601 100644 --- a/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c +++ b/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c @@ -1,23 +1,15 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2021-11-05 16:24:07.000000000 -0700 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2021-11-08 10:10:45.431325000 -0800 -@@ -178,7 +178,8 @@ - (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ defined(LIBRESSL_VERSION_NUMBER) - - /* 1.1 standardizes constructor and destructor names, renaming - * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -722,6 +723,10 @@ - DH_free(dh); - return pkey; +diff --git plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig plugins/preauth/pkinit/pkinit_crypto_openssl.c +index 11c570f..cba4515 100644 +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c +@@ -787,6 +787,10 @@ oerr(krb5_context context, krb5_error_code code, const char *fmt, ...) + return code; } -+ + +#if defined(LIBRESSL_VERSION_NUMBER) && !defined(static_ASN1_SEQUENCE_END_name) +#define static_ASN1_SEQUENCE_END_name ASN1_SEQUENCE_END_name +#endif - - static struct pkcs11_errstrings { - short code; ++ + /* + * Set an appropriate error string containing msg for a certificate + * verification failure from certctx. Write the message and all pending