From nobody Wed Jun 22 13:59:36 2022 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 E724286A6E4; Wed, 22 Jun 2022 13:59: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 4LSlPN64vkz3p8N; Wed, 22 Jun 2022 13:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655906376; 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=ljvlI4gvUWbvCvHCufcRxrbKuF8Li8AUWZLtdxP/Trs=; b=gvy5BKH270UKRw37JUT1IWl0NC2StESCtosyeFb7d6r0R5zMbAsiSG4CU+P6v5tKYSIRbP x4/shMhqs8b39vjSWctPo1l6dVLDIF4Aq7B2sFBXkHdFbKvGz0qRT3CFJqqeSFBLzKHHAE mHzZenKoSTkFapo6Ozl/OTx+qvuLksoKaWnDsuxsMm0UyJ+tJ20TJ9rFX2Y9eTnJKWmCK9 li9z3bJX9R3QiaeH8X5xE0EABMVrgkDzD6U1Cm9H0Roto/F/MfERZofAmYmqVi0p6JAb26 4T5OZsv2O/c/IDD9gcQs/hRzQikdcrceAEJwXXFi5JvkC11PETtM9gmSbFE3sg== 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 B08FA2742B; Wed, 22 Jun 2022 13:59: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 25MDxanQ001506; Wed, 22 Jun 2022 13:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25MDxaKP001505; Wed, 22 Jun 2022 13:59:36 GMT (envelope-from git) Date: Wed, 22 Jun 2022 13:59:36 GMT Message-Id: <202206221359.25MDxaKP001505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: f6ed05f12330 - main - vendor/bc: update to upstream commit ca53adf83b7a 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: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6ed05f1233043eb30a7e5a1efcb7247ad2add90 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655906376; 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=ljvlI4gvUWbvCvHCufcRxrbKuF8Li8AUWZLtdxP/Trs=; b=EXvyBJuN/68EPi9HwpJo+hSNJmB/1sjjbTGJz5IkhK52O4yiQzCgTApQLjlfoHv00bBjnC f8VPMI82OXGrjuH9z9ihPDx3KNIasS+1wcZgbIw6E11oiT4vGw2qiCMn2r9NgZlUTALojL 67mICIdnTdV6kQFJJiy8Z8sox67W79/S+4QDBSUiP54Yr/ylpVF6A+6KFMGTvZUEZtLDZr +jias86evL6uPdFfxXVhJgxYsOoPVFm2AVwsYx5wzwpVkhztUV/+K/ReeZV89HzAbryaLp l9Cqp0T1FOJ5+qyaUEhkmnIz6OB1cy8HEOLazhJM3SSM4y+/372LmsN+oThpgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655906376; a=rsa-sha256; cv=none; b=w3v+EeZhR9akr8vGP/NMxYw7AnlEgAnuLr8UNu3kJY6pOjKRR5v5pX9F43rmPWZ8IogFHt h18ecDG6PkzIzaJRopP2xskeCSNLV3qPDL8ya/MfaomMsMnrFKuggYdRERZ+acRak/p43f jHGN8NOUIiZ+bu5De4Cj9US5l5yzHmq+2DojQOXIqad4vDMqhwr+B5+i00+RYBM/wF/TFn UmmVPNmmdsQOo+/NkpUPxcaEYsmm1D1xgfvUjvPVRbSO5Nzhwik98cQh3cGPGoBnXCcRoI Lc0IKrL1P+D/aB/3vwNtF4Thngf7DHBbVK0u+ICDHr7b/woO0JFgdF1dvnRVlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ed05f1233043eb30a7e5a1efcb7247ad2add90 commit f6ed05f1233043eb30a7e5a1efcb7247ad2add90 Author: Stefan Eßer AuthorDate: 2022-06-22 13:41:40 +0000 Commit: Stefan Eßer CommitDate: 2022-06-22 13:56:01 +0000 vendor/bc: update to upstream commit ca53adf83b7a The filter_text function in scripts/functions.sh in version 5.3.3 had commented out a "rm" command, probably for debugging purposes. This caused temporary files to persist in /tmp when the bc program had been built. This commit fixes the build process with no change of the resulting artefacts. (cherry picked from commit 1576f66712876ee8b0fcc8b35fb062e1813b4fc0) MFC after: 3 days --- contrib/bc/scripts/functions.sh | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/contrib/bc/scripts/functions.sh b/contrib/bc/scripts/functions.sh index 53778ad4d16b..f2c5b0b50eae 100755 --- a/contrib/bc/scripts/functions.sh +++ b/contrib/bc/scripts/functions.sh @@ -348,13 +348,13 @@ filter_text() { # Set up some local variables. _filter_text_status="$ALL" - _filter_text_temp="$_filter_text_out.tmp" + _filter_text_last_line="" # We need to set IFS, so we store it here for restoration later. _filter_text_ifs="$IFS" # Remove the file- that will be generated. - rm -rf "$_filter_text_out" "$_filter_text_temp" + rm -rf "$_filter_text_out" # Here is the magic. This loop reads the template line-by-line, and based on # _filter_text_status, either prints it to the markdown manual or not. @@ -371,10 +371,10 @@ filter_text() { # # Obviously, the tag itself and its end are not printed to the markdown # manual. - while IFS= read -r line; do + while IFS= read -r _filter_text_line; do # If we have found an end, reset the status. - if [ "$line" = "{{ end }}" ]; then + if [ "$_filter_text_line" = "{{ end }}" ]; then # Some error checking. This helps when editing the templates. if [ "$_filter_text_status" -eq "$ALL" ]; then @@ -384,7 +384,7 @@ filter_text() { _filter_text_status="$ALL" # We have found a tag that allows our build type to use it. - elif [ "${line#\{\{* $_filter_text_buildtype *\}\}}" != "$line" ]; then + elif [ "${_filter_text_line#\{\{* $_filter_text_buildtype *\}\}}" != "$_filter_text_line" ]; then # More error checking. We don't want tags nested. if [ "$_filter_text_status" -ne "$ALL" ]; then @@ -394,7 +394,7 @@ filter_text() { _filter_text_status="$NOSKIP" # We have found a tag that is *not* allowed for our build type. - elif [ "${line#\{\{*\}\}}" != "$line" ]; then + elif [ "${_filter_text_line#\{\{*\}\}}" != "$_filter_text_line" ]; then if [ "$_filter_text_status" -ne "$ALL" ]; then err_exit "start tag nested in start tag" 3 @@ -405,18 +405,15 @@ filter_text() { # This is for normal lines. If we are not skipping, print. else if [ "$_filter_text_status" -ne "$SKIP" ]; then - printf '%s\n' "$line" >> "$_filter_text_temp" + if [ "$_filter_text_line" != "$_filter_text_last_line" ]; then + printf '%s\n' "$_filter_text_line" >> "$_filter_text_out" + fi + _filter_text_last_line="$_filter_text_line" fi fi done < "$_filter_text_in" - # Remove multiple blank lines. - uniq "$_filter_text_temp" "$_filter_text_out" - - # Remove the temp file. - #rm -rf "$_filter_text_temp" - # Reset IFS. IFS="$_filter_text_ifs" }