git: 9f16abf8d356 - main - newvers.sh: Avoid picking up stray envars.

The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3

commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-09-13 18:10:46 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-09-13 18:10:46 +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
---
 sys/conf/newvers.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 40821c100161..73fd6857d307 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -57,6 +57,8 @@ BRANCH="CURRENT"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
+unset RELEASE
+unset VERSION
 
 if [ -z "${SYSDIR}" ]; then
 	SYSDIR=$(dirname $0)/..