From nobody Wed Sep 13 18:11:40 2023 X-Original-To: dev-commits-src-main@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 4Rm7nS6K15z4sfdm; Wed, 13 Sep 2023 18:11:40 +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 4Rm7nS5sJkz4VNy; Wed, 13 Sep 2023 18:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694628700; 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=yDHJf1r2G7i6AZTTA6wK3LyOH6T1GUbqPs7vEDTR7Do=; b=nTlL2/XIb/y5QvJaW2DPoFMP0afovyLptbCOGdjG9aLPf1MhCN7Cm2O/tO7uil0974uw8b L9nKK1Q7rTkD/JbL0XdsW5VoRp1SP04dKpU28rRjLl+HOCnlAxhCwozngwGbZrH0hshh4B XNwcdZ0/rZ8qV/fRfDWllz52tMPohaiAuLNeBZ7IPhT4RPHf7h6szMaRJio6nCjPQ2cvfL zSUNDNIqP5w4jFg4FI2UOmBzsZFHHGoAmXl4ykcMyyce6Fq8K8bt315F8b93uOhNBnJ/YG M0RCj65gTipby+dNt7PEUR6Ft6/w0VfeoTKxb373+aiDn1EITleuwK2Q9FIwcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694628700; a=rsa-sha256; cv=none; b=bzEOphUAkMiCeO+0FOG+cY6IK47noJZsEELk8Ine4QMiNSvTUy22M56u3l9AxH5GM7bQNL eir/esdUwRdOA5vfj6JU2vekQ2qo9+Id8VYaK1LtEGS92q0GarrJpxR5nDuZ3E3yhd0gt+ fPGTUQ0dGgPq2C8J5r0Sz6cMltSI2ImB1fqAJqBXrTNsBF63EYLRSc3UY2cUle2MHuS1w2 R4Ib3chl4mFL2JEfBVaI2MzSGth2uAXoOW9IX7iEzFw+wHTzumLg7xi+iZTi55b/jidEId LUlb9dqxLFgmKqDTVssad9sdSWT9L8vOW+hAxzqYqmOJ2KEh7tqwSG7SSfUZIw== 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=1694628700; 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=yDHJf1r2G7i6AZTTA6wK3LyOH6T1GUbqPs7vEDTR7Do=; b=JHcYwPOpkW8+4zc8u982E5toTYrO37NWjHXyjNPqZL2S8SioSvJKLwgVTo1t65Ad1gzA4m Ovt5+v+4wGzYjIebL3KgZseNKfH+z4cazwfk8BVaSjL1p2JmYMECUZQzqGuKkfQD/NxIiZ 271bkwg3U+YXYG4IcIKneiyLqbTsyA1vWOSrbZpx7fx8sayB18Cf0YVeTYCMSZEKMwnlGm sfAZ5GegW7f/ujWKqxHCeI6AQunN8Ay/JzlWiwql5sQ1ppQOvbl0ZJj84EEcKiN0vneYya /8oBkY8LT41TviSa7TXe1/GMpZPcurnjtoYaPaHQfQ2WRA22+FiGgVTvsusi0w== 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 4Rm7nS4wvLz8nv; Wed, 13 Sep 2023 18:11:40 +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 38DIBeJd010363; Wed, 13 Sep 2023 18:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DIBexV010360; Wed, 13 Sep 2023 18:11:40 GMT (envelope-from git) Date: Wed, 13 Sep 2023 18:11:40 GMT Message-Id: <202309131811.38DIBexV010360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f16abf8d356 - main - newvers.sh: Avoid picking up stray envars. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3 commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav 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)/..