From nobody Fri Jun 20 15:12:58 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 4bP1F66PPdz5y8kt; Fri, 20 Jun 2025 15:12:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bP1F640VVz4CdS; Fri, 20 Jun 2025 15:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750432378; 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=lA8YpQvZvy5TLuijD8mrHnoBXZ/iGDkcWFCh2Ea49Xk=; b=E8k0DYZEpndp0/SiiM+vVJrTBv5RotW/DvD8SopFYaKaR0g45enltA+q4eHFPCLiHhXK0w LLSBkCbVpQEbbrx/E8/2csIkYhNm8v3SZS81issZouAhrz+FMlbjWK9wKwILJpvH5OtwGX bjPv0vifybzxIkVDROWbdIaS3AHVQrKDXGPa02r7atxiTAoCPzdatt/NOSmeZXzHra73rF fp0OjGBipZQQkuX9tLO3fbAFdFRO38q9Zyo1CTU3nGeLWF2gNjAPz9ws3u12OYpIvHJTsj rT4dOeS221IBf1rJ+sw7JlW+Dxva1wvDThyd5ePv5sNqxNz6oOHnqOKBaZz5Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750432378; 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=lA8YpQvZvy5TLuijD8mrHnoBXZ/iGDkcWFCh2Ea49Xk=; b=RfDxAWwDOETahSBtCmDG0qTQuIRdPYKjBCdVHor6Oaj9rUSFyYVArd4mGNH5px8mVKb9G5 3cgzYRSHU/E8iVaCiROheun+K3IutkJ1jZdlJsXa+IBJlC52Rsb4VR2zsx3D4dbrSx5J5N 81llCDgyx0yuXOTs4hYEQwUo60YLJpVG+mnmhVIbIVkSYmGp0f9P/rc6k7CXFDP7q/BcHM K1fTwwzAHQZWFYuK6USKQKNGpikE3+LaCRgg2IwExZMpOAve3ipH35tuHNu2WY+W2YLGN8 iEOKqut6aOSKXdLIcbKGcrjTmcMvdU9zE5JwZV6PAkHZQ12B2G97CuArxXIL+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750432378; a=rsa-sha256; cv=none; b=iYpCVzVV+Mtf1Or8qRqw6yJGMKbuKUDSz/EvMHPkdYn2BgpwjVkIjE7a2KhB20pFNtYcbx IXWcmUzhJq1ZsZ83Ehyu+TxvwyyhCL7Fe1Aqu5m40G7dexTJSfqjG9b+bOX2Sab0UD9N1k XW7dkj1nqYiqSQMeEZKzli7p+FLzzc+SaFphcPyEULuEhCrv8RFYAreU9zX/aHrgo0NOq5 ZWINaj87mvwFXbfsMdIwDOPZoWMzhqUN1bX+sTXUDHHLJ3NPdKlgiZ9L3Yn5Jm8cEoIVmo y++S+I1mdtacnxVH/IRF2tzfEAjUyRyvReJpam3WQ3rlJGVA2FQEvuuq3fCFMw== 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 4bP1F63PVnzr7j; Fri, 20 Jun 2025 15:12:58 +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 55KFCwkk009592; Fri, 20 Jun 2025 15:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KFCwZ1009589; Fri, 20 Jun 2025 15:12:58 GMT (envelope-from git) Date: Fri, 20 Jun 2025 15:12:58 GMT Message-Id: <202506201512.55KFCwZ1009589@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: 0b9a631e0724 - main - krb5: Remove artifaccts of my initial builds 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: 0b9a631e072479478f1df4cb9666c02588219bf9 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9a631e072479478f1df4cb9666c02588219bf9 commit 0b9a631e072479478f1df4cb9666c02588219bf9 Author: Cy Schubert AuthorDate: 2025-06-20 13:09:54 +0000 Commit: Cy Schubert CommitDate: 2025-06-20 15:12:43 +0000 krb5: Remove artifaccts of my initial builds The files being removed were artifacts of my initial builds using a process to extract files used by the port during its build. It was later discovered they were not needed but they were not removed from the build at the time. tools/build/mk/OptionalObsoleteFiles.inc removes the extraneous files from an installed system. These files are not supposed to be installed. There are three parts of this patch. 1. Don't install them in the first place. 2. Remove the files if they were previously installed. 3. Ensure they are removed when switching back to Heimdal from MIT. Reported by: fluffy Fixes: ee3960cba106 --- krb5/plugins/preauth/spake/Makefile | 7 ------- krb5/plugins/preauth/test/Makefile | 2 -- tools/build/mk/OptionalObsoleteFiles.inc | 28 ++++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/krb5/plugins/preauth/spake/Makefile b/krb5/plugins/preauth/spake/Makefile index 06f2e385c9ef..a5d9179f8adc 100644 --- a/krb5/plugins/preauth/spake/Makefile +++ b/krb5/plugins/preauth/spake/Makefile @@ -28,13 +28,6 @@ SRCS= edwards25519.c \ spake_kdc.c \ util.c -INCS= edwards25519_fiat.h \ - edwards25519_tables.h \ - groups.h \ - iana.h \ - trace.h \ - util.h - CFLAGS+=-I${KRB5_DIR}/plugins/preauth/spake \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include diff --git a/krb5/plugins/preauth/test/Makefile b/krb5/plugins/preauth/test/Makefile index 0bed7199983c..71b7200b2039 100644 --- a/krb5/plugins/preauth/test/Makefile +++ b/krb5/plugins/preauth/test/Makefile @@ -24,8 +24,6 @@ SRCS= cltest.c \ common.c \ kdctest.c -INCS= common.h - CFLAGS+=-I${KRB5_DIR}/plugins/preauth/test \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 8f1c709c3bd2..e312cf1f4ad4 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2731,12 +2731,16 @@ OLD_FILES+=usr/include/asn1-common.h OLD_FILES+=usr/include/asn1_err.h OLD_FILES+=usr/include/base64.h OLD_FILES+=usr/include/cms_asn1.h +OLD_FILES+=usr/include/common.h OLD_FILES+=usr/include/crmf_asn1.h OLD_FILES+=usr/include/der-private.h OLD_FILES+=usr/include/der-protos.h OLD_FILES+=usr/include/der.h OLD_FILES+=usr/include/digest_asn1.h +OLD_FILES+=usr/include/edwards25519_fiat.h +OLD_FILES+=usr/include/edwards25519_tables.h OLD_FILES+=usr/include/getarg.h +OLD_FILES+=usr/include/groups.h OLD_FILES+=usr/include/gssapi/gssapi_krb5.h OLD_FILES+=usr/include/hdb-protos.h OLD_FILES+=usr/include/hdb.h @@ -2753,6 +2757,7 @@ OLD_FILES+=usr/include/hx509-private.h OLD_FILES+=usr/include/hx509-protos.h OLD_FILES+=usr/include/hx509.h OLD_FILES+=usr/include/hx509_err.h +OLD_FILES+=usr/include/iana.h OLD_FILES+=usr/include/k524_err.h OLD_FILES+=usr/include/kadm5/admin.h OLD_FILES+=usr/include/kadm5/kadm5-private.h @@ -2791,6 +2796,8 @@ OLD_FILES+=usr/include/resolve.h OLD_FILES+=usr/include/rfc2459_asn1.h OLD_FILES+=usr/include/roken-common.h OLD_FILES+=usr/include/rtbl.h +OLD_FILES+=usr/include/trace.h +OLD_FILES+=usr/include/util.h OLD_FILES+=usr/include/wind.h OLD_FILES+=usr/include/wind_err.h OLD_FILES+=usr/include/xdbm.h @@ -3619,6 +3626,10 @@ 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.h OLD_FILES+=usr/include/gssapi/gssapi_alloc.h @@ -3642,6 +3653,7 @@ OLD_FILES+=usr/include/gssrpc/svc.h 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 @@ -3663,6 +3675,8 @@ OLD_FILES+=usr/include/krb5/plugin.h OLD_FILES+=usr/include/krb5/preauth_plugin.h OLD_FILES+=usr/include/krb5/pwqual_plugin.h OLD_FILES+=usr/include/profile.h +OLD_FILES+=usr/include/trace.h +OLD_FILES+=usr/include/util.h OLD_FILES+=usr/include/verto-module.h OLD_FILES+=usr/include/verto.h OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so @@ -4809,12 +4823,16 @@ OLD_FILES+=usr/include/asn1-common.h OLD_FILES+=usr/include/asn1_err.h OLD_FILES+=usr/include/base64.h OLD_FILES+=usr/include/cms_asn1.h +OLD_FILES+=usr/include/common.h OLD_FILES+=usr/include/crmf_asn1.h OLD_FILES+=usr/include/der-private.h OLD_FILES+=usr/include/der-protos.h OLD_FILES+=usr/include/der.h OLD_FILES+=usr/include/digest_asn1.h +OLD_FILES+=usr/include/edwards25519_fiat.h +OLD_FILES+=usr/include/edwards25519_tables.h OLD_FILES+=usr/include/getarg.h +OLD_FILES+=usr/include/groups.h OLD_FILES+=usr/include/hdb-protos.h OLD_FILES+=usr/include/hdb.h OLD_FILES+=usr/include/hdb_asn1.h @@ -4830,6 +4848,7 @@ OLD_FILES+=usr/include/hx509-private.h OLD_FILES+=usr/include/hx509-protos.h OLD_FILES+=usr/include/hx509.h OLD_FILES+=usr/include/hx509_err.h +OLD_FILES+=usr/include/iana.h OLD_FILES+=usr/include/k524_err.h OLD_FILES+=usr/include/kadm5/kadm5-private.h OLD_FILES+=usr/include/kadm5/kadm5-protos.h @@ -4863,6 +4882,8 @@ OLD_FILES+=usr/include/resolve.h OLD_FILES+=usr/include/rfc2459_asn1.h OLD_FILES+=usr/include/roken-common.h OLD_FILES+=usr/include/rtbl.h +OLD_FILES+=usr/include/trace.h +OLD_FILES+=usr/include/util.h OLD_FILES+=usr/include/wind.h OLD_FILES+=usr/include/wind_err.h OLD_FILES+=usr/include/xdbm.h @@ -5667,6 +5688,10 @@ 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 @@ -5694,6 +5719,7 @@ OLD_FILES+=usr/include/gssrpc/svc.h 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 @@ -5715,6 +5741,8 @@ OLD_FILES+=usr/include/krb5/plugin.h OLD_FILES+=usr/include/krb5/preauth_plugin.h OLD_FILES+=usr/include/krb5/pwqual_plugin.h OLD_FILES+=usr/include/profile.h +OLD_FILES+=usr/include/trace.h +OLD_FILES+=usr/include/util.h OLD_FILES+=usr/include/verto-module.h OLD_FILES+=usr/include/verto.h OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so