From nobody Thu Sep 14 15:00:23 2023 X-Original-To: dev-commits-src-all@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 4RmgVH6szhz4sb07; Thu, 14 Sep 2023 15:00:23 +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 4RmgVH6JHYz4VRH; Thu, 14 Sep 2023 15:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694703623; 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=kA8OTivQnWsvGnMU9VQ2n8zFvI3TAcpm1P2AWvJLyL8=; b=CjKSlU1b1xTREelhjBfnC2PLUQNZciu9pEs5/JIt3bJhXQhfuQWIjlEIiH/4QJinBcie1o eQ8araIDKAHI2iCyWjvnpLHHic+x+9iZihT8OxAamT8K0khytLM3hRl5I1OQNIfldpv/tB BoC/TFywosqMU5lURguukBmyW914DvHxWv85q45e2awvmWNKoZF1JUf+oHLW/YDgKfNqdY 3AwqBsezOgYgWjYQoFNWR3BJqxAPmHkfBedzIzW7jWbsLQ5pVhRmdoLcDjm0KM07wTVs7h Khu5GHxRsmd0ldDr6oK9+Qrs4+6+I2NGRa3WdS8x/A9/AZ6zC2fLlR+ZTX3MfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694703623; a=rsa-sha256; cv=none; b=EgvCbVBN75Pa3gBzO0N0RowX6TvEmMar8BAgI9g6ugFOOGGQnLkXzYQoNVRr88GYSRSm8k 9OHlgtNcA1yBXFjIkWBfJ9vzK4xpqQi0KmnFZ7JGPQWYThnIbVRjZE5ONYdtBMxwPbT/CF tFTcrnaXANZIUwM6IejBwibn4uufNjGtVMdzpx2z0uL3gs4nYAVhv2hxuXTXSphzjJBgd5 L3E6I41KrcjShzfOUS8OnwNvoLIHaxExAdDmQyJNSPmFRAyCAWnkPtGpgYXUGnlsiAMMdH zvN+woyLsJ73FXA8cJ4T2xy3pdSsD2lraCcHXMvts8AbgK7OQuZHGZKX0sCCqg== 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=1694703623; 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=kA8OTivQnWsvGnMU9VQ2n8zFvI3TAcpm1P2AWvJLyL8=; b=An7XQcsTS//VyDcNqveHI7LfLkaCdEVmt6z6hRcrEN3k5kAOCeZ69j7ieZiwHE9srGLdw1 DQHywee1AlJcffjzs9EeGYBpW0d5GsXWL7iZbldH2Pb7b8o30WoXiIvamjIxem1LaNDolR y/sK4ikPxSpwQfoHhF++196IAcpbaRpix4CjS6StFUcnaax32mnAQAS9GkB/KD7ooJUNHf 20vvK68SnhaNKfWELWGaACo1tj6zlJVJWMq71yXnxnjh1YlOqt23/CPj4SFZhnL3DFfJks yrpSz7QcABjGKoIs0HGZxrRiOEL49To3fsNCiJkXhjAeQTi/n/+Bho1WOJcvsA== 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 4RmgVH5P07z11qn; Thu, 14 Sep 2023 15:00:23 +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 38EF0Nhe089145; Thu, 14 Sep 2023 15:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38EF0Nu9089142; Thu, 14 Sep 2023 15:00:23 GMT (envelope-from git) Date: Thu, 14 Sep 2023 15:00:23 GMT Message-Id: <202309141500.38EF0Nu9089142@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: 525c3ef318f8 - releng/14.0 - newvers.sh: Avoid picking up stray envars. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 525c3ef318f8898e4bc61e815daa8f0a9ce3b948 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=525c3ef318f8898e4bc61e815daa8f0a9ce3b948 commit 525c3ef318f8898e4bc61e815daa8f0a9ce3b948 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-14 09:00:16 +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 Approved by: re (gjb) (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3) (cherry picked from commit f92a598782c2f671559a919f353b1505f6fe09ca) --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 81c35d40f6a3..9c894c4587da 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/..