From nobody Tue Nov 14 10:08:59 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 4SV2880SGxz51KCw for ; Tue, 14 Nov 2023 10:09:12 +0000 (UTC) (envelope-from dfr@rabson.org) Received: from mail-yw1-x112e.google.com (mail-yw1-x112e.google.com [IPv6:2607:f8b0:4864:20::112e]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SV28729WNz4NDy for ; Tue, 14 Nov 2023 10:09:11 +0000 (UTC) (envelope-from dfr@rabson.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=rabson-org.20230601.gappssmtp.com header.s=20230601 header.b=VubN9z2M; spf=pass (mx1.freebsd.org: domain of dfr@rabson.org designates 2607:f8b0:4864:20::112e as permitted sender) smtp.mailfrom=dfr@rabson.org; dmarc=none Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-5a82c2eb50cso56261327b3.2 for ; Tue, 14 Nov 2023 02:09:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rabson-org.20230601.gappssmtp.com; s=20230601; t=1699956550; x=1700561350; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=0oSOfV28M4CEQbzc6qSMApiSdUWjCifE8A3+wC9bOc0=; b=VubN9z2MCUOESVk8Db2ZxIbzAWSZvkxvoEvFdY5Rvax5H+Ry/otBjXVz4ciNQXwRyi G3WtJXskmOjSUglMGaf92eofdLFd+u4tzKGq+8LEXQ/4tx3flnlnhumIW9yH3+IJrdBw 3VVMh51r2NivdkuxxkSsdd529DUwjXHcTH3qOJaiwW8iMrGfWYnpXHxM9/hLuovswdx/ UZw+3zp/YHGhhj1CpLbW2SnajXr0Em0I4d4PATxhdg1b8I7P18jBp5bL1OO9vmR70vDq FJe685TQGG3ZuGAftusA2wddM57fqZQNHrBgvzKIv9zMTcxvMaNuICB95ssBigypYdhV 8vZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699956550; x=1700561350; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0oSOfV28M4CEQbzc6qSMApiSdUWjCifE8A3+wC9bOc0=; b=YdP27eRkTmes1OG8El3ApzJxDqoID1BbN0kazGX8riIZidaxzDEQuATQzL1eshmjdC gFf11W9QVxIX3cnnfDrpSLfQvS3MSG6x3FR1UMxHXMopcCH0voWJo9e0l27ciNCpbYR4 PfbS1kAKOxFROkcsu1UOLVKSSewPFIykVlew9z5DSS8ME4VpddXLcrGH4VsKkIkRTWmj WQK7dcZvqJsW5vHzRVTN+vqYjAQGQj7DqsaJPZ0a7ljcfhajjwjOxPZOchwTzPIYD1Bk EGyuyglicqBRM3oc+NCMm1fJk184VQDd0tI3SkFnx2SW6AacuJLhJctJA8MjHRhWtlPL gK7g== X-Gm-Message-State: AOJu0Yw1qRNZVysLohveWAK86EBUISUg9j/Y54+aCxxvgsp7Ioy/N6Wl U4XEXOOsr8b3s+4Eye0dv+D+0qOoHG4kwgY00rieL6ZAcq9VO721CyM= X-Google-Smtp-Source: AGHT+IGoBebiAxtkxEJMzAJjimEVQ3rk82rto5EkovGKZraEaiKTJdVl7qs+0TEbPhAU06g1AsfghRslA3N1gG15YLM= X-Received: by 2002:a0d:e587:0:b0:5af:f026:a27 with SMTP id o129-20020a0de587000000b005aff0260a27mr6627454ywe.50.1699956550099; Tue, 14 Nov 2023 02:09:10 -0800 (PST) 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 References: In-Reply-To: From: Doug Rabson Date: Tue, 14 Nov 2023 10:08:59 +0000 Message-ID: Subject: Re: Package version for 14.0-RELEASE To: pkgbase@freebsd.org Cc: re Content-Type: multipart/alternative; boundary="0000000000004d7d4b060a19fa15" X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[rabson-org.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[pkgbase@freebsd.org]; ARC_NA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::112e:from]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DMARC_NA(0.00)[rabson.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[dfr]; DKIM_TRACE(0.00)[rabson-org.20230601.gappssmtp.com:+]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pkgbase@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4SV28729WNz4NDy X-Spamd-Bar: --- --0000000000004d7d4b060a19fa15 Content-Type: text/plain; charset="UTF-8" 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. --0000000000004d7d4b060a19fa15 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Mon, 13 Nov 2023 at 08:43, Doug Rabson= <dfr@rabson.org> wrote:


On Sat, 11 Nov 20= 23 at 16:26, Doug Rabson <dfr@rabson.org> wrote:


On Sat, 11 Nov 2023 at 09:52, Doug Rabson <dfr@rabson.org> wrot= e:
I think there is a problem wi= th the pkgbase package versions for 14.0-RELEASE. Looking at my overnight b= uilds and comparing releng/14.0 with releng/13.2, I see that the package ve= rsions for 14 don't include the minor revision:

# ls -l releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-= runtime-13*
-rw-r--r-- =C2=A01 root =C2=A0wheel =C2=A03485868 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-- =C2=A01 root =C2=A0wheel =C2=A03342388 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.<= /div>

I'm not sure if this is a problem but it's= certainly surprising.

Comparin= g 13.2 and 14.0, in 13.2, PKG_VERSION is defined as:

PKG_VERSION:=3D = =C2=A0 ${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}

where _REVISION is "13.2".

In 14.0, it is:

PKG_VERSION:=3D =C2=A0 ${MAJOR_REVISION}${EXTRA_REVISION:C/[= [:space:]]//g}

where _REVISION = is "14.0" and MAJOR_REVISION is ${_REVISION:R} which is "14&= quot;.

Perhaps it should change back?


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.
=C2=A0
--0000000000004d7d4b060a19fa15--