From nobody Tue Jul 8 15:20: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 4bc4Yp5D1wz617fh; Tue, 08 Jul 2025 15:20:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (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 4bc4Yp01gzz3LnM; Tue, 08 Jul 2025 15:20:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id Z585uhXCu5MqyZA7huhMSn; Tue, 08 Jul 2025 15:20:45 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id ZA7fulQOXWbOaZA7gu0CHg; Tue, 08 Jul 2025 15:20:45 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Q5lx4J2a c=1 sm=1 tr=0 ts=686d374d a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=S-1b6JwnAAAA:8 a=YxBL1-UpAAAA:8 a=x7Y1GQRRBOaA60SGN5cA:9 a=QEXdDO2ut3YA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=jHPkhvgQCurpnRnmkKlz:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C445E97; Tue, 08 Jul 2025 08:20:42 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (Postfix) with ESMTP id B0B86302; Tue, 08 Jul 2025 08:20:42 -0700 (PDT) Date: Tue, 8 Jul 2025 08:20:42 -0700 From: Cy Schubert To: Dima Panov Cc: "Herbert J. Skuhra" , 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: <20250708082036.039eb96f@slippy> In-Reply-To: <68ffaac2-d1b1-4889-b93b-53513cbea5a8@FreeBSD.org> References: <202506160251.55G2pwx4063231@gitrepo.freebsd.org> <20250620073050.7f03f74e@slippy> <20250707230446.F279E3A1@slippy.cwsent.com> <20250708042825.669BF20E@slippy.cwsent.com> <68ffaac2-d1b1-4889-b93b-53513cbea5a8@FreeBSD.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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: quoted-printable X-CMAE-Envelope: MS4xfL24ZvSFkXm2w0E3+QIE9lBbf6RpSHIkbFfTcNDbTH07NiIvTRVqbSox2KW+cK0me+s78XhSyeque+2f4gSKn+34p1Z1z9DZf3Hiat1edGlc/vw579xX 3FAdn4k5m/9GDvwasuQeEqP0z6mdAB5Mx4ROb0guSzGIUBplea+sPNAwQLB0QccodefNwIebYtS4ckpPMyZW8qXTCMU7+DbQJMruOSpuim92LIRL8ROSF+2M iGx8w/XzNzbBm4N1SPgIwirUYvT0gaT0ZJNwW4KKQUtahW24wDkQDYkq8LINRXVyaJcEn2lkAlTI2MaRiFR08GAdDHcHVsJZcx1quq2uXYrbBPuelmphS1HB XmVhS4Mqzg5CFARvJe/owjpN8u2DRA== X-Rspamd-Queue-Id: 4bc4Yp01gzz3LnM 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] On Tue, 8 Jul 2025 16:07:25 +0300 Dima Panov wrote: > On 08.07.2025 14:09, Dima Panov wrote: > > Hello! > >=20 > > On 08.07.2025 07:28, Cy Schubert wrote: =20 > >> In message , "Herbert J. Skuhra" wr= ites: =20 > >>> On Mon, Jul 07, 2025 at 04:04:46PM -0700, Cy Schubert wrote: =20 > >>>> In message , "Herbert J. Skuhra" = writes: =20 > >>>>> On Mon, Jul 07, 2025 at 10:36:31PM +0300, Dima Panov wrote: =20 > >>>>>> Hello! > >>>>>> > >>>>>> > >>>>>> BTW, it looks like symlink for libkadm5clnt.so is broken and produ= ced a =20 > >>> =C2=A0 bad =20 > >>>>> =C2=A0 file =20 > >>>>>> $ ls -la libkadm5clnt > >>>>>> lrwxr-xr-x=C2=A0 1 root wheel 13=C2=A0 7 Jul 20:40 libkadm5clnt ->= kadm5clnt_mit > >>>>>> > >>>>>> instead of assumed libkadm5clnt.so -> kadm5clnt_mit.so > >>>>>> > >>>>>> > >>>>>> Please review: > >>>>>> > >>>>>> diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Make= file > >>>>>> index e377f95f5b6e..be09dd3e210e 100644 > >>>>>> --- a/krb5/lib/kadm5clnt/Makefile > >>>>>> +++ b/krb5/lib/kadm5clnt/Makefile > >>>>>> @@ -88,7 +88,7 @@ ${CHPASS_UTIL_STRINGS_ERR_C}: ${CHPASS_UTIL_STRI= NGS_E =20 > >>> RR} =20 > >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm -f et-c-${.PRE= FIX}.et et-c-${.PREFIX}.c > >>>>>> > >>>>>> =C2=A0 afterinstall: > >>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ${INSTALL_LIBSYMLINK} ${SHLI= B} ${DESTDIR}${LIBDIR}/libkadm5clnt > >>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ${INSTALL_LIBSYMLINK} ${SHLI= B_NAME} ${DESTDIR}${LIBDIR}/libkadm =20 > >>> 5cln =20 > >>>>> t.so =20 > >>>>>> > >>>>>> =C2=A0 .include =20 > >>>>> > >>>>> This produces a valid symlink that 'make delete-old' wants to > >>>>> remove again: > >>>>> > >>>>> lrwxr-xr-x=C2=A0 1 root wheel=C2=A0=C2=A0=C2=A0=C2=A0 23 Jul=C2=A0 = 7 22:26 /usr/lib/libkadm5clnt.so -> > >>>>> libkadm5clnt_mit.so.121 > >>>>> > >>>>> # make delete-old =20 > >>>>>>>> Removing old files (only deletes safe to delete libs) =20 > >>>>> remove /usr/lib/libkadm5clnt.so? =20 > >>>> > >>>> Thanks Dima and Herbert for reporting this. It's been fixed. =20 > >>> > >>> Cy, I am sorry for not being more precise. > >>> > >>> Dima's change, which hasn't been commited yet, fixes the real issue of > >>> creating a bad symlink. > >>> > >>> I just wanted to add that his fix also needs removal of > >>> usr/lib/libkadm5clnt.so in tools/build/mk/OptionalObsoleteFiles.inc. > >>> > >>> Maybe usr/lib/libkadm5clnt should be added to OptionalObsoleteFiles.i= nc? =20 > >> > >> libkadm5clnt.so is a legitimate symlink for both MIT and Heimdal. In t= he > >> case of Heimdal it points to libkadm5clnt.so.11. Whereas for MIT it po= ints > >> to libkadm5clnt_mit.so.121. There is o libkadm5clnt in MIT. It is > >> libkadm5clnt_mit. You can see this in the port with pkg info -l as fol= lows: > >> > >> slippy$ pkg info -l krb5 | grep libkadm5clnt > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/local/lib/libkad= m5clnt.so > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/local/lib/libkad= m5clnt_mit.so > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/local/lib/libkad= m5clnt_mit.so.12 > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/local/lib/libkad= m5clnt_mit.so.12.0 > >> slippy$ > >> =20 > >=20 > > Cy, it looks you still have something staled at your machine :( > >=20 > > On a clean build for pkgbase in poudriere without my patch it still pro= duces a bad symlink and no compat is packaged as result > >=20 > > root@aarch64:~ # pkg info -l -x krb5 | grep libkadm5clnt > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib/libkadm5clnt_mit.s= o.121 > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib/debug/usr/lib/libk= adm5clnt_mit.so.121.debug > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib/debug/usr/lib32/li= bkadm5clnt_mit.so.121.debug > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib/libkadm5clnt_mit.a > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib/libkadm5clnt_mit.so > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib32/libkadm5clnt_mit= .a > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib32/libkadm5clnt_mit= .so > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /usr/lib32/libkadm5clnt_mit= .so.121 > >=20 > > =20 >=20 > ${SHLIB} macro gives a wrong name, check it: >=20 > $ make -V SHLIB > kadm5clnt_mit > $ make -V SHLIB_LINK > libkadm5clnt_mit.so > $ pwd > /home/fluffy/repo/FreeBSD/FreeBSD-src/krb5/lib/kadm5clnt >=20 >=20 > So we still need to patch it :) >=20 > diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile > index e377f95f5b6e..ddb9b0e9fec5 100644 > --- a/krb5/lib/kadm5clnt/Makefile > +++ b/krb5/lib/kadm5clnt/Makefile > @@ -88,7 +88,7 @@ ${CHPASS_UTIL_STRINGS_ERR_C}: ${CHPASS_UTIL_STRINGS_ERR} > rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c >=20 > afterinstall: > - ${INSTALL_LIBSYMLINK} ${SHLIB} ${DESTDIR}${LIBDIR}/libkadm5clnt > + ${INSTALL_LIBSYMLINK} ${SHLIB_LINK} ${DESTDIR}${LIBDIR}/libkadm5c= lnt.so >=20 > .include Thanks for the patch. I've pushed this with an ObsoleteFiles.inc change to fix the brokenness. Thanks for pointing this out. --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=3D0