From nobody Thu Jul 24 19:17:32 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 4bp13h0dKWz634gl; Thu, 24 Jul 2025 19:17:36 +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 4bp13g33dzz3hHj; Thu, 24 Jul 2025 19:17:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id eyYvuw0og5Mqyf1RfuzCFZ; Thu, 24 Jul 2025 19:17:35 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id f1Rdu62fOJhBPf1ReuofTc; Thu, 24 Jul 2025 19:17:35 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=688286cf a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=Wb1JkmetP80A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=N2psXbuA5REMNreiNeQA:9 a=CjuIK1q_8ugA:10 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 27A6D1027; Thu, 24 Jul 2025 12:17:33 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id E8ADF54D; Thu, 24 Jul 2025 12:17:32 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: John Baldwin cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ae07a5805b19 - main - krb5: Add version maps In-reply-to: References: <202507221548.56MFmoo2060272@gitrepo.freebsd.org> <7d7427f3-16c2-4948-ab28-56eec1677e13@FreeBSD.org> Comments: In-reply-to John Baldwin message dated "Thu, 24 Jul 2025 15:11:42 -0400." 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=us-ascii Date: Thu, 24 Jul 2025 12:17:32 -0700 Message-Id: <20250724191732.E8ADF54D@slippy.cwsent.com> X-CMAE-Envelope: MS4xfCFm0TWnPPqkOF4ZcmnqVN8yhrA9Nlr56oLx+fskx6ODLr0iPLnybY1e9m+Ss5MMYTsF8Js32h1wx+8VCj8QhXPMqYJ5MSaasj1oP6gvqDNHX3Qh+4/k 583ZGK+VfLzN0jNW6g2YEeuENd3rrMf0Fz+PL/GG+ZHqsj9F7/lDv/s4piHHkjpn8c2HgB5O0wpx4D65f3ibE2YsnPOogXKiKq4bkGRJ1k8xzcJ0X6h4xMjA f21bwCJ9h0DUy5j7HnwqTQw6fr+A4U2Hbe6/5kLGJI8r99cr0WJ+ltwQ+hly198YWulZX08yMQJFDfKa3SoNXITKAbSQLcAD0chfO9Bom3lZ7PpgZDpkeRJp AkgEAcox X-Rspamd-Queue-Id: 4bp13g33dzz3hHj 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] In message , John Baldwin wri tes: > On 7/23/25 10:00, John Baldwin wrote: > > On 7/22/25 11:48, Cy Schubert wrote: > >> The branch main has been updated by cy: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=ae07a5805b1906f29e786f415d67b > ef334557bd3 > >> > >> commit ae07a5805b1906f29e786f415d67bef334557bd3 > >> Author: Cy Schubert > >> AuthorDate: 2025-07-22 15:38:19 +0000 > >> Commit: Cy Schubert > >> CommitDate: 2025-07-22 15:48:40 +0000 > >> > >> krb5: Add version maps > >> > >> Shared objects must have version maps. These were copied from upstre > am's > >> *.exports files. > >> > >> Reminded by: kib > >> Fixes: ee3960cba106 > > > > Hmmm, does this match the version files built by upstream's build? They > > seem to use a different pattern for the version numbers in their build > > glue and include a trailing HIDDEN annotation. This doesn't match upstream's versioning. That would cause the version numbers to go backwards. I used the OpenSSL 1.1.1 update as the example. It also mitigates any conflict between the MIT ports and base. Does this make sense? > > > > binutils.versions: $(SHLIB_EXPORT_FILE) Makefile > > base=`echo "$(LIBBASE)" | sed -e 's/-/_/'`; \ > > echo > binutils.versions "$${base}_$(LIBMAJOR)_MIT {" > > sed >> binutils.versions < $(SHLIB_EXPORT_FILE) "s/$$/;/" > > echo >> binutils.versions "};" > > echo >> binutils.versions "HIDDEN { local: __*; _rest*; _save*; * > ; };" > > > > (SHLIB_EXPORT_FILE is the foo.exports file) > > > > Upstream only uses those for Linux but the binutils versions file is the > > right format to use with both ld.bfd and lld. > > > > I also wonder if it would be better to use similar logic to generate these > > files at build time? We have some other version maps we generate as build > > artifacts rather than checking into the tree IIRC. > > While I appreciate that you committed a change, I do think it would be useful > to answer the questions above. For example, why not generate the maps at > runtime to reduce the chances they would get out of sync in future vendor > imports? There are probably reasonable thoughts on both sides, but we should > at least discuss them. > > Also, I echo requests from both Jessica and Kostik: please post patches for > review. We have time before 15.0 so we can slow down a bit and use discussio > n > and review to arrive at the right changes going forward rather than a flurry > of commits that keep fixing each other. Sure. What is the consensus then? Do we want to use upstream's DSO numbering or our own, like we do with OpenSSL? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0