From nobody Tue Aug 5 10:38:47 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 4bx8zX5W3yz64JSM; Tue, 05 Aug 2025 10:38:48 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bx8zX4pxqz3kkM; Tue, 05 Aug 2025 10:38:48 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754390328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=b9i4xFfe+yT3O7uF8Tk3vNqLRD84n0vo1q8MZ/txysQ=; b=MYQ1wHwF85PSYvyrUv5a9i8CI9847cMlnnN2PWDRm+iizbr9PexJSoz0Q/4rWKZ1JMHAce dIRQfMBRLZ+yPVFhKEoz4SKzuCU+lv5yK1CqilfZk7cMn+gegoKLYS0m0G1KHpoYDarJPM m6U7E2lue7MPJ8DJL3aN4lB+Vwa79Eb2a/9WicvXbN13Hb9AdiPW8RFjhiGfM2vwxwaQdp YkqE52HDVZvWVanPTdpeXm3KvupadyL5hWTEPgXhs9vnm3vgHmy6APX13fjvHfzsOGD7HB diltFms5c2AEzCcqespBFtlaXvl0nJd+VlqOPLW+AKwSSe88Yg9HlwF0brhCRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754390328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=b9i4xFfe+yT3O7uF8Tk3vNqLRD84n0vo1q8MZ/txysQ=; b=ntcbZpNjG7CpOf+dBtevHJCoXju6xk+/JayXKnLwJNjhB7rrXMIYRFK9WfSoDc1P91o/xa IzZCSDK+tn2pJpDiZaAd1nyOw31212jodUaD7w+qWz6yQSnExVVQqEl79eMa2WSDclfZob uCMAxs33tj6IKpXr2n17O44L8OzoVuL7yesuTfHiw6HCBA9XbyknEXN2L5lYPzVC5q70SQ 1UVqvIH6PzVyIcVnAzHTk0pUwdXELekLU25WrjmHkj2t/Byrj4PjIBXa4GjNtMRDtqe9eg Ld9uaMc3Hu3oA+SpxfEpRlIieNIPbOehhVueWgY20TtrmH8jnIIkTCWdwMATNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754390328; a=rsa-sha256; cv=none; b=inuME7JvrESml+KfHBd4sxqm7UdFSW7Odg0V9TtJXVZMTD8udca0FZr+fu1WFmJX4QGBdz SOEi/X3YgkR0RrHvlZLRq6CVsYVcdwYuvaNb78kZbAlcuwpjZQcL6qe7MdpdlgJJFfkK9L kB3uAuM++evEoy6rUVJmBqP7wOtvD8tYiKetxwQcIcZHnXcsWriQDCtumKvxK4y1c4rUiw BZqoaQEpnNErCp+6h4+94OXzWwzZ0sIUzm2Y1xKmfGWTeXV4eC0afIdXI8IZPRTGfWL3gm NRlfmM5BkDLzLXBJZpB3ZLF4cWU3ZKESWoG4ggVNYm2A2NFxSYN1iBbSfk5byw== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (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) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bx8zX3v6Wzsn3; Tue, 05 Aug 2025 10:38:48 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id CED2F3C01A0; Tue, 05 Aug 2025 10:38:47 +0000 (UTC) Date: Tue, 5 Aug 2025 10:38:47 +0000 From: Brooks Davis To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 73ed0c7992fd - main - krb5: install gssapi_krb5/gssapi/gssapi.h once Message-ID: References: <202508041259.574Cx6mA025169@gitrepo.freebsd.org> <20250805045337.7BB31682@slippy.cwsent.com> 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: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250805045337.7BB31682@slippy.cwsent.com> 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 > > AuthorDate: 2025-08-04 09:33:40 +0000 > > Commit: Brooks Davis > > 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