From nobody Wed Jun 21 12:58:35 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 4QmNq05gSHz4g2FW; Wed, 21 Jun 2023 12:58:36 +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 4QmNq01Zzwz4K8H; Wed, 21 Jun 2023 12:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687352316; 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=1bcwqVDvudMMEcM1n8ixrQ5aBudvZo+QTojjS+J9LSM=; b=xmAXXu83Dtvcl3lv6t1b58KcbcQ5Y7QhXKWMoqiazm6IfV2oYNitIzw6nwxQeEcEipNsc2 /z4JatGS2pymL6n0fOwl44SGdAvc7HdOQO8l5Fqnx5/WrDD9G8s/Vgo+kcMRpQwMAqK3Zv H2BkCxoY8U7GLES3cZeIciFa8hdePZ6PmauhFxUF/i6X8nbVNVAppl/l1ziu//0EsHiufo 0NVfp5JKeq4ehnTewnB1hOkWZ4yORhcmi0PJadETTS+ykreJonqkZlwifNcVlswIKZQrre u+8JgiJtuQilrXfUeQuAaSLEIQxYbOq5kr10IOXEUY/j3MXjRNCNfkQ9fH4Vzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687352316; 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=1bcwqVDvudMMEcM1n8ixrQ5aBudvZo+QTojjS+J9LSM=; b=Itlhn5US6EvdFXbsSuZvHyhBcNJtmrPUusAbfmzJE4ZuIjbXtApqnTJA9ttybzACZZ85jU FLP7nyhkyC8k9Yzi73Q2Imp3JenvzXRSBq7bGjJFMBwo+nFLtEjLpbnl3NChBR+dxtjNKM ZeG2d0uKC0qiV/8Ssj7rmpinDT44FyBLljF7ycf0X9YaA7VaeoHJX6TLRSByLPtS555N7z BnOpsGLRptEaMH4i1ZD4Y04tUNJeqG4/dDpwrMAEj8o7Y+yTEPhXKwqbXlc+F1c7pRQ5vQ obdSi/hTYa+deuaUJ/bapfNLc9NuDbSCnnovY7A9TtN5EMft0xx6wmERFIOX7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687352316; a=rsa-sha256; cv=none; b=vcfXTVMIuomrqjxWhCbH4HcNa77tkc0uvqT7/2ARyH42HK6pKk+l1/gpytDc6Y/GCfKCBr v8HEK8ChuFmQTk7IetAN59phDMb2SQl0IjwkeuRl9bEElpEV3Nh3K00mUyrQsRqX1tNtkg t3ltOWb2I7ywbm2R/O8OcPf6xH5NUWWCuPTbnPlLTikWnAp+gBeGzSLiUD5YVlUyZP3VaJ 6jTMU7Kj6wdm+k/UgnGWl2sae8FWuIwHVrGGY57Ga/KfuR5Ed6LOFD6P+2n8NxhqAMEvy4 LlZRcAhGU2sFo3lYAoPGxcb0bDVw/aHCOOD66RfkO1aSJttI2Z1PiULqE1+slA== 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 4QmNq00RRDzhTT; Wed, 21 Jun 2023 12:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LCwZro076046; Wed, 21 Jun 2023 12:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LCwZAb076045; Wed, 21 Jun 2023 12:58:35 GMT (envelope-from git) Date: Wed, 21 Jun 2023 12:58:35 GMT Message-Id: <202306211258.35LCwZAb076045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2004a768e44c - stable/12 - freebsd-update: avoid effects of user's environment on grep 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2004a768e44c37a3d0d9602fa66bf139e86da1c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2004a768e44c37a3d0d9602fa66bf139e86da1c4 commit 2004a768e44c37a3d0d9602fa66bf139e86da1c4 Author: Ed Maste AuthorDate: 2022-12-14 17:13:19 +0000 Commit: Ed Maste CommitDate: 2023-06-21 12:54:37 +0000 freebsd-update: avoid effects of user's environment on grep A user had GREP_OPTIONS containing --color=always, which broke grep use in freebsd-update. Unset this environment variable. PR: 255990 Reviewed by: kevans Approved by: re (cperciva, expedited MFC) Sponsored by: The FreeBSD Foundation (cherry picked from commit e093c61b2d69e9cca54a2332096c0e36f97bffc0) (cherry picked from commit 24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5) --- usr.sbin/freebsd-update/freebsd-update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 9743cd652d16..cad1b9d617fd 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3484,6 +3484,9 @@ fi # Set LC_ALL in order to avoid problems with character ranges like [A-Z]. export LC_ALL=C +# Clear environment variables that may affect operation of tools that we use. +unset GREP_OPTIONS + get_params $@ for COMMAND in ${COMMANDS}; do cmd_${COMMAND}