diff options
| author | taca <taca@pkgsrc.org> | 2007-07-31 02:29:38 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2007-07-31 02:29:38 +0000 |
| commit | 56cb208f61971ff3c3b994a6dba3ef52404df9df (patch) | |
| tree | 3d5dcdcdd3d2d4d8ef928c3d8d160acc33512879 /security | |
| parent | 18b1147fda1861cdee6c2e59d7d1f4e196a5e8cb (diff) | |
| download | pkgsrc-56cb208f61971ff3c3b994a6dba3ef52404df9df.tar.gz | |
Add a patch from https://bugzilla.mindrot.org/show_bug.cgi?id=1306.
Fix nasty "error: channel 0: chan_read_failed for istate 3" message.
Bump PKGREVISION.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 3 | ||||
| -rw-r--r-- | security/openssh/distinfo | 3 | ||||
| -rw-r--r-- | security/openssh/patches/patch-ba | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index fe81c40cb8c..4ba76e96dec 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.180 2007/07/04 20:54:58 jlam Exp $ +# $NetBSD: Makefile,v 1.181 2007/07/31 02:29:38 taca Exp $ DISTNAME= openssh-4.6p1 PKGNAME= openssh-4.6.1 +PKGREVISION= 1 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 931a0631aa8..495b6d9492b 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.62 2007/03/18 12:38:45 taca Exp $ +$NetBSD: distinfo,v 1.63 2007/07/31 02:29:39 taca Exp $ SHA1 (openssh-4.6p1-hpn12v16.diff.gz) = a10ed53ad92e2e3106da7050c3b0076a2cd1c0ca RMD160 (openssh-4.6p1-hpn12v16.diff.gz) = 421e2c189c2e9b378f6ee3944183355f9f18d5e8 @@ -29,3 +29,4 @@ SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f SHA1 (patch-av) = 00f54c3fae7318b278b16bd0b01881a90bd31365 SHA1 (patch-aw) = 2a88b7563c6f52163c6c5f716e437ecaea613a30 SHA1 (patch-ax) = a6708b956341ff373835a6789541c7547b3b85e5 +SHA1 (patch-ba) = 35a4f544b52403bf9b3f0943d3f975fc8f350173 diff --git a/security/openssh/patches/patch-ba b/security/openssh/patches/patch-ba new file mode 100644 index 00000000000..cec0025355e --- /dev/null +++ b/security/openssh/patches/patch-ba @@ -0,0 +1,25 @@ +$NetBSD: patch-ba,v 1.1 2007/07/31 02:29:39 taca Exp $ + +# https://bugzilla.mindrot.org/show_bug.cgi?id=1306 + +--- channels.c.orig 2007-07-31 09:48:58.000000000 +0900 ++++ channels.c +@@ -1471,14 +1471,13 @@ static int + channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset) + { + char buf[CHAN_RBUF]; +- int len; ++ int len, force; + +- if (c->rfd != -1 && +- (c->detach_close || FD_ISSET(c->rfd, readset))) { ++ force = c->isatty && c->detach_close && c->istate != CHAN_INPUT_CLOSED; ++ if (c->rfd != -1 && (force || FD_ISSET(c->rfd, readset))) { + errno = 0; + len = read(c->rfd, buf, sizeof(buf)); +- if (len < 0 && (errno == EINTR || +- (errno == EAGAIN && !(c->isatty && c->detach_close)))) ++ if (len < 0 && (errno == EINTR || (errno == EAGAIN && !force))) + return 1; + #ifndef PTY_ZEROREAD + if (len <= 0) { |