From nobody Thu Mar 2 18:31:11 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 4PSKRz3RcYz3w7MP; Thu, 2 Mar 2023 18:31: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 4PSKRz2nFRz3QWx; Thu, 2 Mar 2023 18:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781871; 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=EoLsJKLb+Vcm3cjOORwlUU6LHemP9KoGjnFhc3V7BjE=; b=KVoS/4M3XGfofKq8x5Er3Jx1n/fbUyZZQ64+nYdCYeKvx7uvT48wLS+aHuZ+h8CEFmx4fn AvCAB+1MlRic5b+FmnbquD5QP99kqrzUvL5zeJjcoC9LK+tuVoKcB7135zygts0O0I5UzC TBVQ7vEuIYF8Kwe1e0zpsf36HRKzXvGcxb5BHdC0einsKhiza6LxNpE3sbK5B765sDlqBY d4ZdhVM3Awqg6K69P5wfpqvhhS0Ind5USl0WHHua1Lo1R4CCv+R+Y7hphrH2L8g5nsb6JR 639BSHet6vGvwNlCs10/Ic+CRxav5kX68qWeUjX1KaFMcpmnCAC7CzjT+Me4Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781871; 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=EoLsJKLb+Vcm3cjOORwlUU6LHemP9KoGjnFhc3V7BjE=; b=lnqEe2uojGEiwjcv9yXsTzHa6rKY+TmEv6F8aRslVhIvdKVcoP8hUVxgfl9JRh4wqfBgsL 41or8qr1kOZqiS5wz98gkLHeB3tJJ756Zg+5NXcwGiLFq99OKpfR149w48ChhvmFSSFF6F meWARV/GOpSeWmhYwk2ckoPY1aP9uaU4zG2tk5V/WrUuih0amXHoYxhyC1qqHV6iLCmpq2 x38tJAS23D9NBKrGWdP0nJsA95kIEcmWz6Qufc3TaTWv3ha0KAwEMCzr0HVxHE9n4UbRmk jWFSskoPywenw/m5N8ybaWeacID/ulR15ijOwPvKSJuKPc0uNIdE0V1kFNsjMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781871; a=rsa-sha256; cv=none; b=IhRwSyKkS4eYd81YtJwVxouAen+O70USyEdsdD8mx3KkqDyiE1QNydbbvC1jNhwhsrWqVH 3hJ1QyttwtjzPGmkSknq86GkYFRJ+ufVU4PJZdFJz+6gc5dRx4Kbmoh5Mwzzudl/tZSNsu xelgoLEeqsuj9HOffzX1A7NEUEj1Rf+lqsDWT3/25wJqN7rppLawwiO1Zis83PJ6M9NSZn 3lEuiXnpcsygmxWWGtbeqpevHwL2KvU4YTqmHLPEAi+0RWW/OIdKiDZBL+sqAi3kWzwsd7 pC16TNioJVkpTEpazryB21VPp3xRE8nusnK4Jpa6hDKI1pwgIKelqP6tmZ3SCA== 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 4PSKRz1rZRzRWr; Thu, 2 Mar 2023 18:31:11 +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 322IVBUn062609; Thu, 2 Mar 2023 18:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IVBbE062608; Thu, 2 Mar 2023 18:31:11 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:31:11 GMT Message-Id: <202303021831.322IVBbE062608@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: 24fe8a518324 - stable/13 - freebsd-update: avoid effects of user's environment on grep 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5 commit 24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5 Author: Ed Maste AuthorDate: 2022-12-14 17:13:19 +0000 Commit: Ed Maste CommitDate: 2023-03-02 18:30:54 +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) --- 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 ca043de20f62..225d1e31e3ec 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3505,6 +3505,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}