summaryrefslogtreecommitdiff
path: root/security/ssh
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-11-23 07:42:38 +0000
committertron <tron@pkgsrc.org>2001-11-23 07:42:38 +0000
commitd99e74dbd7b5b658b15ea1c458d9a635f37efc31 (patch)
treecc4ec81e56ca9e9141f3334559151063dc7c2978 /security/ssh
parentd397f64d1a1cc1ed612abe59b6a6e4e910f935ee (diff)
downloadpkgsrc-d99e74dbd7b5b658b15ea1c458d9a635f37efc31.tar.gz
Stop the SSH daemom from truncating output on slow networks and/or
machines. Patch supplied by Michael Eriksson in PR pkg/9119.
Diffstat (limited to 'security/ssh')
-rw-r--r--security/ssh/distinfo4
-rw-r--r--security/ssh/patches/patch-av32
2 files changed, 31 insertions, 5 deletions
diff --git a/security/ssh/distinfo b/security/ssh/distinfo
index 8af42163c63..2dbbb3a1c9e 100644
--- a/security/ssh/distinfo
+++ b/security/ssh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:39 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/11/23 07:42:38 tron Exp $
SHA1 (ssh-1.2.27.tar.gz) = 0e7d59c6a62b094bd51818599ae24f7de3462d14
Size (ssh-1.2.27.tar.gz) = 1022546 bytes
@@ -22,7 +22,7 @@ SHA1 (patch-ar) = 3c72885039fd3763f8e577ad7d9dc2f3558a44ad
SHA1 (patch-as) = 724fad32e30fb896c016e7c5175ecbf277b2a8e6
SHA1 (patch-at) = b2c65fdf1be1f94f2a1bb94e18ae2a70770b343d
SHA1 (patch-au) = 012876003137b3e1199b12dd31f566ba4d026c85
-SHA1 (patch-av) = 87fe313300b2fd799ada92f4065acf0eafe3cbec
+SHA1 (patch-av) = 149c9f538c0de05995246188cc5098ee6ee1f6b0
SHA1 (patch-ax) = 64b8460f961f7c874b8959480591abbc3e1ff3d2
SHA1 (patch-ay) = 6d4a63c65773d505b1cf94260f723a1378e748a2
SHA1 (patch-az) = ecb55a764c06588363834570512935db68813749
diff --git a/security/ssh/patches/patch-av b/security/ssh/patches/patch-av
index cbf735b6e79..3f039cd0f81 100644
--- a/security/ssh/patches/patch-av
+++ b/security/ssh/patches/patch-av
@@ -1,8 +1,34 @@
-$NetBSD: patch-av,v 1.2 1999/05/15 13:46:59 bouyer Exp $
+$NetBSD: patch-av,v 1.3 2001/11/23 07:42:38 tron Exp $
--- serverloop.c.orig Wed May 12 13:19:28 1999
-+++ serverloop.c Sat May 15 04:33:35 1999
-@@ -446,7 +446,7 @@
++++ serverloop.c Fri Nov 23 08:26:58 2001
+@@ -377,10 +377,12 @@
+ if (channel_max_fd() > max_fd)
+ max_fd = channel_max_fd();
+
++#if 0 /* Ohh, this sucks so badly I almost weep... */
+ /* If child has terminated, read as much as is available and then exit. */
+ if (child_terminated)
+ if (max_time_milliseconds == 0)
+ max_time_milliseconds = 100;
++#endif
+
+ if (idle_timeout != 0 &&
+ (max_time_milliseconds == 0 ||
+@@ -421,6 +423,7 @@
+ FD_ZERO(writeset);
+ }
+
++#if 0 /* Ohh, this sucks so badly I almost weep... */
+ /* If the child has terminated and there was no data, shutdown all
+ descriptors to it. */
+ if (ret <= 0 && child_terminated && !child_just_terminated)
+@@ -442,11 +445,12 @@
+ fdin = -1;
+ }
+ else
++#endif
+ {
if (ret == 0) /* Nothing read, timeout expired */
{
/* Check if idle_timeout expired ? */