[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/files/

[Thomas Deutschmann]

commit:     c02ca61191198aacf2bd51c4d5a7b53b1cbb5ab9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 22:20:43 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 22:21:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02ca611

sys-devel/patch: fix test suite when using dash

Closes: https://bugs.gentoo.org/738810
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../patch/files/patch-2.7.6-fix-test-suite.patch      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
index 3aff5c0f77b..5571209c493 100644
--- a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
+++ b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
@@ -1,5 +1,6 @@
-http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288
-http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5
+https://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288
+https://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5
+https://git.savannah.gnu.org/cgit/patch.git/commit/?id=7623b2dc0d1837ecfd58f32efc78e35834deeb38
 
 --- a/tests/crlf-handling
 +++ b/tests/crlf-handling
@@ -117,4 +118,16 @@ http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c2
      while test $# -gt 0 ; do
  	echo "$1"
  	shift
--- 
+ 
+--- a/tests/test-lib.sh
++++ b/tests/test-lib.sh
+@@ -113,7 +113,7 @@ cleanup() {
+     exit $status
+ }
+ 
+-if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
++if ( eval 'test -n "${BASH_LINENO[0]}"' 2>/dev/null ); then
+     eval '
+ 	_start_test() {
+ 	    printf "[${BASH_LINENO[2]}] %s -- " "$*"
+