From nobody Thu Jul 24 19:11: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 4bp0ww6p1fz634SD; Thu, 24 Jul 2025 19:11:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4bp0ww3q8qz3c4H; Thu, 24 Jul 2025 19:11:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753384304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lyzg+luWENEWvrLj2dHyo5WuEJTiGKT40TjsOwvfdqU=; b=x56M//51XE5oc0I4neWuXD3jNjK1G9H/+p0al+q3o8nCoE7VXRUewJ2Q0O5idWWbVMMPF3 QcNwEYnNnjfNm8nwcg9InjNxuNrMpKTaJUDAUiFwmtfqEsqsDAzlZc4MKXLI/WLc3QqgP/ a+/rncZhjFB+ABOPtlwEkdiTO/UUIr3thaIoS7F4Cq5GmahkYZi7GjhpGcadfYaXmAmq8x 1CmwQIRbPDrMKP23UScJRKJDppH8Bx/RoSKew9vPBFcuq29DuPGdy6/rVq/vnqs48/AS74 8xhEKEERzGn6klY22GH/6Cq9c7DqrknPie/iu/SiMb+rAKFAlTy6ncnJuncZog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753384304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lyzg+luWENEWvrLj2dHyo5WuEJTiGKT40TjsOwvfdqU=; b=rDDYAWm4+GKfXuh3Ix2BL9iyb8T0J/WzmkMU2jZgLi2G9odXUhuOCsdm/FAyk26ia5tlIm ShBTqV8/qeJ9s6QAo9uvDYImhPXAN+kiRnK6H7Ks/N+WqLn9CGIGl3iQ03ZPCoaNKfQPEE EbwY5gFhajDOY8yxCXneJjkC4d41GzaYykNbWQsp1DJB1/SxF9bNni5q5yZzLu7tCBo2Wn 0ONXT5VVitk6SJgDbmD8xPvQa/hIt56beZP67qPSJ7TM2mEmlyBHSk+Y5PamjvZd82xqEY MeVG17mcaakJNXpWwxQ71zHmi79PL8bHGjmiJ9FVjqlfqAytN+03F7jT8b3aEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753384304; a=rsa-sha256; cv=none; b=B/PNK00Fc/izeOmeexpR6CNQv6plnJXNqdvqls6uUIb+GzXmrJS00x2c+tdxuusWYWO7zG JU5RzDBsDg1r/UylraB7TgMNPMNNr7dtIgSJJdsntI9cBx8aSzFXKcicdJx4sJeClC7eN4 OH0tZTPwPPOSFIxadl4AHLTsg3TnJeUr8YeI67RrF3UCJecMtwAX3rtBtUhuuzPHL1HKFU xoeymI0TR4dE2K9ZcSZa2cxfOd1FCc/UCupHeux2TYtW+Vr/Kvg656eEaT+Nf578dMycv7 NvJNFcqV8WTUKjaqEOkmlvYSAx7fVRSqnLnrOqSVpb5kIv0XhF3Nu+GaQOtCkA== Received: from [IPV6:2601:5c0:4200:b830:c4db:2d39:7cd2:a145] (unknown [IPv6:2601:5c0:4200:b830:c4db:2d39:7cd2:a145]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bp0ww1nBxz196D; Thu, 24 Jul 2025 19:11:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: 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 User-Agent: Mozilla Thunderbird Subject: Re: git: ae07a5805b19 - main - krb5: Add version maps Content-Language: en-US From: John Baldwin To: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202507221548.56MFmoo2060272@gitrepo.freebsd.org> <7d7427f3-16c2-4948-ab28-56eec1677e13@FreeBSD.org> In-Reply-To: <7d7427f3-16c2-4948-ab28-56eec1677e13@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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=ae07a5805b1906f29e786f415d67bef334557bd3 >> >> 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 upstream'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. > > 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 discussion and review to arrive at the right changes going forward rather than a flurry of commits that keep fixing each other. -- John Baldwin