From nobody Mon Jul 27 14:01:40 2026 X-Original-To: dev-commits-src-all@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 4h80dP3x1Wz6n2Lb for ; Mon, 27 Jul 2026 14:01:45 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h80dP34FZz3ljZ for ; Mon, 27 Jul 2026 14:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785160905; 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=mvlKsQuZan0lW0O8qLW1J1cz5j/5Z0mGHyXYxH3fShM=; b=fwqJIyA2hTAjsKFVFQeMjotEKa6CQuMuDu9xJ6n1qI85dpGQEgKu2oh5AtmPn59MG3dDOQ zQXeBp0YCi70wcDJD+YoRQylT+jfHHXrgzYdEdLpMY9zMkliQh7syR/roMezS+QUYoTVwf jTEwdcDyg/9gzUSVGmxjFBAwc2TdqzsEDzVW6a4lOon2qhj88LZmyJ7TqBrekjYGABZIVJ KHavuLRgx+KaGKl6pSMJV36Q/AEOj/E/JC/XxvBre3XQwf0hXb54lcXD2kulq8TRi9Q81X IwOmuhTgohiYELwRlf1fyrStujtHETG8ziX3MSM8LqiimBTkAjmnUWjzr1xr/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785160905; a=rsa-sha256; cv=none; b=WlPSQaN3Xp7BC4Krgaghh9QpFAW/Vn9XyRDotI9KMNk5MPu8Krjih962BJ3b5aZvvHtrmm d4f7s8k4VWuRP6+bd5s/kV9pOYTJDJyGi+L9AcogXrPQr4awKXow9wx65u19kUhEAuMsAP HMbCiPKpt0tOQzUYCC0sUxamitEYDZCgVFnT6TTEgry+zbaJB6fqoYot0OffDmd7U+OAA3 5kjP3mlfRD57JuhgCZUXsUZFhlM5/YLTWwuWUUmETWOS9J74GLR0CAQ6KkChn8mT+mUlVp pmeuWXCtJDwHTp6cDqpRzLVoI+pIxXtgFd6EWDBF9zWAbkYMpzl7sYPpT3qfYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785160905; 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=mvlKsQuZan0lW0O8qLW1J1cz5j/5Z0mGHyXYxH3fShM=; b=nxzEt8YygrlE1U4IU4Wd4qQ8ufmogMoeRn7Tv22BQjuPKvba0GinjEYDitDki8zxqBI+xO xivhHhlr/q3RbXHV4W2HumrFqQxgqM4JFN45PqegA2jvGN6cU3f01Devzof8WIU7vy0ZZs QcEhyANtCtkSEwCYiw6SU4FYZzOD/iLTvA1L5W4sIKLic3cuN0rmrOMzbDeDBpmstiM8zI 7e8ozrYUHJtw2JpWzeZjSAvfY0EURH9LZ87P1LDiX/D1hOph3N7r7Lk+ybA9PCriaR0jNa ZlcWz4lfQUt4Iswq2hi/AmLzateGPa4lBx0bfvbkxouagcvLkui1o/NRWathjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h80dP1k3Hz19tD for ; Mon, 27 Jul 2026 14:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 407c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 14:01:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: cf3eeeb75ceb - main - krb5: Install profile.h again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: cf3eeeb75ceb7428c351218e6bd755e11613a633 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 14:01:40 +0000 Message-Id: <6a6764c4.407c0.6bf7195b@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=cf3eeeb75ceb7428c351218e6bd755e11613a633 commit cf3eeeb75ceb7428c351218e6bd755e11613a633 Author: Cy Schubert AuthorDate: 2026-07-16 16:28:15 +0000 Commit: Cy Schubert CommitDate: 2026-07-27 14:01:21 +0000 krb5: Install profile.h again Commit 1876de606eb8 exposed missing symbols that the port security/krb5 installed that the base system did not install. Part of the solution was to make libprofile.so private (not libprofile.a) just as the port does, Red Hat Enterprise Linux does, and as installing MIT KRB5 by hand does. The actual fix for this was to put symbols and their corresponding functions into the correct librarires, i.e. libkrb5.so and othes, just as the port, Red Hat, and manually installed via tarball do. Unfortunately INTERNALLIB disables the include of bsd.incs.mk and the install of header files. This is still needed to install profile.h into /usr/include (just as the port installs it into ${LOCALBASE}/include and RHEL installs it in /usr/include). This commit fixes this by installing profile.h into /usr/include from the krb5/include Makfile. Reported by: fluffy Tested by: fluffy Reviewed by: fluffy Fixes: 1876de606eb8 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D58286 --- krb5/include/Makefile | 14 +++++++++++--- krb5/util/profile/Makefile | 27 +-------------------------- krb5/util/profile/Makefile.profile | 26 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/krb5/include/Makefile b/krb5/include/Makefile index 8ce743e95d95..fc131dbe77b9 100644 --- a/krb5/include/Makefile +++ b/krb5/include/Makefile @@ -19,12 +19,15 @@ INCSDIR= ${INCLUDEDIR} .PATH: ${KRB5_DIR}/include +SRCS= ${GEN} + INCS= gssapi.h \ kdb.h \ krad.h \ - krb5.h + krb5.h \ + profile.h -CLEANFILES= osconf.new +CLEANFILES= osconf.new profile.h # XXX The output of this needs to be verified against the osconf.h I created # It is only used to verify osconf.h has not changed @@ -34,8 +37,13 @@ osconf.h: rebuild-error-tables: ${K5_ET_HEADERS} +.include "${KRB5_SRCTOP}/util/profile/Makefile.profile" + .PHONY: rebuild-error-tables osconf.h -.PATH: ${KRB5_DIR}/include/krb5 +.SUFFIXES: .et + +.PATH: ${KRB5_DIR}/include/krb5 \ + ${KRB5_DIR}/util/profile .include diff --git a/krb5/util/profile/Makefile b/krb5/util/profile/Makefile index 68b249151a40..68fcd9e11da6 100644 --- a/krb5/util/profile/Makefile +++ b/krb5/util/profile/Makefile @@ -36,32 +36,7 @@ CFLAGS+=${DEFINES} \ -I${KRB5_DIR}/include \ -I${.OBJDIR} -GEN= profile.h ${GEN_PROF_ERR_C} ${GEN_PROF_ERR_H} -GEN_PROF_ERR= prof_err.et -GEN_PROF_ERR_C= ${GEN_PROF_ERR:S/.et$/.c/} -GEN_PROF_ERR_H= ${GEN_PROF_ERR:S/.et$/.h/} -${GEN_PROF_ERR:[2..-1]}: .NOMETA -CLEANFILES= et-h-prof_err.et et-h-prof_err.c et-h-prof_err.h \ - ${GEN} - -.include "${KRB5_SRCTOP}/Makefile.et" - -${GEN_PROF_ERR_H}: ${GEN_PROF_ERR} - rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.c et-h-${.PREFIX}.h - cp ${.ALLSRC} et-h-${.PREFIX}.et - ${COMPILE_ET} et-h-${.PREFIX}.et - mv et-h-${.PREFIX}.h ${.PREFIX}.h - rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.h - -${GEN_PROF_ERR_C}: ${GEN_PROF_ERR} - rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c et-c-${.PREFIX}.h - cp ${.ALLSRC} et-c-${.PREFIX}.et - ${COMPILE_ET} et-c-${.PREFIX}.et - mv et-c-${.PREFIX}.c ${.PREFIX}.c - rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c - -profile.h: profile.hin prof_err.h - cat ${.ALLSRC} > ${.TARGET} +.include "Makefile.profile" prof_file.c: profile.h diff --git a/krb5/util/profile/Makefile.profile b/krb5/util/profile/Makefile.profile new file mode 100644 index 000000000000..119ace16daf2 --- /dev/null +++ b/krb5/util/profile/Makefile.profile @@ -0,0 +1,26 @@ +GEN= profile.h ${GEN_PROF_ERR_C} ${GEN_PROF_ERR_H} +GEN_PROF_ERR= prof_err.et +GEN_PROF_ERR_C= ${GEN_PROF_ERR:S/.et$/.c/} +GEN_PROF_ERR_H= ${GEN_PROF_ERR:S/.et$/.h/} +${GEN_PROF_ERR:[2..-1]}: .NOMETA +CLEANFILES+= et-h-prof_err.et et-h-prof_err.c et-h-prof_err.h \ + ${GEN} + +.include "${KRB5_SRCTOP}/Makefile.et" + +${GEN_PROF_ERR_H}: ${GEN_PROF_ERR} + rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.c et-h-${.PREFIX}.h + cp ${.ALLSRC} et-h-${.PREFIX}.et + ${COMPILE_ET} et-h-${.PREFIX}.et + mv et-h-${.PREFIX}.h ${.PREFIX}.h + rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.h + +${GEN_PROF_ERR_C}: ${GEN_PROF_ERR} + rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c et-c-${.PREFIX}.h + cp ${.ALLSRC} et-c-${.PREFIX}.et + ${COMPILE_ET} et-c-${.PREFIX}.et + mv et-c-${.PREFIX}.c ${.PREFIX}.c + rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c + +profile.h: profile.hin prof_err.h + cat ${.ALLSRC} > ${.TARGET}