From nobody Tue Aug 19 13:20: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 4c5qvy5pGQz64tZH; Tue, 19 Aug 2025 13:20:46 +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 4c5qvy50ZXz3S12; Tue, 19 Aug 2025 13:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609646; 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=uuSuzJTw0gZSOSjcYuuHuOMmr9NCyUZvC4L3SMSrZ5Q=; b=p156QDZa4Q5/DsYQxMTiZhch7p2GJHBNoncDz0EWuYdgASWBYcx3FgmAETt4BVBa8kOp0m 9CtRGuJqvb3lHTa9L5KxrHU3v4OP1I/OVmTLUPrc5jrW/BuDqCIJs/2crpB2lh7xFmawnx ZxPc/J9bfnah1n1IwAyjdsxVeHAS6H5NuWHaVUbh2hbf0sQC0vTI4ya66o4u7x51pkeVT9 FD5StS9HC+GkTY5fQGHOIC/Wz1RSYKu8oSV+hbSO42RNYbqMqFgFJS+EpfyYbfndCJAdyw RrMNkQQJbZuDX3dU8Vg9fOVk3HXuxR8XXOBd53PzV8DrIGGL71SNLizyu1aVnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755609646; 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=uuSuzJTw0gZSOSjcYuuHuOMmr9NCyUZvC4L3SMSrZ5Q=; b=qFU6UDBezu4xQwFrvPG/rUsxmzS/tyaWaJVmjyuZxBpuBNTGmqYjJ723LszBkdx3U5baJn ZIOUXaeN+Z0NzX4IRPQu3gHLyE1EChtPA2GGqW93pq9nPiW7wlVMfIJ/JWVKvGQ1WyZNWc Uz3l/5kmQEOe3i3gjI4ZHwz+Zb1650RBpCIMBFFSzpr3+p8NuVP7BFp4WMgkRpSWOqiPqe I5mmMlZi/EjmUX2LSh4dB3SFebM/njblFPe/IS8FQxVAcx4+gFjlm4d26BecYAle59FJHc BhNeA9relrerPd6DYRxUqDJIDYD///4ybAC0ExWAm9wOIlmCWmtB5PRSTHvRxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755609646; a=rsa-sha256; cv=none; b=wcJZmA6IurgAsu+crB+fFoaCSFwVCzkGailq7slwPmJhnNLUtb+vHHgxl47rurUlDuW+BY /IVGxbdbnr45NXYBm8U7Ze58WWgH7ml9+A9zSY+IWZyB3eDboYckrKUH62XvdO2/+CAyWU sZSYn7WKT7DP73EdJhnWSnbHngVfbD+SxQY6K4GMM423nSdAdgEL1he4e5ab3gFgwheL26 vBKY0CM5Qw4uGzDnGLHUfZjnm2jPfTUulwalUgF9N7qJva5K/kzv+VKz95qkTOJibFdPG6 jahD8FqtICNRNuvnZQtCbe0WvNqAw804sHfpP1U5+j4MR2LUAsLXMruJg9mTLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5qvy4b6QzD0m; Tue, 19 Aug 2025 13:20: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 57JDKkA2035858; Tue, 19 Aug 2025 13:20:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JDKkFi035855; Tue, 19 Aug 2025 13:20:46 GMT (envelope-from git) Date: Tue, 19 Aug 2025 13:20:46 GMT Message-Id: <202508191320.57JDKkFi035855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5105e1ebecc7 - main - krb5: Fix the installed compile_et 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5105e1ebecc784dcf8101ec6f3c79b27c43b004b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5105e1ebecc784dcf8101ec6f3c79b27c43b004b commit 5105e1ebecc784dcf8101ec6f3c79b27c43b004b Author: Mark Johnston AuthorDate: 2025-08-19 13:02:00 +0000 Commit: Mark Johnston CommitDate: 2025-08-19 13:20:16 +0000 krb5: Fix the installed compile_et We now build compile_et from krb5/util/compile_et. The compile_et make target runs compile_et.sh through a preprocessor that does some substitution on the script, in particular it defines the directory where compile_et can find et_h.awk and et_c.awk. We build compile_et as a bootstrap tool since it's used to build krb5. It also gets installed by installworld, presumably because we did that with Heimdal Kerberos too and there's some chance that third-party projects are using it. There are two problems, both fixed by this patch: First, we don't actually install those awk scripts anywhere, so /usr/sbin/compile_et isn't usable on an installed system. Let's simply install them to /usr/share/et, which is where upstream puts them. Second, compile_et is a bootstrap tool and gets installed into WORLDTMP during the bootstrap phase of the build. At that point we preprocess it to set the directory where it can find those awk scripts. That directory is currently set with `KRB5_ETDIR?= ${DESTDIR}/usr/share/et`, but DESTDIR points into the object directory, so this value is bogus. Since all build-time invocations of compile_et explicitly specify the script directory with the -d option, let's just update the path to point to the installed script directory. In particular, avoid fixing DESTDIR in the script, since we don't do that generally. PR: 288929 Reviewed by: ivy, cy Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52004 --- etc/mtree/BSD.usr.dist | 2 ++ krb5/Makefile.inc | 2 +- krb5/util/et/Makefile | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 68977a6b8282..ffdd82ae9911 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -267,6 +267,8 @@ .. dtrace .. + et + .. examples BSD_daemon .. diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc index cd54f7a0eff6..6db4e8d964aa 100644 --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -14,7 +14,7 @@ KRB5_VERSION= 1.22-final # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. KRB5_SRCTOP= ${SRCTOP}/krb5 KRB5_DIR= ${SRCTOP}/crypto/krb5/src -KRB5_ETDIR?= ${DESTDIR}/usr/share/et +KRB5_ETDIR?= /usr/share/et KRB5_SRCLIBDIR= ${KRB5_DIR}/lib KRB5_OBJTOP= ${OBJTOP}/krb5 diff --git a/krb5/util/et/Makefile b/krb5/util/et/Makefile index 6eceb253c3b0..0d474efa1e8e 100644 --- a/krb5/util/et/Makefile +++ b/krb5/util/et/Makefile @@ -20,7 +20,6 @@ INCSDIR=${INCLUDEDIR} LIBADD= krb5support VERSION_MAP= ${.CURDIR}/version.map - SRCS= com_err.c \ error_message.c \ et_name.c \ @@ -38,6 +37,14 @@ CFLAGS+=-I${KRB5_DIR}/util/et \ -I${.CURDIR:H:H}/include \ -I${.OBJDIR} +FILESGROUPS= ETSCRIPTS + +ETSCRIPTS= et_c.awk \ + et_h.awk + +ETSCRIPTSDIR= ${KRB5_ETDIR} +ETSCRIPTSMODE= 0444 + .include .SUFFIXES: .h .c .et .ct .man .3