From nobody Thu Mar 2 20:51:05 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 4PSNYP4KW3z3wFqc; Thu, 2 Mar 2023 20:51:05 +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 4PSNYP3hZmz3vsC; Thu, 2 Mar 2023 20:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790265; 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=cpwd/NCx053Fjf2YvPQbUA7lIdX7eKWs+5NeBqkr1AE=; b=L9yUDPJQaQPideIhpCWJZbSkOd5wlKkqfuHVYDMk35s0Iv1d03JdfO6UZY9CUhzuUPPtEO QcZ9bxCdMGXmAKn7HqHdxqXjIjAGzcm/OTrE/wsQKIwwjmnQWRWepHrEBd1U7l4x8JzDcf yl3Dv77TLzPHp8vnyCYhYP1D/SVVtCa5X9s51MLIKC4OyXo7OdTI0X43pfmT9Ay7cWqmgd kYhxBKNZXIdWfjOZv6mLVOnAi1RNcY+ZX6Q7CeLxJNh8klUOygVeSWrqN8KoAbB6mWC20f VNqbZUW43KOuUcmoXOG4lPcrKgRXndvStL8DpLsd3+L6vKn8XHv5CfKEgj43Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790265; 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=cpwd/NCx053Fjf2YvPQbUA7lIdX7eKWs+5NeBqkr1AE=; b=CmDRNs437ULlwvdPBG61/M/+6R/Wx0IkzELOzqr5yU+7u/EIkKd7nZipwwlU+F11+hq5U1 XlMx5UMZQILTC5iS9SD8O0tv0aR1R5uhebqA57pN8H4SZiQ4fclfRY/hqdJUB7k2K+cLm4 0+YnDVxSWrKADspPu0Yr/a8kuhgx+zTUqy3J+N0XfG0DV68ujfS9xISkhik2CGhtdoqKXf x8CG7+AsWCLNXI/3i2cKgBOtHdJpTHYnxP+r6gSn2ALYYazjOCIrD63hQnl6JTQCz3GbV3 mxNQgsjkgbYYc6Hmq/lkcrFO8bMT6/5m/F0Dbc0yUEFJFrA9J+peO3KnwSv/lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677790265; a=rsa-sha256; cv=none; b=rP/Y30gBE3f8SjNnYwKL0H3rkJLGAuvYSk44UjuK43qGnq9+krPGE/3prCkONAgR9p86LT m7xhQVrAfS4ywXOZo7AatOa1dyj8KziMspAwyN0mQlM4mOCHDNXrz7G/s3LkdsZum5RKcK NBrbXyiAdq0NLpVbGzJgOE/ARTSrFtFrMo4QHk2+oY/cRwJQL1LnxzChiKqiFPPArat/Hx huXrTkxLpe81vjo8Vf3HYD/M2h3s/N0M9WqchZdUQ/snQY0qCY3w6LjSFiZ1kR010M4z7f zhYAl1WHjJGiD4CJVo0pJYWH7z9WwgX8vwYw8rM/n3ENnnSaS8MGcyCpNVKS8A== 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 4PSNYP2NCxzWSD; Thu, 2 Mar 2023 20:51:05 +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 322Kp5l0093776; Thu, 2 Mar 2023 20:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322Kp5W4093775; Thu, 2 Mar 2023 20:51:05 GMT (envelope-from git) Date: Thu, 2 Mar 2023 20:51:05 GMT Message-Id: <202303022051.322Kp5W4093775@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: 735c962a4944 - releng/13.2 - 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 735c962a4944cf40e2315ada58f6cab8b9d16726 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=735c962a4944cf40e2315ada58f6cab8b9d16726 commit 735c962a4944cf40e2315ada58f6cab8b9d16726 Author: Ed Maste AuthorDate: 2022-12-14 17:13:19 +0000 Commit: Ed Maste CommitDate: 2023-03-02 20:50:57 +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) 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 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}