Add fix from upstream for username handling with rsh.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 98 insertions, 7 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/Manifest b/dev-util/dejagnu/Manifest
index 669aa8762b17..4b5e96e3514e 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX dejagnu-1.4.4-rsh-username.patch 1304 RMD160 f55be1b962802bc5dfa604fa40d3ca129e011002 SHA1 7cf641299f3bd97198590a646b0b58fd913a81d9 SHA256 09e2465973013e4f84a461d44934668872366dc03375e8276b17e1ffe3cefc0b
 AUX dejagnu-ignore-libwarning.patch 1129 RMD160 23354c47bd6f252d62bc3f563ebe1dfe493e4740 SHA1 5f8b69fdc27149fcdfc4ebc4d033280d26257dc2 SHA256 d4ba83220bf21f2bc8b5353ae21a08e1aecee5684688e82ad2c29c163cd51979
 DIST dejagnu-1.4.4.tar.gz 1080346 RMD160 5f00f4ce6ce24aad611be500e80c40fc816dc66a SHA1 fd82ffd396eba5b595f76d2f4a068cb7fcc6cffb SHA256 d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d
 EBUILD dejagnu-1.4.4-r1.ebuild 1015 RMD160 beeb25dfb04265f9a8fd8d47bdcb6fb29d2f2a7b SHA1 c4542db16df364bfa10eb20eff393a88348ac96f SHA256 a9e5af5e41ba9177a97e3ed68f1445e49a890de9a951c46e4d16d8fbe50b4479
-MISC ChangeLog 2355 RMD160 7a1f3ea43cf6f7935a3e8345dd887d60884b6616 SHA1 17c26026481e34d58c5c49742d6d5b05de297d0d SHA256 4ee111e5e44cf9dd69745e2840f3ff4e798db2815c7b98d74ae0d28c29a42149
+EBUILD dejagnu-1.4.4-r2.ebuild 1075 RMD160 745d8685ae3b350de5ccc10288bffeedd5a90cc6 SHA1 2605b0b820d3f29e0b1a6918eb5497b1a8957513 SHA256 edf4d402e49ebd0c9d02ab592c65a2c9319d5c38fb6594b1beae225ac845fc34
+MISC ChangeLog 2565 RMD160 ae95cf11ece173d95bb33ed8860e7d119dfb1fdf SHA1 22f4e5c894f6faa33eb338082f222f2236654408 SHA256 88176b7a4d1ddcb6fba19b3347bda9226890ca28146bfba23426fb49fcf084dd
+MISC core 458752 RMD160 0745148694bad16e76b20e6334159ebb5ca93c60 SHA1 8e9f9331573bb9940804c82cb1a9496d7c7eebb4 SHA256 8302183b4aec4b22e63c1806cb488e9115b829f469e246eea0229eb374ef8590
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktQ3pMACgkQNQqtfCuFneP8oQCgnoy+yAy7xT/Lr5k8lMMvkviw
-JvwAn2yF5ETPtwkO4oPnUai0k0YpEJwT
-=CU4c
+iF4EAREIAAYFAkuez9QACgkQTwhj9JtAlp7UvwD/eHt1HezgQFT9f22YcyxFA06G
+jYeh/XP/PenGc7ix+3sA/1dD+/FQQ2rrRaBj04OZK3skbWgW6zxOTrJjialtFOGj
+=H+Sg
 -----END PGP SIGNATURE-----
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 {