From nobody Fri Jun 20 14:30:57 2025 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 4bP0Jj126Sz5y6VW; Fri, 20 Jun 2025 14:31:01 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bP0Jh4BwNz3w0Q; Fri, 20 Jun 2025 14:31:00 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id SXx9urf3v9JM2Sclfu7PXB; Fri, 20 Jun 2025 14:30:59 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id ScleuNqowl5eGSclfugJdT; Fri, 20 Jun 2025 14:30:59 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=EO6l0EZC c=1 sm=1 tr=0 ts=685570a3 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=c2c-xj25gOpivZQ6hRwA:9 a=CjuIK1q_8ugA:10 a=GV_rWFebm-a_aId_tMYA:9 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id BB8734C0; Fri, 20 Jun 2025 07:30:57 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (Postfix) with ESMTP id 7D13C22F; Fri, 20 Jun 2025 07:30:57 -0700 (PDT) Date: Fri, 20 Jun 2025 07:30:57 -0700 From: Cy Schubert To: Dima Panov Cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 7e35117eb07f - main - Makefile: Hook MIT KRB5 into the build Message-ID: <20250620073050.7f03f74e@slippy> In-Reply-To: References: <202506160251.55G2pwx4063231@gitrepo.freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/zstAiD85eGcxdrTCAiI3eFd" X-CMAE-Envelope: MS4xfECZ8UylnbeqyW0MKBk2RstllCkCrTd7vYxaQjpo9j1lMmmEIWjKxWkvfLljbPj0YWY24JlRrBRxYmrDo1VdwkVXZ5sM7u0ShY/reBNXMS8DwKW31xXD N1bUdbPuihW1/sv73UFYuWQUGxfdALXVe9BH9z2zysbRp0vYyTOZ7Bs7mw9SlvFm12FsEwYfmk/gJf2ZALRjSR+0ngfdjo6RA0UDEhknNxhYStQwuJ7JsVIy NMPGZ1yBFFpxfKkYjmd+gpHrOZBVyPRBajN2PlisGadf+QY22hA2sYaAcxR8BMwG+cHn18rrNbht+va7RNnnHIZ0IOlKxwead3o8aVok4BeDAdUeYZafIn3t INI9X9Kl X-Rspamd-Queue-Id: 4bP0Jh4BwNz3w0Q X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] --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 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=7e35117eb07f86c385656ecc6a2a92093be98131 > > > > commit 7e35117eb07f86c385656ecc6a2a92093be98131 > > Author: Cy Schubert > > AuthorDate: 2025-06-11 02:57:54 +0000 > > Commit: Cy Schubert > > 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 Heimdal. > > 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 ports > > 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. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 --MP_/zstAiD85eGcxdrTCAiI3eFd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-krb5-Remove-artifaccts-of-my-initial-builds.patch =46rom 471cf7f2e0decc14ba8663c80e9c53c6cfb64fcb Mon Sep 17 00:00:00 2001 From: Cy Schubert 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 two parts of this commit. 1. Don't install them in the first place. 2. Remove the files if they were previously installed. Reported by: fluffy Fixes: ee3960cba106 --- krb5/plugins/preauth/spake/Makefile | 7 ------- krb5/plugins/preauth/test/Makefile | 2 -- tools/build/mk/OptionalObsoleteFiles.inc | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/krb5/plugins/preauth/spake/Makefile b/krb5/plugins/preauth/spa= ke/Makefile index 06f2e385c9ef..a5d9179f8adc 100644 --- a/krb5/plugins/preauth/spake/Makefile +++ b/krb5/plugins/preauth/spake/Makefile @@ -28,13 +28,6 @@ SRCS=3D edwards25519.c \ spake_kdc.c \ util.c =20 -INCS=3D edwards25519_fiat.h \ - edwards25519_tables.h \ - groups.h \ - iana.h \ - trace.h \ - util.h - CFLAGS+=3D-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=3D cltest.c \ common.c \ kdctest.c =20 -INCS=3D common.h - CFLAGS+=3D-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/Opti= onalObsoleteFiles.inc index 8f1c709c3bd2..ef3ffda3eeee 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3619,6 +3619,10 @@ OLD_FILES+=3Dusr/bin/sim_client OLD_FILES+=3Dusr/bin/uuclient OLD_FILES+=3Detc/rc.d/kpropd OLD_FILES+=3Dusr/include/com_err.h +OLD_FILES+=3Dusr/include/common.h +OLD_FILES+=3Dusr/include/edwards25519_fiat.h +OLD_FILES+=3Dusr/include/edwards25519_tables.h +OLD_FILES+=3Dusr/include/groups.h OLD_FILES+=3Dusr/include/gssapi.h OLD_FILES+=3Dusr/include/gssapi/gssapi.h OLD_FILES+=3Dusr/include/gssapi/gssapi_alloc.h @@ -3642,6 +3646,7 @@ OLD_FILES+=3Dusr/include/gssrpc/svc.h OLD_FILES+=3Dusr/include/gssrpc/svc_auth.h OLD_FILES+=3Dusr/include/gssrpc/types.h OLD_FILES+=3Dusr/include/gssrpc/xdr.h +OLD_FILES+=3Dusr/include/iana.h OLD_FILES+=3Dusr/include/kadm5/admin.h OLD_FILES+=3Dusr/include/kadm5/chpass_util_strings.h OLD_FILES+=3Dusr/include/kadm5/kadm_err.h @@ -3663,6 +3668,8 @@ OLD_FILES+=3Dusr/include/krb5/plugin.h OLD_FILES+=3Dusr/include/krb5/preauth_plugin.h OLD_FILES+=3Dusr/include/krb5/pwqual_plugin.h OLD_FILES+=3Dusr/include/profile.h +OLD_FILES+=3Dusr/include/trace.h +OLD_FILES+=3Dusr/include/util.h OLD_FILES+=3Dusr/include/verto-module.h OLD_FILES+=3Dusr/include/verto.h OLD_FILES+=3Dusr/lib/krb5/plugins/kdb/db2.so @@ -5667,6 +5674,10 @@ OLD_FILES+=3Dusr/bin/sim_client OLD_FILES+=3Dusr/bin/uuclient OLD_FILES+=3Detc/rc.d/kpropd OLD_FILES+=3Dusr/include/com_err.h +OLD_FILES+=3Dusr/include/common.h +OLD_FILES+=3Dusr/include/edwards25519_fiat.h +OLD_FILES+=3Dusr/include/edwards25519_tables.h +OLD_FILES+=3Dusr/include/groups.h OLD_FILES+=3Dusr/include/gssapi.h OLD_FILES+=3Dusr/include/gssapi/gssapi_ext.h OLD_FILES+=3Dusr/include/gssapi/gssapi_oid.h @@ -5694,6 +5705,7 @@ OLD_FILES+=3Dusr/include/gssrpc/svc.h OLD_FILES+=3Dusr/include/gssrpc/svc_auth.h OLD_FILES+=3Dusr/include/gssrpc/types.h OLD_FILES+=3Dusr/include/gssrpc/xdr.h +OLD_FILES+=3Dusr/include/iana.h OLD_FILES+=3Dusr/include/kadm5/admin.h OLD_FILES+=3Dusr/include/kadm5/chpass_util_strings.h OLD_FILES+=3Dusr/include/kadm5/kadm_err.h @@ -5715,6 +5727,8 @@ OLD_FILES+=3Dusr/include/krb5/plugin.h OLD_FILES+=3Dusr/include/krb5/preauth_plugin.h OLD_FILES+=3Dusr/include/krb5/pwqual_plugin.h OLD_FILES+=3Dusr/include/profile.h +OLD_FILES+=3Dusr/include/trace.h +OLD_FILES+=3Dusr/include/util.h OLD_FILES+=3Dusr/include/verto-module.h OLD_FILES+=3Dusr/include/verto.h OLD_FILES+=3Dusr/lib/krb5/plugins/kdb/db2.so --=20 2.49.0 --MP_/zstAiD85eGcxdrTCAiI3eFd--