[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rcs/, dev-vcs/rcs/files/

["Sam James" <sam@gentoo.org>]

commit:     4281a2e29017daeddd1692866a9dcee01b11a67a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 12:12:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 12:16:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4281a2e2

dev-vcs/rcs: backport test fixes for 5.10.0

Note that these are purely test fixes, not changes
in the logic of the program (=> no need to revbump).

Bug: https://bugs.gentoo.org/820230
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch | 30 ++++++++++++++++++++++++++
 dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch | 32 ++++++++++++++++++++++++++++
 dev-vcs/rcs/rcs-5.10.0.ebuild                |  2 ++
 3 files changed, 64 insertions(+)

diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
new file mode 100644
index 00000000000..ea86af8fd02
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
@@ -0,0 +1,30 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=8883c4f5a29be18e9ea09bd27a7b660830de45bb
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen <ttn@gnu.org>
+Date: Fri, 23 Oct 2020 09:23:49 -0400
+Subject: [v] Don't test signal handling if stdin not ok.
+
+<https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
+
+* tests/t632: If stdin is not open and connected to
+a tty, skip the signal handling portion of the test.
+--- a/tests/t632
++++ b/tests/t632
+@@ -40,6 +40,15 @@ echo | co -l -I $w \
+ # (This is skipped if GNU coreutils timeout(1) is not available.)
+ ##
+ 
++# <https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
++# The timeout test needs co(1) to block on input.
++# If stdin is not open and connected to a tty, skip out.
++if test -t 0 ; then
++    echo STDIN OK
++else
++    exit 0
++fi
++
+ # TODO: Don't be lame!  Pick one:
+ # (a) Mimic timeout(1) w/ sh commands.
+ # (b) Incorporate heart of timeout(1) into ./btdt and use that.
+cgit v1.2.1

diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
new file mode 100644
index 00000000000..86ebab5f147
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
@@ -0,0 +1,32 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=5df4567e69fc7f46d14cfbf396525c3d05bcf970
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen <ttn@gnu.org>
+Date: Sat, 24 Oct 2020 19:14:26 -0400
+Subject: [v] Try to handle whoami(1) returning no info.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* tests/t808 (user): If whoami(1) returns no info, no longer error out.
+Instead, jam a value, and set env vars ‘LOGNAME’ and ‘USER’, as well.
+--- a/tests/t808
++++ b/tests/t808
+@@ -24,8 +24,14 @@ rerr=$wd/rerr
+ 
+ user=`whoami`
+ 
+-test "$user" \
+-    || problem 'far out, man ... whoami failed!'
++if ! test "$user" ; then
++   : 'far out, man ... whoami failed!'
++   user=jrluser
++   USER=$user
++   export USER
++   LOGNAME=$user
++   export LOGNAME
++fi
+ 
+ must 'sed -e s/ttn/trulynobody/g \
+           -e s/zurg/$user/g      \
+cgit v1.2.1

diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
index 4bd994b8b2e..02c0dfa721c 100644
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.0.ebuild
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-test-t808.patch
+	"${FILESDIR}"/${P}-test-t632.patch
 	"${FILESDIR}"/${P}-glibc-2.34.patch
 )