diff options
| author | tron <tron> | 2011-08-23 07:17:44 +0000 |
|---|---|---|
| committer | tron <tron> | 2011-08-23 07:17:44 +0000 |
| commit | 55fc38c61a8dec6ca7fa0756767b593f73e772f2 (patch) | |
| tree | 48e81c670f473a3cd520bbcaa284ea4e8cc82e6a | |
| parent | 7dc69d6147cfcd0d6a0ab58fd1408609067b3efd (diff) | |
| download | pkgsrc-55fc38c61a8dec6ca7fa0756767b593f73e772f2.tar.gz | |
Pullup ticket #3507 - requested by taca
security/openssh: bug fix patch
Revisions pulled up:
- security/openssh/Makefile 1.203-1.204
- security/openssh/distinfo 1.81
- security/openssh/patches/patch-atomicio.c 1.1
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Aug 10 15:21:02 UTC 2011
Modified Files:
pkgsrc/security/openssh: Makefile
Added Files:
pkgsrc/security/openssh/patches: patch-atomicio.c
Log Message:
Add a patch to avoid SSP side effect as NetBSD current.
Bump PKGREVISION.
---
Module Name: pkgsrc
Committed By: taca
Date: Thu Aug 18 09:22:02 UTC 2011
Modified Files:
pkgsrc/security/openssh: Makefile distinfo
Log Message:
I forgot to update distinfo about latest patch file addition
(patch-atomicio.c). Noted by wiz@ via private mail.
Bump PKGREVISION.
| -rw-r--r-- | security/openssh/Makefile | 4 | ||||
| -rw-r--r-- | security/openssh/distinfo | 3 | ||||
| -rw-r--r-- | security/openssh/patches/patch-atomicio.c | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 3b368b2641f..04d9d9b9a17 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.202 2011/05/17 03:26:52 taca Exp $ +# $NetBSD: Makefile,v 1.202.2.1 2011/08/23 07:17:44 tron Exp $ DISTNAME= openssh-5.8p2 PKGNAME= openssh-5.8.2 -PKGREVISION= 2 +PKGREVISION= 4 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 bf0a59624fa..0544b7423c5 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.80 2011/05/15 04:17:15 taca Exp $ +$NetBSD: distinfo,v 1.80.2.1 2011/08/23 07:17:44 tron Exp $ SHA1 (openssh-5.8p1-hpn13v11.diff.gz) = ea61ab71605ee867eebc1a92875a3ea5369e2d28 RMD160 (openssh-5.8p1-hpn13v11.diff.gz) = 45fbb8e2db2f829f2749cd745ed6a0542adb1c45 @@ -24,6 +24,7 @@ SHA1 (patch-ao) = effe1720917a645452f1a7afd92588709355fb48 SHA1 (patch-ap) = 48c92b26f64c682ed45cae3f8d20ec91815543ea SHA1 (patch-aq) = 1a7d8a4c5e70a0c6211247ba583534ed8ce317d0 SHA1 (patch-ar) = a1099e0175a2b14f3b19db04261891179b1e3299 +SHA1 (patch-atomicio.c) = ff4cfc78c9f37d53e3b3be94d92beaf176adfdfc SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f SHA1 (patch-av) = dd34ac767d08b989775add25c5c015a2f19fce5c SHA1 (patch-aw) = 22d873bfe56464ce8a978082ebce73d441f81e5d diff --git a/security/openssh/patches/patch-atomicio.c b/security/openssh/patches/patch-atomicio.c new file mode 100644 index 00000000000..0931352a393 --- /dev/null +++ b/security/openssh/patches/patch-atomicio.c @@ -0,0 +1,20 @@ +$NetBSD: patch-atomicio.c,v 1.1.2.2 2011/08/23 07:17:45 tron Exp $ + +Avoid SSP side effect: +http://mail-index.netbsd.org/source-changes/2011/08/01/msg025290.html + +--- atomicio.c.orig 2010-09-24 12:15:11.000000000 +0000 ++++ atomicio.c +@@ -57,7 +57,11 @@ atomicio6(ssize_t (*f) (int, void *, siz + struct pollfd pfd; + + pfd.fd = fd; +- pfd.events = f == read ? POLLIN : POLLOUT; ++ /* ++ * check for vwrite instead of read to avoid read being renamed ++ * by SSP issues ++ */ ++ pfd.events = f == vwrite ? POLLOUT : POLLIN; + while (n > pos) { + res = (f) (fd, s + pos, n - pos); + switch (res) { |