From nobody Tue Aug 5 16:33:46 2025 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 4bxJs711JCz63RH6; Tue, 05 Aug 2025 16:33:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxJs66W2nz3XqT; Tue, 05 Aug 2025 16:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754411626; 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=S1HkhG9hcgESKy9Im8gev/rGF4r8oYo8ksGFpJlPYWw=; b=X4H8zBy5xpteBAiREmqFynAPppH3oX2Uy/EtAu0eq26FORM4FB2Z0j0eUZRKoIzpoLWhSv jsMMLgdqQoRxshIAk0EEnfWQlvSR0RtDPxG7avHC7UCGZBXlCRJA9vFzoaDNuGw7/9JuDu orIskn7f1rW6eMAeo0sQ2Amf+XN+3jI+RMiKqYWrSxYEJVQuqkMzHg2KodZLc7MnA9Y0w6 kHxOySf4vjbSZl0PP/+ZEzHerks+VHe4aR3N5kGj2Lsyuo73sJJMQBPoD6cMJgjVr1W0Jr hDMy5W74wVYxwRRU/1wL7gw+4twqwlBPYRWzscRwzp2xZiS3fCDAYInRimoOkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754411626; 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=S1HkhG9hcgESKy9Im8gev/rGF4r8oYo8ksGFpJlPYWw=; b=apZLKTcSeH+ihPOFpfR25X+Dk5LveX0EL3HGxPM2kM02VQakbjf9ZTdKaSjNyFrwFSx5HE KkdVC/AfASWmldDgFo7rybgjW9Ysb8XyhOBpkXZWZClHJnNEX3O6gNTRf2z31QW8m1QomB 6jwPBuxkDx5u+fOB1LMG7V+48vmOecDIrkkTJt8Co/zCLOK3WyzD5XycghB1vduGpQGzXA M7kpUao+yHGQUbpGAqh/boeR85I5zmuwLVQqR/P1fG0UItdBJpDzjrpy8Ma6xCWHg9dFRD s311PF46Z+1ksQXQfXq3At097SUXPxYJ8BxIKL+6WwaTEnwxLRFHdeJfZ7Dcpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754411626; a=rsa-sha256; cv=none; b=tTLugBYm3/e7fdVxE+h9cWFySUrQoaPHa3c3hurypCGvGEIDfX5kzd7N5ZZZMMFrj4mGtA 1sh0TpieR40YRY8OcYo7cN/ZcxYokF4mh9SPjyPY/tLujS6Z8oSn2oqebVuqx8h3CBDbnK dxKEd4ax/jUWUuNZE3LBlWEd8+V8qlRK6pQSmgrDTa5lJnJHs1FZ+HDn3Kovpc4JP+KlHh 1TQSzN8GhUb6gv6YdPV+KQjL1oDHgVR5U3x5bEM/UtxMOh6S0ycprnyww/0TwaiTW/CFf7 5viVAklJhDhgF1GXtYI567GTGI+Q0ZZ5OdXDAtk0ICJTKQSHjBfkr7cN95q9wg== 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 4bxJs65w6qzkDK; Tue, 05 Aug 2025 16:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 575GXkCS053203; Tue, 5 Aug 2025 16:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 575GXktg053200; Tue, 5 Aug 2025 16:33:46 GMT (envelope-from git) Date: Tue, 5 Aug 2025 16:33:46 GMT Message-Id: <202508051633.575GXktg053200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 3a99a0961d44 - main - krb5: Remove Heimdal library when MK_MITKRB5 is enabled 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-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: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a99a0961d44ed661a19d8d746f6e3ea5d97e1ee Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3a99a0961d44ed661a19d8d746f6e3ea5d97e1ee commit 3a99a0961d44ed661a19d8d746f6e3ea5d97e1ee Author: Cy Schubert AuthorDate: 2025-08-01 06:01:43 +0000 Commit: Cy Schubert CommitDate: 2025-08-05 16:32:43 +0000 krb5: Remove Heimdal library when MK_MITKRB5 is enabled Fixes: af2593e3212c --- tools/build/mk/OptionalObsoleteFiles.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 580be4362a18..58ca2a49b801 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2837,6 +2837,9 @@ OLD_FILES+=usr/lib/libgssapi_krb5.a OLD_FILES+=usr/lib/libgssapi_krb5.so OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 OLD_FILES+=usr/lib/libgssapi_krb5_p.a +OLD_FILES+=usr/lib/libgssapi_mech.a +OLD_FILES+=usr/lib/libgssapi_mech.so +OLD_LIBS+=usr/lib/libgssapi_mech.so.10 OLD_FILES+=usr/lib/libgssapi_ntlm.a OLD_FILES+=usr/lib/libgssapi_ntlm.so OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10 @@ -4919,6 +4922,9 @@ OLD_LIBS+=usr/lib/libcom_err.so.5 OLD_FILES+=usr/lib/libcom_err_p.a OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 OLD_FILES+=usr/lib/libgssapi_krb5_p.a +OLD_FILES+=usr/lib/libgssapi_mech.a +OLD_FILES+=usr/lib/libgssapi_mech.so +OLD_LIBS+=usr/lib/libgssapi_mech.so.10 OLD_FILES+=usr/lib/libgssapi_ntlm.a OLD_FILES+=usr/lib/libgssapi_ntlm.so OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10