From nobody Sat Nov 11 16:26:39 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 4SSLgK45kXz50DKM for ; Sat, 11 Nov 2023 16:26:53 +0000 (UTC) (envelope-from dfr@rabson.org) Received: from mail-yw1-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) (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 4SSLgJ1tthz4LXR for ; Sat, 11 Nov 2023 16:26:52 +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="2/ZYvWwL"; spf=pass (mx1.freebsd.org: domain of dfr@rabson.org designates 2607:f8b0:4864:20::112a as permitted sender) smtp.mailfrom=dfr@rabson.org; dmarc=none Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-5bf58204b7aso31235037b3.3 for ; Sat, 11 Nov 2023 08:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rabson-org.20230601.gappssmtp.com; s=20230601; t=1699720011; x=1700324811; 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=3M/8q3sVNhvtfjcDFVa17oNrglmtNxp3Tpw4usgLxQw=; b=2/ZYvWwLOFHpVh9XLE53Fgz3TCkzG5UOEFVZGLGbJfDrpEYsVfeww1ufS57kGC/88h RBlyfl7w0Ux0wFHraDa7053xR/VpVF5IqqKygcIirPM2kvAiDr/dlvQqeQBEFJ0/F7bU MWThnB/lIrdQSdZt4ZyGscc4gMG1C9d1LpWMtt/3PF3plUsy4mELslHuqY/1yBVhzfN4 IbbmYHUwVA77F7/aKMiW/wbhtiVnCMh45g0UP9jwR9TZ5kf6X3chXoAlmZI842ZFrCdK vfozsBdEtvW7EqOJqweKQnVJIKVgMMpTvi/vNdomL8L9U2+WJtHpF+Kp06EQtlwk5zhW itwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699720011; x=1700324811; 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=3M/8q3sVNhvtfjcDFVa17oNrglmtNxp3Tpw4usgLxQw=; b=ibPbPs3qxttkPqP+ZyDcjorKdecgpCN8VKM1wQMZ1lRSUdNaZTemgRQbjsQU+N8H2a BxPS762d9IESAbhAXD+/ij6MF9fTFJj6iNtDAGZRuUd5NrvRoqu8pCOjqU/pq0PtW5/Y tp+FFX0e0mECJzg16KKj8IfT3jlTz3wofAOkc18my9P511vdt9ME0h3dxN/49OZ0dEdT JDhNoYybf2CxLmJFWNkaBvfVK0FwezuyCFE+XcpiflvtVC74lHR1BpiqKStamIIG+Mfl /bZsB8u5tEhAqlP50Ajcd1vyuDdS8qz2Kgtjly7EnimGh+49Q6o80C7yh491TEJTjQ6p trOQ== X-Gm-Message-State: AOJu0Yw7XbkhjFtu8cS+vuxktIXiXBQwtq8uJ4+3K911GERiaKAgBR5L C7bduDE9x+fDsfyWhB7h7FWi2qLDtzPkCy5gojOiRV5P1c4xYK3tzZR6Tw== X-Google-Smtp-Source: AGHT+IHM9PvFOr9lf+ohZ5L/FwLVkA4c6bK/gT9lH1SaZFRATH43Zr0VTitiL6cJW4hFriS9ppsbPlNOkvuLnaQUphY= X-Received: by 2002:a0d:cc43:0:b0:5b3:4264:416f with SMTP id o64-20020a0dcc43000000b005b34264416fmr2278264ywd.27.1699720010841; Sat, 11 Nov 2023 08:26:50 -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: Sat, 11 Nov 2023 16:26:39 +0000 Message-ID: Subject: Re: Package version for 14.0-RELEASE To: pkgbase@freebsd.org Content-Type: multipart/alternative; boundary="00000000000076dbfd0609e2e79c" 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::112a: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: 4SSLgJ1tthz4LXR X-Spamd-Bar: --- --00000000000076dbfd0609e2e79c Content-Type: text/plain; charset="UTF-8" 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? Doug. --00000000000076dbfd0609e2e79c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, 11 Nov 2023 at 09:52, Doug Ra= bson <dfr@rabson.org> wrote:
I think there is a problem with th= e 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 version= s for 14 don't include the minor revision:

# ls -l releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-run= time-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/Fr= eeBSD: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 ce= rtainly surprising.

Comparing 1= 3.2 and 14.0, in 13.2, PKG_VERSION is defined as:

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

where _REVISION is "13.2".

In 14.0, it is:

PKG_VER= SION:=3D =C2=A0 ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}<= br>

where _REVISION is "14.0" an= d MAJOR_REVISION is ${_REVISION:R} which is "14".

<= div>Perhaps it should change back?

Doug.

=C2=A0
--00000000000076dbfd0609e2e79c--