Add fix from upstream for username handling with rsh.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 89 insertions, 1 deletions

diff --git a/dev-util/dejagnu/ChangeLog b/dev-util/dejagnu/ChangeLog
index 4cb65e54417a..c6da17603953 100644
--- a/dev-util/dejagnu/ChangeLog
+++ b/dev-util/dejagnu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/dejagnu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/ChangeLog,v 1.18 2010/01/15 21:30:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/ChangeLog,v 1.19 2010/03/16 00:24:47 vapier Exp $
+
+*dejagnu-1.4.4-r2 (16 Mar 2010)
+
+  16 Mar 2010; Mike Frysinger <vapier@gentoo.org> +dejagnu-1.4.4-r2.ebuild,
+  +files/dejagnu-1.4.4-rsh-username.patch:
+  Add fix from upstream for username handling with rsh.
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   dejagnu-1.4.4-r1.ebuild:
diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r2.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..8d63a15aa7af
--- /dev/null
+++ b/dev-util/dejagnu/dejagnu-1.4.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dejagnu/dejagnu-1.4.4-r2.ebuild,v 1.1 2010/03/16 00:24:47 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="framework for testing other programs"
+HOMEPAGE="http://www.gnu.org/software/dejagnu/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+DEPEND="dev-lang/tcl
+	dev-tcltk/expect"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/dejagnu-ignore-libwarning.patch
+	epatch "${FILESDIR}"/${P}-rsh-username.patch
+}
+
+src_test() {
+	# if you dont have dejagnu emerged yet, you cant
+	# run the tests ... crazy aint it :)
+	type -p runtest || return 0
+	emake check || die "check failed :("
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	use doc && dohtml -r doc/html/
+}
diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
new file mode 100644
index 000000000000..ff4e970a4fd4
--- /dev/null
+++ b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
@@ -0,0 +1,45 @@
+fix from upstream:
+
+2004-03-05  Daniel Jacobowitz  <drow@mvista.com>
+                                                                                
+	* lib/remote.exp (standard_spawn): Fix rsh username support.
+
+diff --git a/lib/remote.exp b/lib/remote.exp
+index b57276e..cdec0d2 100644
+--- a/lib/remote.exp
++++ b/lib/remote.exp
+@@ -860,19 +860,18 @@ proc standard_spawn { dest commandline } {
+         set RSH [board_info $dest rsh_prog]
+     }
+ 
+-    if ![board_info $dest exists username] {
+-        set rsh_useropts ""
+-    } else {
+-        set rsh_useropts "-l $username"
+-    }
+-
+     if [board_info $dest exists hostname] {
+ 	set remote [board_info $dest hostname]
+     } else {
+ 	set remote $dest
+     }
+ 
+-    spawn $RSH $rsh_useropts $remote $commandline
++    if ![board_info $dest exists username] {
++        spawn $RSH $remote $commandline
++    } else {
++        spawn $RSH -l [board_info $dest username] $remote $commandline
++    }
++
+     set board_info($dest,fileid) $spawn_id
+     return $spawn_id
+ }
+@@ -1257,6 +1256,8 @@ proc remote_expect { board timeout args } {
+     }
+ 
+     if {$code == 1} {
++        if {[info exists string]} {send_user "ERROR OCCURED: $errorInfo $errorCode $string"}
++
+ 	if { $error_sect != "" } {
+ 	    set code [catch {uplevel $error_sect} string]
+ 	} else {