commit: 42fbb2f03e8fd683dbfe06719229ff3959dd9bc9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 29 12:16:04 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 29 12:16:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fbb2f0
dev-vcs/rcs: backport t810 test fix for 5.9.4 Note that these are purely test fixes, not changes in the logic of the program (=> no need to revbump). Closes: https://bugs.gentoo.org/820230 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch | 24 ++++++++++++++++++++++++ dev-vcs/rcs/rcs-5.9.4.ebuild | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch new file mode 100644 index 00000000000..568731e1903 --- /dev/null +++ b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch @@ -0,0 +1,24 @@ +https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=f2330a6268d244e97f47a97f4767736fc3b31455 +https://bugs.gentoo.org/820230 + +From: Thien-Thi Nguyen <t...@gnu.org> +Date: Thu, 5 Apr 2018 16:20:35 +0200 +Subject: [v] Avoid "test FILE1 -nt FILE2". + +* tests/t810: Use "btdt mtimecmp" instead of "test -nt". +Thanks to both sergio and Xose Vazquez Perez +for indirectly signalling this problem. See 2018-04-05, +"Add support for "btdt mtimecmp FILE1 FILE2"" for details. +--- a/tests/t810 ++++ b/tests/t810 +@@ -27,7 +27,8 @@ split_std_out_err no + + must 'echo new line >> $w' + must 'ci -mm -l -d -T $w' +-test $w -nt $v && problem "$w newer than $v" ++test 1 = `./btdt mtimecmp $w $v` \ ++ && problem "$w newer than $v" + + exit 0 + +cgit v1.2.1 diff --git a/dev-vcs/rcs/rcs-5.9.4.ebuild b/dev-vcs/rcs/rcs-5.9.4.ebuild index b5cd9539963..ee7d184c6b6 100644 --- a/dev-vcs/rcs/rcs-5.9.4.ebuild +++ b/dev-vcs/rcs/rcs-5.9.4.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit flag-o-matic +inherit epatch flag-o-matic DESCRIPTION="Revision Control System" HOMEPAGE="https://www.gnu.org/software/rcs/"; @@ -20,6 +20,8 @@ RDEPEND=" DEPEND="${RDEPEND}" src_prepare() { + epatch "${FILESDIR}"/${P}-test-t810.patch + sed -i -e '/gets is a security hole/d' \ lib/stdio.in.h || die }
