From nobody Thu Jun 26 16:01:04 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 4bSk1s39hhz60jGV; Thu, 26 Jun 2025 16:01:05 +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 4bSk1s09v6z3Ynv; Thu, 26 Jun 2025 16:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750953665; 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=qSugGJb9lFl82XAMhH9ahyCXLRyprnXNpI0/NhRn/ac=; b=ic3gcFMYoGSL8qvw4N80wZVK3MM/joOWDvxmbW6gL1DcDuQStOcM8sRQFO07JMXNhdK5eY yFsamthIfXI1+ve89RJm08ET1odgLdzHOsNHfE2CTSm66nCgy9iGFGzU6pj7/sImxKMSbP JlrRHVO6P247KoQMbbCBopQ1D/HPGWVRKYKTXduKSlocd3t3EOlar4LNgot2bahY0dZPtK 0DoWk32fkxJ7fua1nC8ALDgYAvI6SAGA7MwjxVygM9Ok6kOPsjzFGyxa4NbysoIowVzCFC ULJwr+tc7N2j/1phCIZHrk+mTEleIECnRIl+RdZBd6+F1QwV9mSs/w8+38WC6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750953665; 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=qSugGJb9lFl82XAMhH9ahyCXLRyprnXNpI0/NhRn/ac=; b=Jd1m3TRleVpw0Fyj3ftIS8+qrnhBa1mHfSP7w/lrvHqYtRmh/Tbuxr4KgWujmX/Yhnr/y+ EaLa8C2oHd+0k2Zd4vXT05syqwrN2FktYGxHUdShozOBdh2c0YwlYKZfjzK5YzMuExLbLC 1jcf6MK3kHlrqmR5tXtuLuRvBFZC3FwU/e6/IKi5a2uKu3kM31eh0Qxjp+I4Svsozx4LBt cW6JCPayO+wMqfOxBcdJuJsAEsdC3p4GqU4LwYYDts16Xsm5DNN0p26GQ+rmKgV8WLMJnY c9oMRYHrbAGLsjb9m23KT661Kr6xy4aM6sdrB+ineEf6hHNbDalvtDVLwyqTLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750953665; a=rsa-sha256; cv=none; b=b6XbXD62TIsh75gE7+htbmFF3BaT2lB046ePApBSmbm9wXZO7UK6yfYRCEZZwgskOwyR/z 8XMo0IxODVpwgMzQpQvfV4zLRJP4ohAW9XfaCbVT6st+dfxM5PhhmatoPpHgiQKamQJZrU Gg8O4OKOhSaaH85wy0Uk41oCUX9iC4Y+p6AgWmkkfpuwmW+eRzZhTNK2UqKJQ70qynWf6R M3VyTF/IliMr7bsVO83uyfd0YQUwXjuAzZExmrBsmFlpPxNN+9xCbQuxfIZSEulIUVCxCl 0hhp+GY62uVAzy1qXJxBibBv0XQNC8RcNGFk4bO5P4BtB/MymxPGl8YAXVUJ0A== 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 4bSk1r6jmCz18LT; Thu, 26 Jun 2025 16:01:04 +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 55QG141u043280; Thu, 26 Jun 2025 16:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QG14Ex043277; Thu, 26 Jun 2025 16:01:04 GMT (envelope-from git) Date: Thu, 26 Jun 2025 16:01:04 GMT Message-Id: <202506261601.55QG14Ex043277@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: 111607db6a45 - main - OptionalObsoleteFiles: Keep Heimdal man pages 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: 111607db6a45f9ddf1f025106ac74cb2d540e955 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=111607db6a45f9ddf1f025106ac74cb2d540e955 commit 111607db6a45f9ddf1f025106ac74cb2d540e955 Author: Cy Schubert AuthorDate: 2025-06-26 16:00:13 +0000 Commit: Cy Schubert CommitDate: 2025-06-26 16:00:13 +0000 OptionalObsoleteFiles: Keep Heimdal man pages when switching back Additional man pages that should not be removed when switching back to Heimdal. Fixes: af2593e3212c --- tools/build/mk/OptionalObsoleteFiles.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 8312a4975f4a..eb2713bafac9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6861,7 +6861,6 @@ OLD_FILES+=usr/share/licenses/krb5-1.21.3_1/catalog.mk OLD_FILES+=usr/share/locale/de/LC_MESSAGES/mit-krb5.mo OLD_FILES+=usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo OLD_FILES+=usr/share/locale/ka/LC_MESSAGES/mit-krb5.mo -OLD_FILES+=usr/share/man/man1/compile_et.1.gz OLD_FILES+=usr/share/man/man1/k5srvutil.1.gz OLD_FILES+=usr/share/man/man1/kadmin.1.gz OLD_FILES+=usr/share/man/man1/ktutil.1.gz @@ -6873,7 +6872,6 @@ OLD_FILES+=usr/share/man/man5/k5identity.5.gz OLD_FILES+=usr/share/man/man5/k5login.5.gz OLD_FILES+=usr/share/man/man5/kadm5.acl.5.gz OLD_FILES+=usr/share/man/man5/kdc.conf.5.gz -OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz OLD_FILES+=usr/share/man/man7/kerberos.7.gz OLD_FILES+=usr/share/man/man8/kadmin.local.8.gz OLD_FILES+=usr/share/man/man8/kdb5_ldap_util.8.gz