patch to sshreadline.c

5 files changed, 96 insertions, 2 deletions

diff --git a/net-misc/ssh/ChangeLog b/net-misc/ssh/ChangeLog
index 208a4adbd4e1..c733d0a139b5 100644
--- a/net-misc/ssh/ChangeLog
+++ b/net-misc/ssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ssh
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.9 2005/01/04 16:17:49 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.10 2005/01/13 23:09:14 humpback Exp $
+
+*ssh-3.2.9.1-r1 (13 Jan 2005)
+
+  13 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +ssh-3.2.9.1-r1.ebuild:
+  Added patch to fix problem on first connect to a new host.
 
   04 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>; ssh-3.2.5.ebuild,
   ssh-3.2.9.1.ebuild:
diff --git a/net-misc/ssh/Manifest b/net-misc/ssh/Manifest
index dd17a4461b01..7965bee3e44f 100644
--- a/net-misc/ssh/Manifest
+++ b/net-misc/ssh/Manifest
@@ -1,8 +1,11 @@
-MD5 45b8bcebe1fa27ede48d6bb6750e6bde ChangeLog 1364
+MD5 7a71124f1c12ee8ea29262e56bb7ad8f ChangeLog 1540
 MD5 b2857d10cedc50e23008a1664762b1f6 metadata.xml 321
 MD5 ddd8c9bc8e75286f6adcda2591136707 ssh-3.2.5.ebuild 1224
+MD5 b56eb413c797f6875264919c068ee0e2 ssh-3.2.9.1-r1.ebuild 1451
 MD5 8bc4be7daab95421a629e69225d11790 ssh-3.2.9.1.ebuild 1358
 MD5 38aabe8024e31fd394536ad3badcaba7 files/digest-ssh-3.2.5 62
 MD5 1a0c708380931effd610c9567fac4303 files/digest-ssh-3.2.9.1 64
+MD5 1a0c708380931effd610c9567fac4303 files/digest-ssh-3.2.9.1-r1 64
 MD5 5da2716771a56ddd869bed98e9164cc4 files/pamd.sshd2 425
+MD5 161466fa829f8dc1ed1e67f5cd3f20d5 files/patch-readline.diff 1054
 MD5 7a42cfc98810322e8999339df7dcd61b files/sshd2 733
diff --git a/net-misc/ssh/files/digest-ssh-3.2.9.1-r1 b/net-misc/ssh/files/digest-ssh-3.2.9.1-r1
new file mode 100644
index 000000000000..60f249dbd000
--- /dev/null
+++ b/net-misc/ssh/files/digest-ssh-3.2.9.1-r1
@@ -0,0 +1 @@
+MD5 f3ed49f13419d97dc1d0d3bfb4bb99bf ssh-3.2.9.1.tar.gz 2269281
diff --git a/net-misc/ssh/files/patch-readline.diff b/net-misc/ssh/files/patch-readline.diff
new file mode 100644
index 000000000000..d5422baf1d13
--- /dev/null
+++ b/net-misc/ssh/files/patch-readline.diff
@@ -0,0 +1,27 @@
+diff -uNr ssh-3.2.9.1.orig/lib/sshreadline/sshreadline.c ssh-3.2.9.1/lib/sshreadline/sshreadline.c
+--- ssh-3.2.9.1.orig/lib/sshreadline/sshreadline.c	2003-12-03 08:17:20.000000000 -0500
++++ ssh-3.2.9.1/lib/sshreadline/sshreadline.c	2004-02-02 11:18:46.000000000 -0500
+@@ -500,8 +500,9 @@
+   new_term.c_lflag &= ~(ECHO | ICANON);
+   new_term.c_cc[VMIN] = 1;
+   new_term.c_cc[VTIME] = 1;
+-  if (tcsetattr(fd, TCSAFLUSH, &new_term) < 0)
++   fast:  if (tcsetattr(fd, TCSAFLUSH, &new_term) < 0)
+     {
++       if (EINTR == errno) goto fast;
+       ssh_warning("tcsetattr failed in ssh_rl_set_tty_modes_for_fd: "
+                   "fd %d: %.200s", fd, strerror(errno));
+       return -1;
+@@ -561,8 +562,9 @@
+ {
+   fcntl(fd, F_SETFL, fcntl_flags);
+ 
+-  if (tcsetattr(fd, TCSAFLUSH, saved_tio) < 0)
++   fast1:   if (tcsetattr(fd, TCSAFLUSH, saved_tio) < 0)
+     {
++        if (EINTR == errno) goto fast1;
+       ssh_warning("tcsetattr failed in ssh_rl_restore_tty_modes_for_fd: "
+                   "fd %d: %.200s", fd, strerror(errno));
+       return -1;
+
+-- 
diff --git a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
new file mode 100644
index 000000000000..913ac277ce4f
--- /dev/null
+++ b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.1 2005/01/13 23:09:14 humpback Exp $
+
+inherit gnuconfig eutils
+
+DESCRIPTION="SSH.COM free for Non-Commercial Use ssh version"
+HOMEPAGE="http://www.ssh.com/"
+SRC_URI="ftp://ftp.ssh.com/pub/ssh/${P}.tar.gz"
+
+LICENSE="ssh"
+SLOT="0"
+KEYWORDS="x86 ~amd64"
+IUSE="X ipv6 crypt openssh"
+
+DEPEND="X? ( virtual/x11 )
+	!openssh? ( !virtual/ssh )"
+PROVIDE="virtual/ssh"
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}
+	epatch ${FILESDIR}/patch-readline.diff
+}
+
+src_compile() {
+	gnuconfig_update
+
+	econf \
+		`use_with ipv6 ipv6` \
+		`use_with X` \
+		`use_with crypt gpg` \
+		|| die "configure failed"
+	make || die "make failed"
+}
+
+src_install() {
+	if [ -e ${ROOT}/etc/ssh2/hostkey ] ; then
+		# this keeps the install from generating these keys again
+		insinto /etc/ssh2
+		doins ${ROOT}/etc/ssh2/hostkey{,.pub}
+		fperms go-rwx /etc/ssh2/hostkey
+	fi
+	#this is ugly but helps on some problems on fresh installs see bug #57915
+	addwrite /root/.ssh2
+	make install DESTDIR=${D} || die "install failed"
+	chmod 600 ${D}/etc/ssh2/sshd2_config
+	dodoc CHANGES FAQ HOWTO.anonymous.sftp README* SSH2.QUICKSTART
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/pamd.sshd2 sshd2
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/sshd2 sshd2
+
+	cd ${D}/usr
+	use openssh && find bin sbin share/man -type l -exec rm '{}' \;
+}