From nobody Mon Nov 13 08:43:34 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 4STNJ33QV2z50cg2 for ; Mon, 13 Nov 2023 08:43:47 +0000 (UTC) (envelope-from dfr@rabson.org) Received: from mail-yw1-x1131.google.com (mail-yw1-x1131.google.com [IPv6:2607:f8b0:4864:20::1131]) (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 4STNJ24JM8z3Tnb for ; Mon, 13 Nov 2023 08:43:46 +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=A1hBQvKz; spf=pass (mx1.freebsd.org: domain of dfr@rabson.org designates 2607:f8b0:4864:20::1131 as permitted sender) smtp.mailfrom=dfr@rabson.org; dmarc=none Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-5ac376d311aso45830727b3.1 for ; Mon, 13 Nov 2023 00:43:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rabson-org.20230601.gappssmtp.com; s=20230601; t=1699865025; x=1700469825; darn=freebsd.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=3xTw0QprxikFdiUqx7R0adHWtIbcNT1hye9We2ICLgY=; b=A1hBQvKzk9i0YqQn0cKxSYISzxBw2+RfmkqGea4Y1k0SlY0UCVuPHHcTbYm9IlZBqU XjN522wGLs1za2IrSXG3l8T+rkOqADjIKRCIn9hlZYbXznEbdMXMLopFt22s39yzBz8Z KCbqRK7So/WSqRgdRTQNBlymcgRTV7qTmu3rq2vJEiPCZgigpL63fKh9NLSPzVFDBiEB 0y9FC9bIzval6DqRY5B1lX/eckRh2zWhSROQRxUNIWgEplLiC8me8MWHUlEKeD8g/1ei 2xc9iK05vWi+VkPO3obsRy8Nemx3NO0vFETdkl1wpscTdg2KJXBZsmPXGCgQozQAccrT eIUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699865025; x=1700469825; h=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=3xTw0QprxikFdiUqx7R0adHWtIbcNT1hye9We2ICLgY=; b=v8J1MuF1Phjbk09JGZLXsISdf4JBXP4WEMlMfHlfAwQnzUnEb32H16AD5V7yT7Roum kpzy/ZOYxgKhwlc8qUOOIL9CJVsz0UPb6ORyU27gKMj3JK5I/RMfTh4qHv/Pf++RkZfY WJdP/cVMIbMK291xczbJCDO6dO+l8CVtwJhhnbUgdpJQUPlg2/vKYsGxmNy5pgXrcHyp ORS19EQV9VetblGro4g6CaApZmGPUjAn3TfEpNw+D8mmvyq7iEQQBiglkXbk3e66lY7r En25PoVnAoluXnpCcV9cRqa+PVcQzRzhVvsjgsJUBsqrs5VoFd+7iJiqAz+GpfpsLesd z5fQ== X-Gm-Message-State: AOJu0YwW72sOmbKcPf9CoNz5yg7Sxejx7KkXMEHqfvcsAsBdUkvBdCtK v3ZZ0wYXJprBFOWbZAuVmZPP4aW1DKVq52nMZIomUKRrSwYpsUg6x772rA== X-Google-Smtp-Source: AGHT+IH+Fwpts8Q2/ntkvxSxjDqK6jzEV5uFfUIb+0PKrTfsMZA2y4OJlYbrbh256u5eXn5dZOrZ7yyxI8iOO+aN0tI= X-Received: by 2002:a81:4782:0:b0:5a7:a817:be43 with SMTP id u124-20020a814782000000b005a7a817be43mr5939815ywa.6.1699865025250; Mon, 13 Nov 2023 00:43:45 -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: Mon, 13 Nov 2023 08:43:34 +0000 Message-ID: Subject: Re: Package version for 14.0-RELEASE To: pkgbase@freebsd.org Content-Type: multipart/alternative; boundary="000000000000ff22f4060a04aab1" 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]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1131:from]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; DKIM_TRACE(0.00)[rabson-org.20230601.gappssmtp.com:+]; RCPT_COUNT_ONE(0.00)[1]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[dfr]; DMARC_NA(0.00)[rabson.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pkgbase@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4STNJ24JM8z3Tnb X-Spamd-Bar: --- --000000000000ff22f4060a04aab1 Content-Type: text/plain; charset="UTF-8" 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. --000000000000ff22f4060a04aab1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, 11 Nov 2023 at 16:26, Doug Ra= bson <dfr@rabson.org> wrote:


On Sat, 11 No= v 2023 at 09:52, Doug Rabson <dfr@rabson.org> 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-- =C2=A01 ro= ot =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:a= md64/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-ru= ntime-14.pkg
r

I think the minor r= evision gets lost, possibly in the part of release/Makefile that parses out= the REVISION variable from newvers.sh.

I'm no= t sure if this is a problem but it's certainly surprising.
<= /blockquote>

Comparing 13.2 and 14.0, in 13.2, PKG_VERSI= ON is defined as:

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

wh= ere _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".

Perhaps it s= hould change back?

I opened=C2= =A0h= ttps://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D275051 to track this= problem.

--000000000000ff22f4060a04aab1--