From nobody Thu Jun 26 15:23:18 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 4bSjBG6cBYz60gMm; Thu, 26 Jun 2025 15:23:18 +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 4bSjBG60xKz3GHj; Thu, 26 Jun 2025 15:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750951398; 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=90V/Hqvh7FKZE7Vn+mKVfhLSH1v3OzC1fu/X/Fq1itU=; b=fJJM1SsGh9gYtEBxnD8TBfWZW2YdQKTQr8zMGx5n+SlD3C/QBgoNAxHMNX12OXXaKdNGS3 UV7OZLVj+x+91J84TjdgPrusAFVaVJJxtBDgkT2ZAvGpa6Gm1G5E6FCAy9vWg2gyQvtTHn CcxWOnVBnJW0of1KEpPveOTgexPFLYbpLyPgT5Uwt+SQvbw62qY3pjW1SYRBPX/XNqvN4w DVek6D/ZPIEB54zvC49D6UaKM/TsbJtjpYbKTZr6YnP3BxvMDwNIgFn58b2oLj/0d4QZLu v9IOFQ3c6X1p9oEhAD/tIfWIOh8e3dWqfh61eRotOt+Tva+F1mCGaspplYvvRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750951398; 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=90V/Hqvh7FKZE7Vn+mKVfhLSH1v3OzC1fu/X/Fq1itU=; b=NZFdonqVF5tFf6Ys2ZAas+nJLfF4hljMHVRHGjuc72Pr/zXmlGCw+5q6BlNal6GDPl5XEe YrMMh/fBatKxrUJt/bSi2urOF9PvI49xqZ3lvpmVYjtB+fA3Y7qHrMjtDfw47NT0POMAmA +gczOY57dqwY8oXajrJjRJiXgumaix89AMREURWXdf+ZQaAvJy9C85fa9YYm6YETv4bTtg HN5e1IxY6DbhXdCtXheVMmubuI4firEiq9If6QH1Og4eU9Yu7cDBzz5XpbF6yq+4WGqUqD BP2nNxcO4qFH5APXIpK8TBPy+vXf5Z6eDBwe7jAJbvko52QmgYtiubhUlgmh0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750951398; a=rsa-sha256; cv=none; b=Of+3y0g+l+r5owqZQYOfFboqf82m/dXYMGJH9wTChFgJDGypvHFUwT5KTeaUUy84S2rkUe xk0Idqc+HY4b3TFOoTMV0rwIqxD+RoTNiJjJYRPzw2h6U3nNHXZpSmwAkSiD6aAVvdgaKD LYbqW/MUclS9OFdc4gaubALQ+dH60P0fUJ9Frxs//FLPGPBUqZOZVDaKfy8AjwZ0OVlYqF A1kmGmG5jZRWz41jnTIexu2zvJRz7ftPsP0pz2D6MqUTGci/8t8Z6RVT8ket9uJN7YUNuh JXrQHWmhFHxpAVjOLaDxMojOxHWe+p63LsP6SumjwLYZ1CsLjWyNyz9q1EtzGQ== 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 4bSjBG5bl9z17NB; Thu, 26 Jun 2025 15:23:18 +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 55QFNIYa073410; Thu, 26 Jun 2025 15:23:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QFNInM073406; Thu, 26 Jun 2025 15:23:18 GMT (envelope-from git) Date: Thu, 26 Jun 2025 15:23:18 GMT Message-Id: <202506261523.55QFNInM073406@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: 5bd818785a07 - main - OptionalObsoleteFiles: Keep Heimdal files when switching back 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: 5bd818785a07262050fe20be4838172ba1a0f00e Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=5bd818785a07262050fe20be4838172ba1a0f00e commit 5bd818785a07262050fe20be4838172ba1a0f00e Author: Cy Schubert AuthorDate: 2025-06-26 15:22:30 +0000 Commit: Cy Schubert CommitDate: 2025-06-26 15:22:30 +0000 OptionalObsoleteFiles: Keep Heimdal files when switching back Additional files that should not be removed when switching back to Heimdal. Fixes: af2593e3212c --- tools/build/mk/OptionalObsoleteFiles.inc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 1edfcdb9a57c..8312a4975f4a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5713,12 +5713,10 @@ OLD_FILES+=usr/bin/sclient OLD_FILES+=usr/bin/sim_client OLD_FILES+=usr/bin/uuclient OLD_FILES+=etc/rc.d/kpropd -OLD_FILES+=usr/include/com_err.h OLD_FILES+=usr/include/common.h OLD_FILES+=usr/include/edwards25519_fiat.h OLD_FILES+=usr/include/edwards25519_tables.h OLD_FILES+=usr/include/groups.h -OLD_FILES+=usr/include/gssapi.h OLD_FILES+=usr/include/gssapi/gssapi_ext.h OLD_FILES+=usr/include/gssapi/gssapi_oid.h OLD_FILES+=usr/include/gssapi/gssapi_alloc.h @@ -5746,7 +5744,6 @@ OLD_FILES+=usr/include/gssrpc/svc_auth.h OLD_FILES+=usr/include/gssrpc/types.h OLD_FILES+=usr/include/gssrpc/xdr.h OLD_FILES+=usr/include/iana.h -OLD_FILES+=usr/include/kadm5/admin.h OLD_FILES+=usr/include/kadm5/chpass_util_strings.h OLD_FILES+=usr/include/kadm5/kadm_err.h OLD_FILES+=usr/include/kdb.h @@ -5760,7 +5757,6 @@ OLD_FILES+=usr/include/krb5/kadm5_hook_plugin.h OLD_FILES+=usr/include/krb5/kdcpolicy_plugin.h OLD_FILES+=usr/include/krb5/kdcpreauth_plugin.h OLD_FILES+=usr/include/krb5/localauth_plugin.h -OLD_FILES+=usr/include/krb5/locate_plugin.h OLD_FILES+=usr/include/krb5/plugin.h OLD_FILES+=usr/include/krb5/preauth_plugin.h OLD_FILES+=usr/include/krb5/pwqual_plugin.h @@ -5786,7 +5782,6 @@ OLD_LIBS+=usr/lib/libk5crypto.so.121 OLD_FILES+=usr/lib/libkadm5clnt_mit.a OLD_FILES+=usr/lib/libkadm5clnt_mit.so OLD_LIBS+=usr/lib/libkadm5clnt_mit.so.121 -OLD_FILES+=usr/lib/libkadm5srv.so OLD_FILES+=usr/lib/libkadm5srv_mit.a OLD_FILES+=usr/lib/libkadm5srv_mit.so OLD_LIBS+=usr/lib/libkadm5srv_mit.so.121