From nobody Thu Sep 14 08:57:10 2023 X-Original-To: dev-commits-src-branches@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 4RmWRC2J80z4t01P; Thu, 14 Sep 2023 08:57:11 +0000 (UTC) (envelope-from git@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 4RmWRC0dtNz4SwM; Thu, 14 Sep 2023 08:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681831; 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; bh=BiAONLoSJIWJmqlowaKU4ezwYJnI56rtOCP4HJQwU40=; b=S5+0ejgPTmMu9IDRDKGTar3KsDxbtYtY95CbUrBkur6uyBQ8HJeOlvs0F0XF2Aq1+zOw1S W6qUhLU6YygtW9PUdDEpsaD/d8/hZaGbOmBGL96dGUSwK8SryKW1Ebn4JtVv+k9co3NeYG Bj4ZG/vWf0ujH4qMmTNDLmp4aSYtUsJ8krmMP+rCvZOj4piImmnWqXjP4wFYWm6Ce66qKo j9iCNoUESVsK3+hA8fa3s0XM9C4oyGDiCQi4ez2+5ubMJRLQFBUc5Fscj5AM9sgxinLCxZ FPJZMdvNMnwBuVkcYsRtqh+58d68KZGgyoBYya2mzc7VA50SIWc2p9mufDX8/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694681831; a=rsa-sha256; cv=none; b=mqm1gSLZwlTChLxxFg5UMI3VxpGvL5ElRWP2gSKng+FpdwqGox1Rdi8IyNE3/xU2yEnZyi H4cEnwfQLb80ct85W9Dnf5aR45oipTj/iIsJWRJV5itrD7Z7LzJOX7L9abXCCEUQR7ZJmZ Oi/9CRqiw9mBSn6UfdykVu1atA7MJ6cVnmJDbi5apvdy2IHCwIDk20TmHXhG3nmQ58Jere OlSh+dCbNzqADdN6a31AXa7H0hpKxHRsIOXkvA4BLh1ehJdIBDsDK5bpbIrfBNecOjlZTW 8pakLxe7sZHmEGFpnn6mCuJBUjR56eKSwpLfAof8PBfW6ivpw2G+arDD5vQ2xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694681831; 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; bh=BiAONLoSJIWJmqlowaKU4ezwYJnI56rtOCP4HJQwU40=; b=iTlHz1psRYKImHLsbyvWQqhcistBTz9x30zu2VEIQciFRgJc0Q4j/TO4CZFtl0zCRGZVCX pynv9RehiEDtHnktl8r0u5/4VEZN6TKMbWxjkjLODGa8qGK05hrPmYGqkM1DkkOPBzd3gL htlrxum5SOGfo6eCRw7Mn5MpAMx4PGqysF0TNQ8791nTjfVoI4BiVqWQchy8ymjAMOxN0r 09ve5sZVKYEdIRzIMRxDvRGk2YmUI3J56W205kGsSDvIcOQCN/c6EynZFAWTQySnFpNnbo /ElhULfhVbfLX0pLnuYxQtfA0wIExc4IOyrp59muW7UsvzUBh/aLvJtDNN3ILA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4RmWRB6sdmzr7d; Thu, 14 Sep 2023 08:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38E8vAk9076778; Thu, 14 Sep 2023 08:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E8vAMZ076775; Thu, 14 Sep 2023 08:57:10 GMT (envelope-from git) Date: Thu, 14 Sep 2023 08:57:10 GMT Message-Id: <202309140857.38E8vAMZ076775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f92a598782c2 - stable/14 - newvers.sh: Avoid picking up stray envars. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f92a598782c2f671559a919f353b1505f6fe09ca Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f92a598782c2f671559a919f353b1505f6fe09ca commit f92a598782c2f671559a919f353b1505f6fe09ca Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 08:56:45 +0000 newvers.sh: Avoid picking up stray envars. 89f361f742ae added a mechanism to allow arbitrary overrides from the command line. Unfortunately, it also had the (likely unintended) effect of allowing RELEASE and VERSION to be passed in from the environment, and Makefile.inc1 happens to define VERSION for the benefit of pkgbase. To restore the status quo, unset RELEASE and VERSION at the top of the script. Fixes: 89f361f742ae MFC after: 3 days Reviewed by: gallatin, sjg, emaste Differential Revision: https://reviews.freebsd.org/D41845 (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3) --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d9bccdfdf191..bb6f3349d87b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="STABLE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/..