From nobody Wed Jul 23 14:00:39 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 4bnG4d0vmtz62MYD; Wed, 23 Jul 2025 14:00:49 +0000 (UTC) (envelope-from jhb@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 4bnG4c2s8rz3cfC; Wed, 23 Jul 2025 14:00:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753279248; 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=bYOoi4BQ2SMc5FWLaw+yT4GMTk7nByujgeEBh79y5SE=; b=cH1FJfgquAIEoHtshEY32lL/K4+9drTjgzN2Kn+iinl5SGtRQI7uBDsVLXUrQZRPFOTdaf i9hfIcOV0hRbJnir+uET3TDskNlXiWp05OqmAh03/sghaN/hc6OlpU8poeGaBdN/9Cgp25 fNum5mf6VLfsBWPFlbcVtnsMVCMhjhWFJ21YIqHfwh0d7lWejpQft/M6sYmDaOLgnmqHSd ZPsSEwbu+mRy0cAKYP9TzXhzAxSHFu7gz0/7pVxVrv/W2p2INXK0emV8eRhcWrlsZfjQYJ rFN2Ox63g9eygS2jw5ejvhaVUPgImV6EHo6pKja/Hq7s3xSRRlTm4TTJgPCiCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753279248; 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=bYOoi4BQ2SMc5FWLaw+yT4GMTk7nByujgeEBh79y5SE=; b=k17RFVgnXeD5PQ385gfFOf4OZ/Ekl6GmdU3OVaBWDG7bMP86/e276zIL51irx2vZ8kaV25 4c4Bl3cQXQTFEQ5C7Mb/okRU8s7US/h16qry3yEGGcSu8KB9HXvH3Y08Ar5pNYTGeAy6Vs VUSWTmgbbU2vl9r+UcJb1EPrELrnyaqQ1fMnxKaHc8TGF/gvkpMiWr83PlVwzgsJdYaVGG 5U4T35vWHNEa7dG6rS7MawIHHkxeBA5H9xmEc9cVK5p6nzo+dp7z1S4ZviHmzn6EC6RXG8 N0D2RtmYG/eRwn8UZnsBJaO28N/X560LUD3ZRaDRIyg33SLEhvmhZFabsT5e0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753279248; a=rsa-sha256; cv=none; b=APefi1+uD1Nj2QqEc5tWRPNnaxEGa9cgUTvtFcgtZHYmP2B3Z7kY+Pe9WMN2OdWaosADNr pFe7A+UzkJYF92q3w+WlW1QG5h6/CL1bboN+vUY/4wX9vZUkEGW4FsLjyIIwlXSuq4e3fu nWA7FeBerZYhnEx4XeXWBrIclreCH06qWdR22Y4NfvHM4sV34Xh7yp8DVlF37smyzitJ48 krMefp2tIjimDxaJDyvmGQ7chFPDsLGzHXWice6YTQ5MasnhOgld4MYsRQw02CV9pTfnMM 5l0ixsECKcvrQiJCLVtAOh8uqop+0JjS9WVXAmgxIdsW0K3/ULnHS9iC6Rho3g== Received: from [IPV6:2a05:b400:110:12fe::7e] (user-12fe-7e.svr-vpn-1.vpn.cl.cam.ac.uk [IPv6:2a05:b400:110:12fe::7e]) (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 4bnG4b3FLMzGF6; Wed, 23 Jul 2025 14:00:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7d7427f3-16c2-4948-ab28-56eec1677e13@FreeBSD.org> Date: Wed, 23 Jul 2025 10:00:39 -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 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> From: John Baldwin In-Reply-To: <202507221548.56MFmoo2060272@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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. -- John Baldwin