From nobody Tue Nov 14 10:58:51 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 4SV3Fh2QTqz50Tyk for ; Tue, 14 Nov 2023 10:59:04 +0000 (UTC) (envelope-from dfr@rabson.org) Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (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 4SV3Fg0yxbz4Sln for ; Tue, 14 Nov 2023 10:59:03 +0000 (UTC) (envelope-from dfr@rabson.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-d9a6399cf78so4489762276.0 for ; Tue, 14 Nov 2023 02:59:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rabson-org.20230601.gappssmtp.com; s=20230601; t=1699959542; x=1700564342; 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=IxGBVXhkxcnQnuOTXftieVT+Naq7iYlnXexHLpaNYpM=; b=06dSnnbEvHc5fLROLRLwPnA3mFQDydmoCvOUAJor210JaX60peYEixTuzq5rHbfjs0 N/zFYNuoefgN3CfazNj+4tZSQ1Hfg80cbZNdwp4nJjIodX5q7MrIKcVFD54qlfKMH202 c5xKaJAgZ7JCwpw5i7oeR4E1zHM9ziB1H7DqIr6MO3hehnmDj+HQmRmdRgs5YQt+ILWq VAveLp0iQTi32808W1y/X8MIFP5CHukNl/znCyJd/hNUML1oG0wiH3KhwnRagth6RLBD hwxK/W+IXpIlGjhJrFOlBGG1eKhh9kZGYxsdAaU+5cgxzOUj+e8TqAdccFQMq/0rxhXG /Bhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699959542; x=1700564342; 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=IxGBVXhkxcnQnuOTXftieVT+Naq7iYlnXexHLpaNYpM=; b=uwgoa5rA2Zh6a4a4ueBNNBUxPR9Vwyzh0pbipcxeC4Uyv3i/GL6Z4tLQnGeZm972nz DWw8wxwfkxfCLjD6VqxKBeMIhYtYfJU8f1Z2r6Bj4I/JiuzeURcKAwnVQCb7F1ec/p4H OvytfdOj2GMTNUosfSFOALgZxihD85KQWA4L4kPU4M0VuVpDBGlFhE0Hcuwc/+8WjlQr +z9ZaqEppTsVebNcUtIoLaR5i+QY478WprQLFN5hIBzNDtV8xlz7i+txGz7VR/EP3uRC DdTfgS9hVX74HfMtfXGQAoBpa9gZPuhxGa4r5o1xGihQSt6XV2XLZlZE6Uvvuu+NFZkg /AvA== X-Gm-Message-State: AOJu0Yy0Q1JyjtrSmba2eTL7njStMVJTqHcAs+re7nrQZVjMesreF0tK FK5S6/hMe+0wDnC6QUmf+2+CmvVxnV/gWJBtSO50Sg== X-Google-Smtp-Source: AGHT+IEqA0sCkbL/EqiGt6O+zC+DtlFk+KbcCuf+MJnVV4nDYGJ1/UGmrhlhJNC8cSz56wXLItzhzSYu5ILNe9jafuU= X-Received: by 2002:a25:cc90:0:b0:daf:574c:7cd7 with SMTP id l138-20020a25cc90000000b00daf574c7cd7mr1419378ybf.30.1699959542198; Tue, 14 Nov 2023 02:59:02 -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:58:51 +0000 Message-ID: Subject: Re: Package version for 14.0-RELEASE To: Baptiste Daroussin Cc: pkgbase@freebsd.org, re Content-Type: multipart/alternative; boundary="000000000000a547df060a1aacbf" 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:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4SV3Fg0yxbz4Sln --000000000000a547df060a1aacbf Content-Type: text/plain; charset="UTF-8" On Tue, 14 Nov 2023 at 10:48, Baptiste Daroussin wrote: > 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. > That makes sense - after all, this is a metadata problem and the OS itself is not affected. Doug. --000000000000a547df060a1aacbf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, 14 Nov 2023 at 10:48, Baptist= e Daroussin <bapt@freebsd.org>= ; wrote:
On Tue, Nov 14, 2023 at 10:08:59AM +0000= , Doug Rabson wrote:
> On Mon, 13 Nov 2023 at 08:43, Doug Rabson <dfr@rabson.org> wrote:
>
> >
> >
> > On Sat, 11 Nov 2023 at 16:26, Doug Rabson <dfr@rabson.org> wrote:
> >
> >>
> >>
> >> On Sat, 11 Nov 2023 at 09:52, Doug Rabson <dfr@rabson.org> wrote:
> >>
> >>> I think there is a problem with the pkgbase package versi= ons for
> >>> 14.0-RELEASE. Looking at my overnight builds and comparin= g releng/14.0 with
> >>> releng/13.2, I see that the package versions for 14 don&#= 39;t include the minor
> >>> revision:
> >>>
> >>> # ls -l releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-= runtime-13*
> >>> -rw-r--r--=C2=A0 1 root=C2=A0 wheel=C2=A0 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--=C2=A0 1 root=C2=A0 wheel=C2=A0 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 par= t of
> >>> release/Makefile that parses out the REVISION variable fr= om newvers.sh.
> >>>
> >>> I'm not sure if this is a problem but it's certai= nly surprising.
> >>>
> >>
> >> Comparing 13.2 and 14.0, in 13.2, PKG_VERSION is defined as:<= br> > >>
> >> PKG_VERSION:=3D=C2=A0 =C2=A0${_REVISION}${EXTRA_REVISION:C/[[= :space:]]//g}
> >>
> >>
> >> where _REVISION is "13.2".
> >>
> >> In 14.0, it is:
> >>
> >> PKG_VERSION:=3D=C2=A0 =C2=A0${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.or= g/bugzilla/show_bug.cgi?id=3D275051 to
> > track this problem.
> >
>
> I think we should consider this for a FreeBSD 14.0 errata so that pack= ages
> built for 14.0-RELEASE-p1 and later can have the correct version numbe= rs.
> 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<= br> errata all at once in the next couple of month.

That makes sense - after all, this is a metadata problem and the O= S itself is not affected.

Doug.=C2=A0
<= /div> --000000000000a547df060a1aacbf--