From nobody Wed Mar 01 16:04:08 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 4PRfDm3jthz3v2gX; Wed, 1 Mar 2023 16:04:08 +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 4PRfDm2NFRz3n3n; Wed, 1 Mar 2023 16:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686648; 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=HLqFgV6ZKsyd2oY25q1B13YUzSOE1qek3jqbQJZ4mNk=; b=jgqgbDsDXfItnqBmFR3XgPqvvQfCSVD72pkWV6mS9kvUesXSZD3VP9pL1Tjt70ZELddGP/ /j6NzWYdu9nr6bISvIMb1XRBcKaQkfooKWHIWoGltbPOqNyuwkrqz0zUbHWYl7YXJYEQdM 5N93gsv+pc51gRz/v/v4P7saEYEF8yOwKSEYgy4JV8XM+TK0sD89StOFK290Ps4GuvIAtp /AuXAHKiLUV9ayISkKEZFNqs+0keVY+iog91MOVMb4eFPG5VQAjufEt3v712N7NliFBEJt 94BlDbtvEURmbpFb1rA0ZXTLCyclaeAHQIlqmDayh3HdJzUVL4kF95l1owv9aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686648; 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=HLqFgV6ZKsyd2oY25q1B13YUzSOE1qek3jqbQJZ4mNk=; b=ThkOz+t1z68JSDLyhl651gJmFmD1ajEt4P4qtVdZ87STnpTkyBFg4p7RF70UF1V+IrnR8i CgCri3qVuEmviOWVSl0kuL5t6R1n5fN2Efqa2BK5M0hx9Mty24FRC2heIGLpAyh4XlfvtU 8DTruuXct7zbMrInTvjqATmxltA3GCpSOY9WcRTipT1MqlOuC72tDCT0NHJQKNt7lPb11T BDQAfHP1jU2zuKUrMAgZuztT6iNeADJRvYrRbAfULDoShvZlOEYvjWT0QOCbgPewstV+42 T5UiD0gHGKf/UYiJkvsh/+ILYDTo9d4FdABrEBIQ4BLKmZY9q/zK22vnxCy/Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677686648; a=rsa-sha256; cv=none; b=wlwwABu740tVtQiDLOYtU7HpUp4Hyp6zuBUavi8/vcZPmsUtWDPcv6Ydr5Bf/bd6QqmIo0 HqX7atmQeapxRw/Pw9MazS8UmhQ6yGJkNBPyG8ufbVmkTAmaQP93MV9p4ohOFQ8fLiUGnB 1BuUJP16C0WMyZQycttHwDlinSzStfeVbWggRtO0rdVxcYYJXb106E+ZPxaVGjlp9d4Vi8 aOsRH7+4Zp1RSBfWgvazcMiw7LZMRaG7SWpxEL/AqeNLpOePriEZoVkM7nXVw3O/a7HQJM CbJaqaZqfaazrE4NPRfXZJd99x7IgmX+W8a6QNHuxNl62+VDwCtEccno7zCEhA== 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 4PRfDm1Ts4zghN; Wed, 1 Mar 2023 16:04:08 +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 321G48f8053410; Wed, 1 Mar 2023 16:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321G48Ho053409; Wed, 1 Mar 2023 16:04:08 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:04:08 GMT Message-Id: <202303011604.321G48Ho053409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e093c61b2d69 - main - freebsd-update: avoid effects of user's environment on grep 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e093c61b2d69e9cca54a2332096c0e36f97bffc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e093c61b2d69e9cca54a2332096c0e36f97bffc0 commit e093c61b2d69e9cca54a2332096c0e36f97bffc0 Author: Ed Maste AuthorDate: 2022-12-14 17:13:19 +0000 Commit: Ed Maste CommitDate: 2023-03-01 16:02: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 MFC after: 3 days Sponsored by: The FreeBSD Foundation --- 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 078043326115..b6cd241c4a48 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3492,6 +3492,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}