Re: git: 73ed0c7992fd - main - krb5: install gssapi_krb5/gssapi/gssapi.h once

On Mon, Aug 04, 2025 at 09:53:37PM -0700, Cy Schubert wrote:
> In message <202508041259.574Cx6mA025169@gitrepo.freebsd.org>, Brooks Davis 
> writ
> es:
> > The branch main has been updated by brooks:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=73ed0c7992fd5f6148374d5dbf5c7b37
> > a2eba1a8
> >
> > commit 73ed0c7992fd5f6148374d5dbf5c7b37a2eba1a8
> > Author:     Brooks Davis <brooks@FreeBSD.org>
> > AuthorDate: 2025-08-04 09:33:40 +0000
> > Commit:     Brooks Davis <brooks@FreeBSD.org>
> > CommitDate: 2025-08-04 12:58:46 +0000
> >
> >     krb5: install gssapi_krb5/gssapi/gssapi.h once
> >     
> >     Somewhat arbitrarily chose krb5/lib/gssapi/Makefile to install it.
> >     
> >     PR:             288594
> >     Pull Request:   https://github.com/freebsd/freebsd-src/pull/1801
> > ---
> >  krb5/include/Makefile | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> >
> > diff --git a/krb5/include/Makefile b/krb5/include/Makefile
> > index c7b3f0f10a99..a2d29fcb1530 100644
> > --- a/krb5/include/Makefile
> > +++ b/krb5/include/Makefile
> > @@ -17,7 +17,7 @@ SUBDIR=	krb5_private krb5 gssrpc gssapi
> >  
> >  SUBDIR_PARALLEL=
> >  
> > -INCSGROUPS=	INCS GSSAPI_KRB5
> > +INCSGROUPS=	INCS
> >  
> >  INCSDIR=	${INCLUDEDIR}
> >  
> > @@ -27,9 +27,6 @@ INCS=	kdb.h \
> >  	krad.h \
> >  	krb5.h
> >  
> > -GSSAPI_KRB5DIR=	${INCLUDEDIR}/gssapi_krb5/gssapi
> > -GSSAPI_KRB5=	gssapi.h
> > -
> 
> With this we must now apply D51661 or any app that wishes to compile 
> against our MIT KRB5 will fail because /usr/src/lib/libgssapi cannot 
> directly support MIT KRB5. Our libgssapi is incompatible with MIT KRB5.

What was there was somehow installing two copies that differed which is
quite broken and possibably racy.  The Cirrus-CI error was:

error: ./usr/include/gssapi_krb5/gssapi/gssapi.h exists in multiple locations and with different meta: line 15452,15513. off by "size"

I'm happy to revert this and remove the entries in
krb5/lib/gssapi/generic/Makefile.inc instead if that's more correct.

-- Brooks