In message <20250620073050.7f03f74e@slippy>, Cy Schubert writes:
> --MP_/zstAiD85eGcxdrTCAiI3eFd
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: 7bit
> Content-Disposition: inline
>
> On Fri, 20 Jun 2025 12:27:09 +0300
> Dima Panov <flu...@freebsd.org> wrote:
>
> > Hello!
> >
> >
> > Looks like something missing after the build with MIT Kerberos.
> >
> > got this with devel/gvfs build:
> >
> > ==
> > In file included from ../daemon/pty_open.c:70:
> > /usr/include/util.h:36:10: fatal error: 'k5-int.h' file not found
> > 36 | #include "k5-int.h"
> > | ^~~~~~~~~~
> > 1 error generated.
> > ==
> >
> > Indeed, k5-int.h is missing in /usr/include :(
> >
> > On 16.06.2025 05:51, Cy Schubert wrote:
> > > The branch main has been updated by cy:
> > >
> > > URL: https://cgit.FreeBSD.org/src/commit/?id=7e35117eb07f86c385656ecc6a2a
> 92093be98131
> > >
> > > commit 7e35117eb07f86c385656ecc6a2a92093be98131
> > > Author: Cy Schubert <c...@freebsd.org>
> > > AuthorDate: 2025-06-11 02:57:54 +0000
> > > Commit: Cy Schubert <c...@freebsd.org>
> > > CommitDate: 2025-06-16 02:49:37 +0000
> > >
> > > Makefile: Hook MIT KRB5 into the build
> > >
> > > Add tests for MK_MITKRB5. If "yes" build MIT KRB5. If "no" build Hei
> mdal.
> > > The default is MK_MITKRB5 = no, added by "krb5: Add build plumbing".
> > >
> > > At some point we will change the default to MK_MITKRB5 = yes. A port
> s
> > > exp-run will need to be successfully run first.
> > >
> > > Sponsored by: The FreeBSD Foundation
> > > Differential revision: https://reviews.freebsd.org/D50815
> > > ---
> > > Makefile.inc1 | 89 +++++++++++++++++++++++++++++++++++++++++++++
> +++++++
> > > Makefile.libcompat | 4 +++
> > > tools/build/Makefile | 64 +++++++++++++++++++++++++++++++++++++
> > > 3 files changed, 157 insertions(+)
> > >
> [...]
>
> The attached patch will fix the problem. It contains two parts.
>
> 1. Don't install the offending header files. They were in my first cut
> of the plugins build and were not removed as I cleaned up while
> rationalizing the installed files with the port.
>
> 2. OptionalObsoleteFiles.inc removes the files that were erroneously
> installed.
>
> It is enough to run make delete-old to fix the problem. The Maefile
> patch ensures they're not installed again.
>
> My buildworld/installworld test is still running to verify nothing else
> is broken.
>
> Sorry for the breakage.
delete-old discovered more need to be done. The attached patch has been
tested and works.
From c37704c969c0b82fbfe7ac5270776ba3dd911f34 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 20 Jun 2025 06:09:54 -0700
Subject: [PATCH] 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.
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 commit.
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
--
2.49.0
Cheers,
Cy Schubert <cy.schub...@cschubert.com>
FreeBSD UNIX: <c...@freebsd.org> Web: https://FreeBSD.org
NTP: <c...@nwtime.org> Web: https://nwtime.org
e**(i*pi)+1=0
