diff options
| author | taca <taca@pkgsrc.org> | 2011-08-10 15:21:02 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2011-08-10 15:21:02 +0000 |
| commit | 90dc4e07f0da015007c7a4b192ce552744328197 (patch) | |
| tree | 0042e27fe675128fd768037d2faab2136d674bd2 /security | |
| parent | b078f77b5c92bfe827bb6900a93584f63127407c (diff) | |
| download | pkgsrc-90dc4e07f0da015007c7a4b192ce552744328197.tar.gz | |
Add a patch to avoid SSP side effect as NetBSD current.
Bump PKGREVISION.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 4 | ||||
| -rw-r--r-- | security/openssh/patches/patch-atomicio.c | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 3b368b2641f..acfeb6abc30 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.203 2011/08/10 15:21:02 taca Exp $ DISTNAME= openssh-5.8p2 PKGNAME= openssh-5.8.2 -PKGREVISION= 2 +PKGREVISION= 3 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh/patches/patch-atomicio.c b/security/openssh/patches/patch-atomicio.c new file mode 100644 index 00000000000..41465e370f1 --- /dev/null +++ b/security/openssh/patches/patch-atomicio.c @@ -0,0 +1,20 @@ +$NetBSD: patch-atomicio.c,v 1.1 2011/08/10 15:21:02 taca 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) { |