From nobody Tue May 10 13:13:02 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 3259F1ACB313; Tue, 10 May 2022 13:13:03 +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 4KyJPW0tGsz3JmS; Tue, 10 May 2022 13:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652188383; 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=0NlYO3p2eyx79Ecbf5OkZnu821AX/1FJK3miKMXv46c=; b=SPp4VyN81AZRNr4XAzdBFCG++HM9Pvd+ve5btdW2cpT1qxrgsik7jSOPoW+lFjFRLdVg2P 9qmLTrygLSw8QgXJXG7BxWInhEhNPM5DjFEXOxzj2Fr2eWipE/aLe/OoE1s1zd+VJWnV/9 naLWhwLjvvD28ciLpC86QwJrgAAkkDVruNmQeZLXZdvPG+rOMNCXid5W022w9dbIzbTqLa OV12FARzj7qKI3usoEgGLaE2bN8OntA6HSj3l2bluqGqB+p5fYCA7RVAs+9im6kalGdUxP XRuDcT04kd7Ur2I5CjUoRHFdFRTmNpLOtimcRji3jFSM229JE9kh7FUA/a/CIA== 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 F28FE25E9A; Tue, 10 May 2022 13:13:02 +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 24ADD2cn047712; Tue, 10 May 2022 13:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ADD2LV047711; Tue, 10 May 2022 13:13:02 GMT (envelope-from git) Date: Tue, 10 May 2022 13:13:02 GMT Message-Id: <202205101313.24ADD2LV047711@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 E=C3=9Fer?= Subject: git: aaa77b3a3660 - main - contrib/bc: revert commit f4ff1c300ef40 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: aaa77b3a36605a4bf8daaa218be0e4916be39a6a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652188383; 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=0NlYO3p2eyx79Ecbf5OkZnu821AX/1FJK3miKMXv46c=; b=Pcjqy2jhU/WVX4rk8ft0lkr3D7GNSuwrdfn6ovLs4ZZhgWCOU0HFjcfyvThekj3H1rhsq1 +DIZ/cYibCwL0MBfQxeANzT42Fnw9x++xwN0OD3Xx4iBANo4n+HYmiDOsRWhtbmNrcKq8O 9wrAoUy/DIeg+rDmtampZTdDl3TP2TjKwPkAWoph1pjua2TudfiIuof6ZbyjWVKKfh/vEH 0Xsqh7e6qcK60IAGR+pfhUZTMkfSRj19uHbmxomS8vZGdLyCJGTDF9IFbERnTcJOZjQju1 RQScVy9dxjaYTodfr24+QMyNfnDWvEGnIawAzRoIXHpNL9ANqB44ERxjvGOc+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652188383; a=rsa-sha256; cv=none; b=onwRTHaSkD6H8h2iIFqKsOH4s8FptijJ9eneIHkZXVhwEngoLPN5RrRB3yU02JQ1MRDVCW FbeFfZF1GSWfEu+zbiomaBxPg46+j/5Kjl6g/18NY4rXfBy4j1NK+8elk/cNZgDaBw5aBf 7RVUtVUoR2+xDG5kfkLM2zua1edgZGFJBPcW+1VDCFRKefKi7lBWKcTKQdzVOusXNFFEya X6uu4ZeRnv7wKP/VkmI8VJGKmDgDVWmXxCdVKcfzWEBVeZsRuBEu7W3IZgqaRlPz5W7ta2 ZI06XxF1vM+LmVZUyCJ8SqXmg8tQQuBvfTJTF08IteIU2c6Bl8XK5tym8/f9Sg== 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=aaa77b3a36605a4bf8daaa218be0e4916be39a6a commit aaa77b3a36605a4bf8daaa218be0e4916be39a6a Author: Stefan Eßer AuthorDate: 2022-05-10 13:11:49 +0000 Commit: Stefan Eßer CommitDate: 2022-05-10 13:11:49 +0000 contrib/bc: revert commit f4ff1c300ef40 This commit was executed by accident while testing the new version. --- contrib/bc/NEWS.md | 5 ----- contrib/bc/include/version.h | 2 +- contrib/bc/scripts/package.sh | 13 ------------- contrib/bc/scripts/release.sh | 1 - contrib/bc/src/history.c | 16 ++++------------ contrib/bc/tests/history.py | 7 ++----- 6 files changed, 7 insertions(+), 37 deletions(-) diff --git a/contrib/bc/NEWS.md b/contrib/bc/NEWS.md index 1a8a5dd31ad8..3a388b0dc316 100644 --- a/contrib/bc/NEWS.md +++ b/contrib/bc/NEWS.md @@ -1,10 +1,5 @@ # News -## 5.2.5 - -This is a production release that fixes this `bc`'s behavior on `^D` to match -GNU `bc`. - ## 5.2.4 This is a production release that fixes two bugs in history: diff --git a/contrib/bc/include/version.h b/contrib/bc/include/version.h index da98b30bb767..4621b50bcbeb 100644 --- a/contrib/bc/include/version.h +++ b/contrib/bc/include/version.h @@ -37,6 +37,6 @@ #define BC_VERSION_H /// The current version. -#define VERSION 5.2.5 +#define VERSION 5.2.4 #endif // BC_VERSION_H diff --git a/contrib/bc/scripts/package.sh b/contrib/bc/scripts/package.sh index e3a35b0fe65d..34692f7ab20a 100755 --- a/contrib/bc/scripts/package.sh +++ b/contrib/bc/scripts/package.sh @@ -35,7 +35,6 @@ # * git # * stat # * tar -# * gzip # * xz # * sha512sum # * sha256sum @@ -183,14 +182,6 @@ cd .. parent="$repo/.." # Cleanup old stuff. -if [ -f "$projver.tar.gz" ]; then - rm -rf "$projver.tar.gz" -fi - -if [ -f "$projver.tar.gz.sig" ]; then - rm -rf "$projver.tar.gz.sig" -fi - if [ -f "$projver.tar.xz" ]; then rm -rf "$projver.tar.xz" fi @@ -201,8 +192,6 @@ fi # Tar and compress and move into the parent directory of the repo. tar cf "$projver.tar" "$projver/" -gzip -k "$projver.tar" -mv "$projver.tar.gz" "$parent" xz -z -v -9 -e "$projver.tar" > /dev/null 2> /dev/null mv "$projver.tar.xz" "$parent" @@ -253,8 +242,6 @@ rm -rf windows/lib/{Win32,x64}/{Debug,ReleaseMD,ReleaseMT}/bcl.vcxproj.FileListA # Zip the Windows stuff. zip -r $projver-windows.zip windows > /dev/null -printf '\n' -shasum "$projver.tar.gz" printf '\n' shasum "$projver.tar.xz" printf '\n' diff --git a/contrib/bc/scripts/release.sh b/contrib/bc/scripts/release.sh index 02d3dd5dae24..12097b1cc8b9 100755 --- a/contrib/bc/scripts/release.sh +++ b/contrib/bc/scripts/release.sh @@ -601,7 +601,6 @@ clang_flags="-Weverything -Wno-padded -Wno-switch-enum -Wno-format-nonliteral" clang_flags="$clang_flags -Wno-cast-align -Wno-missing-noreturn -Wno-disabled-macro-expansion" clang_flags="$clang_flags -Wno-unreachable-code -Wno-unreachable-code-return" clang_flags="$clang_flags -Wno-implicit-fallthrough -Wno-unused-macros -Wno-gnu-label-as-value" -clang_flags="$clang_flags -Wno-declaration-after-statement" # -Wno-undef is here because Clang seems to think BC_C11 is undefined, when it's defined. clang_flags="$clang_flags -Wno-undef" gcc_flags="-Wno-maybe-uninitialized -Wno-clobbered" diff --git a/contrib/bc/src/history.c b/contrib/bc/src/history.c index 74123a7c4918..7e2661486a8b 100644 --- a/contrib/bc/src/history.c +++ b/contrib/bc/src/history.c @@ -1535,20 +1535,12 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) { } #ifndef _WIN32 - // Act as end-of-file or delete-forward-char. + // Act as end-of-file. case BC_ACTION_CTRL_D: { - // Act as EOF if there's no chacters, otherwise emulate Emacs - // delete next character to match historical gnu bc behavior. - if (BC_HIST_BUF_LEN(h) == 0) { - bc_history_printCtrl(h, c); - BC_SIG_UNLOCK; - return BC_STATUS_EOF; - } - - bc_history_edit_delete(h); - - break; + bc_history_printCtrl(h, c); + BC_SIG_UNLOCK; + return BC_STATUS_EOF; } #endif // _WIN32 diff --git a/contrib/bc/tests/history.py b/contrib/bc/tests/history.py index c74dfd72f0a7..84e32f9612c4 100755 --- a/contrib/bc/tests/history.py +++ b/contrib/bc/tests/history.py @@ -282,11 +282,8 @@ def test_eof(exe, args, env): child = pexpect.spawn(exe, args=args, env=env) try: - send(child, "123") - expect(child, "123") - send(child, "\x01") - send(child, "\x04") - send(child, "\x04") + send(child, "\t") + expect(child, " ") send(child, "\x04") wait(child) except pexpect.TIMEOUT: