From nobody Tue Nov 14 10:48:37 2023 X-Original-To: pkgbase@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 4SV31j3JP1z50SMG for ; Tue, 14 Nov 2023 10:48:41 +0000 (UTC) (envelope-from bapt@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SV31j2ljZz4S34; Tue, 14 Nov 2023 10:48:41 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699958921; 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=kW1IfHSx8T1UaLefiIVnZLal2+prePdNNogJgimXo/k=; b=P4afkSPAw5v6gXB8Jiuk2VItzwNqHPKxiw+0UqNSBWXI0UkbKmI0700FsTB29XPelwy5Jd dLsZ588F6HYVmZKUWnkByU8HyFajQh/U3smwE/1AGgAPYct9pHFDDLtaPvin9WiC7abAn8 t5Ft3c+GBaPTCgrBU0A9XB+wuCnviroPf46mP5CqIeHQzyQQ6lnSK3hYl8o8Mn38cm73eq LtKXPrUzSvlBrl8FP9BibQJ//oV3pQvUlc8G/Rmsk89UH75UdiDhKMLnUuuRhGv3p9swJ5 1PhSywcodhWLli28tXwOXwfbUzLgRSyavyLcHK3mpACJEQCunqQnzs2DpYVmyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699958921; 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=kW1IfHSx8T1UaLefiIVnZLal2+prePdNNogJgimXo/k=; b=DuRKYGdyGNuj6kHkChrETuQJSTvJDrFYzzlM2YoxOCRGFSV2MsK/BEJvt+wLWmQklU2exK jfHmziWhbOvwA+iXc2kAvtOg/jCaJ+B6Xxc4BuGYmm9qRX1Qg1sntsbOw6ttEhKOsJtND+ 0xKhKLMRayCiFy0yVS6yq4ASHXFtT6Aa7tfTWxLYzXB0Ea22NKMli+OESUOiVNYOabwWXn pFFd1AFdFHdO8zdZrod4tnicHx4V2dXUrp060rfqEPyimSgFO/wVThfM/kwcrEqo/OL1Dk HiBks433teJQ7tVSfpBT6XtQBF9aL/7jark6PImHJ1vCNYuAIA9bTVVPDaoc6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699958921; a=rsa-sha256; cv=none; b=Mq7N5OjqK8m3Wtqh3OjnINLIzIVJOhjPWzosbd0/FjVwMTjS1QPD7dbME+EARrG67EYfzb qFUtBNbk6hTaq1lNuXOnUl+kb9yRsw2hFcruolvhGoKR4CykZ4u4zD4VF2cRSEnYVbCkWR 7MnUbb/vNHC45r737vIAXQOw0enXg7JxqPh5J+XL5LcuMVyV40TM/JKQBTGlIcHeKP7qBq liAMjZ8tpnTw2od7aYMp8BNjZGiGB7C5nkz9qsFXC8vmT7CyaFmck76gw1mH8Ib/lDaZK+ BBqooyUv3wAISDlG/z4HOKurRKQMbIGTsHyY6svtCO4hqoNQ3VfJoZwNLio0tQ== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SV31j17TjzxJb; Tue, 14 Nov 2023 10:48:41 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id D47A1129379; Tue, 14 Nov 2023 11:48:37 +0100 (CET) Date: Tue, 14 Nov 2023 11:48:37 +0100 From: Baptiste Daroussin To: Doug Rabson Cc: pkgbase@freebsd.org, re Subject: Re: Package version for 14.0-RELEASE Message-ID: References: List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Nov 14, 2023 at 10:08:59AM +0000, Doug Rabson wrote: > On Mon, 13 Nov 2023 at 08:43, Doug Rabson wrote: > > > > > > > On Sat, 11 Nov 2023 at 16:26, Doug Rabson wrote: > > > >> > >> > >> On Sat, 11 Nov 2023 at 09:52, Doug Rabson wrote: > >> > >>> I think there is a problem with the pkgbase package versions for > >>> 14.0-RELEASE. Looking at my overnight builds and comparing releng/14.0 with > >>> releng/13.2, I see that the package versions for 14 don't include the minor > >>> revision: > >>> > >>> # ls -l releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-runtime-13* > >>> -rw-r--r-- 1 root wheel 3485868 Nov 10 22:39 > >>> releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-runtime-13.2p5.pkg > >>> # ls -l releng/14.0/repo/FreeBSD:14:amd64/latest/FreeBSD-runtime-14* > >>> -rw-r--r-- 1 root wheel 3342388 Nov 10 21:54 > >>> releng/14.0/repo/FreeBSD:14:amd64/latest/FreeBSD-runtime-14.pkg > >>> r > >>> > >>> > >>> I think the minor revision gets lost, possibly in the part of > >>> release/Makefile that parses out the REVISION variable from newvers.sh. > >>> > >>> I'm not sure if this is a problem but it's certainly surprising. > >>> > >> > >> Comparing 13.2 and 14.0, in 13.2, PKG_VERSION is defined as: > >> > >> PKG_VERSION:= ${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} > >> > >> > >> where _REVISION is "13.2". > >> > >> In 14.0, it is: > >> > >> PKG_VERSION:= ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} > >> > >> > >> where _REVISION is "14.0" and MAJOR_REVISION is ${_REVISION:R} which is > >> "14". > >> > >> Perhaps it should change back? > >> > > > > I opened https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275051 to > > track this problem. > > > > I think we should consider this for a FreeBSD 14.0 errata so that packages > built for 14.0-RELEASE-p1 and later can have the correct version numbers. > I've started drafting an errata notice and I will merge the fix to > stable/14 before the end of this week. > > Doug. Yes I think this should deserves an errata, but actually there are for sure other things that should come along with it, so maybe we should make a big errata all at once in the next couple of month. Best regards, Bapt