From nobody Fri Jul 25 17:28:42 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 4bpZbZ6JvFz626bZ; Fri, 25 Jul 2025 17:28:42 +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 4bpZbZ32WPz3Dxm; Fri, 25 Jul 2025 17:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753464522; 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=iJL9RmFp5t2n7YLr8da6YgGs2YQV/4W4lAonaIOPFm8=; b=usxF53wRIcrt2SIarfy6XQTkiRxpPMpKk4YOFXF9x3FYqMJm9AtZnw6rFdtlDcyiRr3lxw XUSjwA0WXOVfPxdXHBmX6WovJ0ugbBCJoRRDho19RgiI0mtqFitzkp8inJLjiqswr3P5Pk 1aC5Kehq73JqzaCnKja5g1d9ITpn88QCOF76HFEgGProGIItI7xuvpT7j0GKlxjZ+lTjQ+ azHy5BbU8qW+FccH+9wBKOSJHgrG3h52obGFvJKDUgnZw4PThlKG883yFyoIkLxfALD2on jl6th8tWMuHs0ywbhffH/GF8aznkKgpGk4CgmSgNDMmVMFt/ez3fR+RTycvaMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753464522; 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=iJL9RmFp5t2n7YLr8da6YgGs2YQV/4W4lAonaIOPFm8=; b=kBRXWQotIQ3mB982DRRFJV34p52WDmsN7/rUGm5TYcgY5IqhcEK/fEcibYmAWsLnNElqBr 97sQ2WEMxxOyQt0vkur91gh1DD48B25Ujd00hF2ea75C7BZdtGbYVHM32kMXFAvDjZirqt Vq6qrd28/gtd8Z7dWxDiMpznmpZMnaAmwsVUm4G+UI2LKAW0cSR6PTcZKkqlWxSBIM7UmL VlwfOrdkDSzznCixfSe7xjnoazNN4yW7tokOjTHGzGWZa1HKhh64Rwud7Rlch4P7tj1wz9 f5QxCkuQVNGwrZWekrFP/STELunRciOiVmt8USJhXeoiI8ZdsiJbvEgqayzqAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753464522; a=rsa-sha256; cv=none; b=O0DlWb3ktq0av78gMt2WxGuu+U9AxaMcPbp4yIMuqD2x0PT9R5Yy4vCr1H1r+mRnqRSmu+ KLqnj5OyXSC5jLzmzcedYhPDnlkjmTRiGpaMDFHLrJgBUkjVaCVaPDGHaYQ6Z0fGmhi94h IyocHxtgqNn8xxD/WAg69OAA0Vlkz/IR1RkIOD8n2b5SL7FS4EEJgMnNLzP98shcN8lNxt Xgw9KS/zK/aypyeQEuUhG6DiBRWvEp1FC5yLTFIUHgIdgNuStz5igN526v2k98tAbXQK12 wKKjx7Dcgw4zMnQ7dW5LReuZe6ieFMZRi1gyLknc0GfnU4mOby2g5IOxuoulmQ== 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 4bpZbZ1fGFztkS; Fri, 25 Jul 2025 17:28:42 +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 56PHSgg3093775; Fri, 25 Jul 2025 17:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PHSg1J093772; Fri, 25 Jul 2025 17:28:42 GMT (envelope-from git) Date: Fri, 25 Jul 2025 17:28:42 GMT Message-Id: <202507251728.56PHSg1J093772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 2a454b05f2c1 - main - krb5: remove private headers 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a454b05f2c1f9dc2d27f0d553fd1f890b750aa1 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2a454b05f2c1f9dc2d27f0d553fd1f890b750aa1 commit 2a454b05f2c1f9dc2d27f0d553fd1f890b750aa1 Author: Lexi Winter AuthorDate: 2025-07-25 14:04:03 +0000 Commit: Lexi Winter CommitDate: 2025-07-25 17:31:26 +0000 krb5: remove private headers I compared the contents of the FreeBSD-kerberos-lib-dev package with the contents of the security/krb5 port. Based on that, remove all the headers which are installed by base krb5 but not by the port. These all appear to be internal headers which are not meant to be publicly visible. This removes some headers with unfortunate conflict-prone names like and . Reviewed by: des, cy Differential Revision: https://reviews.freebsd.org/D51518 --- ObsoleteFiles.inc | 12 ++++++++++++ krb5/lib/kadm5clnt/Makefile | 7 ++----- krb5/lib/kadm5srv/Makefile | 7 ++----- krb5/lib/krad/Makefile | 4 ---- krb5/lib/rpc/Makefile | 6 ------ krb5/libexec/kadmind/Makefile | 1 + krb5/plugins/kdb/db2/Makefile | 1 + krb5/usr.sbin/kdb5_util/Makefile | 1 + 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e5a3da94e127..2c68b2ab783c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,18 @@ # xargs -n1 | sort | uniq -d; # done +# 20250725: Headers installed by krb5 which shouldn't have been. +OLD_FILES+=usr/include/kadm5/admin_internal.h +OLD_FILES+=usr/include/kadm5/admin_xdr.h +OLD_FILES+=usr/include/kadm5/kadm_rpc.h +OLD_FILES+=usr/include/kadm5/server_internal.h +OLD_FILES+=usr/include/internal.h +OLD_FILES+=usr/include/t_daemon.h +OLD_FILES+=usr/include/t_test.h +OLD_FILES+=usr/include/dyn.h +OLD_FILES+=usr/include/dynP.h +OLD_FILES+=usr/include/gssrpcint.h + # 20250716: Remove an old manual page, vn(4) was removed in FreeBSD 5.0 OLD_FILES+=usr/share/man/man4/vn.4.gz diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile index 22d78d7ae2f1..898276e77d04 100644 --- a/krb5/lib/kadm5clnt/Makefile +++ b/krb5/lib/kadm5clnt/Makefile @@ -28,7 +28,8 @@ SRCS= alt_prof.c \ .include "${KRB5_SRCTOP}/lib/kadm5clnt/clnt/Makefile.inc" -CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \ +CFLAGS+=-I${KRB5_DIR}/lib \ + -I${KRB5_DIR}/lib/kadm5 \ -I${KRB5_DIR}/include \ -I${KRB5_OBJTOP}/include/krb5_private \ -I${KRB5_SRCTOP}/include \ @@ -36,10 +37,6 @@ CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \ INCSDIR=${INCLUDEDIR}/kadm5 INCS= admin.h \ - admin_internal.h \ - admin_xdr.h \ - kadm_rpc.h \ - server_internal.h \ ${GENI} KADM_ERR= kadm_err.et diff --git a/krb5/lib/kadm5srv/Makefile b/krb5/lib/kadm5srv/Makefile index 50f1e859f17b..e0ec557a3f5b 100644 --- a/krb5/lib/kadm5srv/Makefile +++ b/krb5/lib/kadm5srv/Makefile @@ -37,7 +37,8 @@ INCS= admin.h \ GEN= kadm_err.c kadm_err.h chpass_util_strings.c chpass_util_strings.h CLEANFILES= ${GEN} ${GENI} -CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \ +CFLAGS+=-I${KRB5_DIR}/lib \ + -I${KRB5_DIR}/lib/kadm5 \ -I${KRB5_DIR}/include \ -I${KRB5_OBJTOP}/include/krb5_private \ -I${KRB5_SRCTOP}/include \ @@ -48,10 +49,6 @@ CFLAGS+=-I${KRB5_DIR}/lib/kadm5 \ HDRDIR= ${KRB5_OBJHDR}/kadm5 HDRS= ${HDRDIR}/admin.h \ - ${HDRDIR}/admin_internal.h \ - ${HDRDIR}/admin_xdr.h \ - ${HDRDIR}/kadm_rpc.h \ - ${HDRDIR}/server_internal.h \ ${HDRDIR}/chpass_util_strings.h \ ${HDRDIR}/kadm_err.h diff --git a/krb5/lib/krad/Makefile b/krb5/lib/krad/Makefile index 0bc74e8318f8..a990354c1877 100644 --- a/krb5/lib/krad/Makefile +++ b/krb5/lib/krad/Makefile @@ -24,10 +24,6 @@ SRCS= attr.c \ packet.c \ remote.c -INCS= internal.h \ - t_daemon.h \ - t_test.h - CFLAGS+=-I${KRB5_DIR}/lib/krad \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ diff --git a/krb5/lib/rpc/Makefile b/krb5/lib/rpc/Makefile index 3bcd7ff7d9d3..a539803cc57c 100644 --- a/krb5/lib/rpc/Makefile +++ b/krb5/lib/rpc/Makefile @@ -65,10 +65,6 @@ SRCS= auth_gss.c \ xdr_sizeof.c \ xdr_stdio.c -INCS= dyn.h \ - dynP.h \ - gssrpcint.h - CFLAGS+=-I${KRB5_DIR}/lib/rpc \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ @@ -79,6 +75,4 @@ CFLAGS+=-I${KRB5_DIR}/lib/rpc \ .include -.SUFFIXES: .h .c - .PATH: ${KRB5_DIR}/lib/rpc diff --git a/krb5/libexec/kadmind/Makefile b/krb5/libexec/kadmind/Makefile index a845851f708e..62046214af7b 100644 --- a/krb5/libexec/kadmind/Makefile +++ b/krb5/libexec/kadmind/Makefile @@ -29,6 +29,7 @@ CFLAGS+=-I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ -I${KRB5_OBJTOP}/lib/gssapi \ -I${KRB5_OBJTOP}/lib \ + -I${KRB5_DIR}/lib \ -I${KRB5_DIR}/lib/gssapi/krb5 \ -I${KRB5_DIR}/lib/gssapi/generic diff --git a/krb5/plugins/kdb/db2/Makefile b/krb5/plugins/kdb/db2/Makefile index e9429bc03de1..1d42951c3c97 100644 --- a/krb5/plugins/kdb/db2/Makefile +++ b/krb5/plugins/kdb/db2/Makefile @@ -49,6 +49,7 @@ CFLAGS+=-I${KRB5_DIR}/plugins/kdb/db2 \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ -I${KRB5_DIR}/lib/kdb \ + -I${KRB5_DIR}/lib \ -I${KRB5_OBJTOP}/plugins/kdb/db2 \ -I${KRB5_OBJTOP}/lib/kdb diff --git a/krb5/usr.sbin/kdb5_util/Makefile b/krb5/usr.sbin/kdb5_util/Makefile index 5b3d3ecc3410..1fab7ee58556 100644 --- a/krb5/usr.sbin/kdb5_util/Makefile +++ b/krb5/usr.sbin/kdb5_util/Makefile @@ -32,6 +32,7 @@ INCS= ${GENI} MAN= kdb5_util.8 CFLAGS+=-I${KRB5_DIR}/include \ + -I${KRB5_DIR}/lib \ -I${KRB5_SRCTOP}/include MAN= kdb5_util.8