From nobody Mon Feb 6 21:15:48 2023 X-Original-To: bugs@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 4P9fF04RpHz3nR2D for ; Mon, 6 Feb 2023 21:15:48 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9fF00CPZz44hb for ; Mon, 6 Feb 2023 21:15:48 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675718148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5JqGw13I4lzeOrfrActsbXxNj7nMm3D2ky4v47wJ3o0=; b=xJUKRiaIdHnskF/IVSLNGUb3WXkd2U07B7aSwYz1mRYdLM/WOkTu+YcofmptqQMES2Yr0i l74R5rQ0Xj8P10EwcsqgVOHMbcm2S5ruBbvfavL/Kem7wxh6Kq1aDD/QyQ3/JFFBm9bcLg 9EpRyy9LrXD2xhbD95cyO08MtvlsD3NEgNuvRCqazCH725CzvT4YqNhVtJ94w0fW1qcXsH Tw3pBR8nTSZBb3bZQcrDk7hQ0Kstlm2KQCrmfpk6WyZALf1ovLUXmg7XFUKGOMjphUBZzl BzQfH35lpx88VD4t89eQAyq3QEak62rZ3yJVkf/9VWOl8zvWo8ugmo0CetzmVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675718148; a=rsa-sha256; cv=none; b=GCCIMMAaQjfuQb/n3GkFySbJEBDMGcuyeua9aRUC0cUzRhmGkPi096kGOtDnmaB0esWeC5 sG4ISY8cgBhh8uFO028Tsoj76ZY+u5q3feJD25zvcetDKP/LA9C/z3g01Ay6EGBCnXJmc4 nSbz4nS3vuf/FuITU0Zx1Re4gT68EgMCJNIHxrTthSydeSJTaOxrGOq3DdmaJHBJUesvf1 q446koCOEjlOQFx53q2KDpQpxhvy6X52zbV95LHKPp82wk4xG3agM+FaoN+lpvzdMA7ibn A9tx0Ggk4gQAvCpuPhptvaQfLirBoiQ3MO42PaP8WAl8uxB3i7Qon7gM2P36Mg== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9fDz6Ff9zqf5 for ; Mon, 6 Feb 2023 21:15:47 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 316LFl8k046244 for ; Mon, 6 Feb 2023 21:15:47 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 316LFlKV046243 for bugs@FreeBSD.org; Mon, 6 Feb 2023 21:15:47 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 262601] [PATCH] [pkgbase] Wrong PKG_ABI used in repo pathname if a custom PKG_VERSION is given Date: Mon, 06 Feb 2023 21:15:48 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: patch X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D262601 --- Comment #2 from commit-hook@FreeBSD.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Da1e3fb8fa0a4652bc345bd284c32d6630= a8dbe08 commit a1e3fb8fa0a4652bc345bd284c32d6630a8dbe08 Author: Eugene M. Kim AuthorDate: 2022-03-11 04:32:00 +0000 Commit: Warner Losh CommitDate: 2023-02-06 21:02:32 +0000 Fix _REVISION to be always major.minor Introduced in commit 613fe53, _REVISION was redefined to be just the major version (14) instead of major.minor (14.0) iff: - PKG_VERSION was not overridden (default), and - Branch was -CURRENT, -STABLE, or -PRERELEASE. This introduced side effects in other parts of the code which expected _REVISION to be major.minor: - make-pkg-package.sh target triple became amd64-portbld-freebsd14 (should be amd64-portbld-freebsd14.0); - Versioned cross dev symlink name became amd64-freebsd14- (should be amd64-freebsd14.0-) Also, compounded with commit ea9a92d (which was introduced afterward and removed minor version from _REVISION incorrectly using :S with a regex) this also caused pkgbase repo to use a wrong PKG_ABI with a minor version (FreeBSD:14.0:amd64) when a custom PKG_VERSION was specified. (Note, without a custom PKG_VERSION the bug was not triggered because in that case _REVISION was already major-only.) This commit fixes both problems by introducing and using MAJOR_REVISION instead of redefining _REVISION. Existing uses of _REVISION now see major.minor again, except PKG_ABI (ex: FreeBSD:14:amd64, as described above) and PKG_VERSION (ex: 14.snap20220311121531) need only the major version and now use MAJOR_REVISION instead. PR: 262600, 262601 Reviewed by: imp, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/592 Makefile.inc1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --=20 You are receiving this mail because: You are the assignee for the bug.=