Closing #63544.

7 files changed, 18 insertions, 12 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 053b99dee77d..12d4da6ac0de 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.110 2004/12/30 18:23:40 kloeri Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.111 2005/01/07 21:37:33 aliz Exp $
+
+  07 Jan 2005; Daniel Ahlberg <aliz@gentoo.org>
+  +files/openssh-3.9_p1-terminal_restore.patch.bz2,
+  openssh-3.9_p1-r1.ebuild:
+  Fix terminal restoration after breaking out from sftp and scp, closing #63544.
 
   30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   openssh-3.9_p1-r1.ebuild:
diff --git a/net-misc/openssh/files/openssh-3.9_p1-terminal_restore.patch.bz2 b/net-misc/openssh/files/openssh-3.9_p1-terminal_restore.patch.bz2
new file mode 100644
index 000000000000..c847c98b3b7f
--- /dev/null
+++ b/net-misc/openssh/files/openssh-3.9_p1-terminal_restore.patch.bz2
diff --git a/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild b/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild
index a4b77bdce5da..eb802cf3fe0d 100644
--- a/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild
+++ b/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild,v 1.18 2004/11/04 02:49:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild,v 1.19 2005/01/07 21:37:33 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
diff --git a/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild b/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild
index ef23a94ae9b5..31942f1942e0 100644
--- a/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild,v 1.15 2004/12/29 01:17:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r1.ebuild,v 1.16 2005/01/07 21:37:33 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
diff --git a/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild b/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild
index ded337136baa..159a085b8c6e 100644
--- a/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild,v 1.4 2004/11/04 02:49:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1-r2.ebuild,v 1.5 2005/01/07 21:37:33 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
diff --git a/net-misc/openssh/openssh-3.9_p1-r1.ebuild b/net-misc/openssh/openssh-3.9_p1-r1.ebuild
index f61689061aac..f85e9e7e52cf 100644
--- a/net-misc/openssh/openssh-3.9_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-3.9_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r1.ebuild,v 1.8 2005/01/01 19:56:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r1.ebuild,v 1.9 2005/01/07 21:37:33 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
@@ -48,6 +48,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-largekey.patch.bz2
 	epatch ${FILESDIR}/${P}-fix_suid.patch.bz2
 	epatch ${FILESDIR}/${P}-infoleak.patch #59361
+	epatch ${FILESDIR}/${P}-terminal_restore.patch.bz2
 
 	use sftplogging && epatch ${FILESDIR}/${P}-sftplogging-1.2-gentoo.patch.bz2
 	use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch.bz2
diff --git a/net-misc/openssh/openssh-3.9_p1.ebuild b/net-misc/openssh/openssh-3.9_p1.ebuild
index 6916018216dc..d8291f1ffcee 100644
--- a/net-misc/openssh/openssh-3.9_p1.ebuild
+++ b/net-misc/openssh/openssh-3.9_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.9 2004/12/29 01:49:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.10 2005/01/07 21:37:33 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig