From ce626ad1503fe48319fd80032ec482b96ef495a9 Mon Sep 17 00:00:00 2001 From: Daniel Ahlberg Date: Fri, 7 Jan 2005 21:37:33 +0000 Subject: [PATCH] Closing #63544. --- net-misc/openssh/ChangeLog | 9 ++- net-misc/openssh/Manifest | 67 ++++++++---------- .../openssh-3.9_p1-terminal_restore.patch.bz2 | Bin 0 -> 332 bytes net-misc/openssh/openssh-3.7.1_p2-r1.ebuild | 4 +- net-misc/openssh/openssh-3.8.1_p1-r1.ebuild | 4 +- net-misc/openssh/openssh-3.8.1_p1-r2.ebuild | 4 +- net-misc/openssh/openssh-3.9_p1-r1.ebuild | 5 +- net-misc/openssh/openssh-3.9_p1.ebuild | 4 +- 8 files changed, 47 insertions(+), 50 deletions(-) create mode 100644 net-misc/openssh/files/openssh-3.9_p1-terminal_restore.patch.bz2 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 + +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 openssh-3.9_p1-r1.ebuild: diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index a5abdacfdf6c..5d981a3cac1f 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,49 +1,40 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d56fc3c7b3445517f153a283dd0b892e ChangeLog 18253 +MD5 dafcd5eddd860edccf40a5d347697a32 openssh-3.9_p1-r1.ebuild 4527 +MD5 4f34b1b754e5edfc6b35aa0f9c030aeb openssh-3.7.1_p2-r1.ebuild 4111 +MD5 d1055a8536e068dc46b4c99f5bc8be04 openssh-3.8.1_p1-r1.ebuild 4239 +MD5 16b491dc2a52314a4cbcada2213654ca openssh-3.9_p1.ebuild 4420 +MD5 0546a736933829d7c8af0f8a6363414d openssh-3.8.1_p1-r2.ebuild 4264 +MD5 ed0abb9305f43cbf9ba9408f1432afd3 ChangeLog 18461 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329 -MD5 aec43e5b3a4401a4acb51363c755a729 openssh-3.7.1_p2-r1.ebuild 4113 -MD5 d114a34ced6d9780915582b33cc733aa openssh-3.9_p1-r1.ebuild 4477 -MD5 6cbb30e34e71177ff3c5058b21308e63 openssh-3.9_p1.ebuild 4421 -MD5 5f87f18a24efe616d1dfcc5e9848946b openssh-3.8.1_p1-r1.ebuild 4241 -MD5 b4353850fbc9705f26093f98055cfc69 openssh-3.8.1_p1-r2.ebuild 4266 -MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142 -MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r1 141 -MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r2 141 +MD5 6905aafd16d110e8e8b74cad4914ceb7 files/openssh-3.8.1_p1-largekey.patch.bz2 1304 MD5 2cce94a742ab0721d87b1ff63c32d0f9 files/digest-openssh-3.9_p1 136 +MD5 265e0566d8f9408f1f89cfa2bf2a5105 files/openssh-3.9_p1-fix_suid.patch.bz2 304 +MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8.1_p1-resolv_functions.patch.bz2 315 +MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8_p1-kerberos.patch.bz2 465 +MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.7.1_p2-chroot.patch.bz2 1119 MD5 2cce94a742ab0721d87b1ff63c32d0f9 files/digest-openssh-3.9_p1-r1 136 +MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8_p1-chroot.patch.bz2 1119 MD5 5b057f6a1a7c2c0f94f83bc19c4d6a9b files/openssh-3.5_p1-gentoo-sshd-gcc3.patch.bz2 253 -MD5 7880e18b2a91e5927810dddc7bda270f files/openssh-3.7.1_p1-selinux.diff.bz2 1353 -MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.7.1_p2-chroot.patch.bz2 1119 -MD5 b96a393752121c75feedaa49c42b2969 files/openssh-3.7.1_p2-kerberos.patch.bz2 490 -MD5 7a205083ec21bedffb0adc331d587291 files/openssh-3.7.1_p2-skey.patch.bz2 272 -MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8.1_p1-chroot.patch.bz2 1119 +MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r1 141 +MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r2 141 MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8.1_p1-kerberos.patch.bz2 465 -MD5 6905aafd16d110e8e8b74cad4914ceb7 files/openssh-3.8.1_p1-largekey.patch.bz2 1304 -MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.8.1_p1-opensc.patch.bz2 1381 -MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8.1_p1-resolv_functions.patch.bz2 315 -MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.8.1_p1-skey.patch.bz2 270 -MD5 6c92c72a7cbec59eed493e728d14ad3c files/openssh-3.8.1p1-sftplogging-1.2-gentoo.patch.bz2 6164 -MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8_p1-chroot.patch.bz2 1119 -MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8_p1-kerberos.patch.bz2 465 -MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8_p1-resolv_functions.patch.bz2 315 +MD5 b96a393752121c75feedaa49c42b2969 files/openssh-3.7.1_p2-kerberos.patch.bz2 490 MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.8_p1-skey.patch.bz2 270 MD5 87593c73e26e1a3825fcb51f2270b694 files/openssh-3.9_p1-chroot.patch 3027 -MD5 265e0566d8f9408f1f89cfa2bf2a5105 files/openssh-3.9_p1-fix_suid.patch.bz2 304 -MD5 ba87dbfc3be0ab9d70fe24278d9deb02 files/openssh-3.9_p1-infoleak.patch 2496 -MD5 f08e067b7000e994a23291e15c9e53f3 files/openssh-3.9_p1-largekey.patch.bz2 1352 -MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.9_p1-opensc.patch.bz2 1381 +MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294 +MD5 0a1428803057b7d25e624c6b297980d8 files/sshd.rc6 1281 +MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.8.1_p1-skey.patch.bz2 270 MD5 93d19c0ef91091a730510c46ab8e811e files/openssh-3.9_p1-selinux.diff.bz2 1307 +MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.9_p1-opensc.patch.bz2 1381 +MD5 7880e18b2a91e5927810dddc7bda270f files/openssh-3.7.1_p1-selinux.diff.bz2 1353 MD5 3a36e663618004d3c7f599fe43b100f3 files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 5964 +MD5 ba87dbfc3be0ab9d70fe24278d9deb02 files/openssh-3.9_p1-infoleak.patch 2496 +MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142 +MD5 6c92c72a7cbec59eed493e728d14ad3c files/openssh-3.8.1p1-sftplogging-1.2-gentoo.patch.bz2 6164 +MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.8.1_p1-opensc.patch.bz2 1381 +MD5 f08e067b7000e994a23291e15c9e53f3 files/openssh-3.9_p1-largekey.patch.bz2 1352 +MD5 6d3c9b201c2e89b7156b2fc37ade9721 files/openssh-3.8.1_p1-chroot.patch.bz2 1119 +MD5 f58807d5d75bc9929883e6876c7ddd46 files/openssh-3.9_p1-terminal_restore.patch.bz2 332 MD5 465aab818202ddb010f0bfca738e902a files/openssh-3.9_p1-skey.patch.bz2 270 +MD5 7a205083ec21bedffb0adc331d587291 files/openssh-3.7.1_p2-skey.patch.bz2 272 +MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8_p1-resolv_functions.patch.bz2 315 MD5 b912e51afc37c43afef30d1f4aaee55a files/openssh-skeychallenge-args.diff.bz2 424 -MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294 -MD5 0a1428803057b7d25e624c6b297980d8 files/sshd.rc6 1281 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFB1wBtroRuSHgZdywRAkVyAJ9edk6CG6wJVIDxwzKa1Sbz+UQ7lgCfRDVW -ZeBJmKAFQ07lEKx5OC01CfE= -=2bob ------END PGP SIGNATURE----- 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 0000000000000000000000000000000000000000..c847c98b3b7fb923e0c7cf7c6f1a63d49d0b157b GIT binary patch literal 332 zcmV-S0ki%>T4*^jL0KkKSq_1BnE(J(-+(|cKyQEfL#G}9ukYQ;FacVb0V;z+G}91h z^qzntA&?Ck0##4YA)-A^0B8UJ$N&PWXquB~Wi(;{6Hh4gAj3w|WLV;CCdo*QL@;oy zHoDh3rEJq^y45YWO?b;=a3M-v@**~+2IG)*{a}&Pua+Sak$glTQMh2Sm6zTVME5hL z7q;U|F$`war;jv6Wt@jQGaH+yE@df^W;#w(YuNF!{6@7M31pbYwZZlW4>gD> zE0U(gBAl`cfXIZ2#Ewf#9R{_Lsf%hkin;3FRYBUvi7&W_3 z+hf$hNlJ*5dHO1$R7=S-3s*dnURGP!8C)CKnwiVeyv@Q?ddpGl_ULF@)yok?P9qD= eBuhaI%a%D?lyWgNI3`UGv3Dd>g$V%Y7kQ9*b&i|> literal 0 HcmV?d00001 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 -- 2.26.2