diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/openssh/Makefile | 7 | ||||
-rw-r--r-- | security/openssh/distinfo | 16 | ||||
-rw-r--r-- | security/openssh/options.mk | 4 | ||||
-rw-r--r-- | security/openssh/patches/patch-ax | 21 | ||||
-rw-r--r-- | security/openssh/patches/patch-ba | 25 |
5 files changed, 12 insertions, 61 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 4ba76e96dec..48724a8b728 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.181 2007/07/31 02:29:38 taca Exp $ +# $NetBSD: Makefile,v 1.182 2007/09/07 10:41:11 taca Exp $ -DISTNAME= openssh-4.6p1 -PKGNAME= openssh-4.6.1 -PKGREVISION= 1 +DISTNAME= openssh-4.7p1 +PKGNAME= openssh-4.7.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 495b6d9492b..d3101250ef7 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.63 2007/07/31 02:29:39 taca Exp $ +$NetBSD: distinfo,v 1.64 2007/09/07 10:41:11 taca Exp $ -SHA1 (openssh-4.6p1-hpn12v16.diff.gz) = a10ed53ad92e2e3106da7050c3b0076a2cd1c0ca -RMD160 (openssh-4.6p1-hpn12v16.diff.gz) = 421e2c189c2e9b378f6ee3944183355f9f18d5e8 -Size (openssh-4.6p1-hpn12v16.diff.gz) = 15944 bytes -SHA1 (openssh-4.6p1.tar.gz) = b2aefeb1861b4688b1777436035239ec32a47da8 -RMD160 (openssh-4.6p1.tar.gz) = 2959ac56c9175275bf82847ec64b2b169aedcb82 -Size (openssh-4.6p1.tar.gz) = 967395 bytes +SHA1 (openssh-4.7p1-hpn12v18.diff.gz) = 6083da9c1d537a2a3bc7f1fa00a99142407a063e +RMD160 (openssh-4.7p1-hpn12v18.diff.gz) = fec2096269a16e05667f931a073fd13f096742b5 +Size (openssh-4.7p1-hpn12v18.diff.gz) = 16094 bytes +SHA1 (openssh-4.7p1.tar.gz) = 58357db9e64ba6382bef3d73d1d386fcdc0508f4 +RMD160 (openssh-4.7p1.tar.gz) = b828e79d3d1a931cb77651ec7d7276cf3ba22d90 +Size (openssh-4.7p1.tar.gz) = 991119 bytes SHA1 (patch-aa) = 8b7a16e9a63cfff3b73d70b9cebb6627b96396e0 SHA1 (patch-ab) = a105c238c8dc774ed6992791b131da56824869e9 SHA1 (patch-ac) = dfb054ef02fbb5d206f6adaf82944f16da20eaf9 @@ -28,5 +28,3 @@ SHA1 (patch-as) = 19660f5983931ea3b053e6f4289cf6fae2ce50f3 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/options.mk b/security/openssh/options.mk index 24fffa0b576..c3aa485d162 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2007/03/18 12:38:45 taca Exp $ +# $NetBSD: options.mk,v 1.14 2007/09/07 10:41:12 taca Exp $ .include "../../mk/bsd.prefs.mk" @@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} .endif .if !empty(PKG_OPTIONS:Mhpn-patch) -PATCHFILES= openssh-4.6p1-hpn12v16.diff.gz +PATCHFILES= openssh-4.7p1-hpn12v18.diff.gz PATCH_SITES= http://www.psc.edu/networking/projects/hpn-ssh/ PATCH_DIST_STRIP= -p1 .endif diff --git a/security/openssh/patches/patch-ax b/security/openssh/patches/patch-ax deleted file mode 100644 index 0d3cbaafe7a..00000000000 --- a/security/openssh/patches/patch-ax +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ax,v 1.3 2007/03/16 05:46:07 cjs Exp $ - -# http://bugzilla.mindrot.org/show_bug.cgi?id=1299 - ---- openbsd-compat/getrrsetbyname.c.orig 2006-09-02 14:32:40.000000000 +0900 -+++ openbsd-compat/getrrsetbyname.c 2007-03-16 14:07:32.000000000 +0900 -@@ -67,14 +67,6 @@ - #endif - #define _THREAD_PRIVATE(a,b,c) (c) - --/* to avoid conflicts where a platform already has _res */ --#ifdef _res --# undef _res --#endif --#define _res _compat_res -- --struct __res_state _res; -- - /* Necessary functions and macros */ - - /* diff --git a/security/openssh/patches/patch-ba b/security/openssh/patches/patch-ba deleted file mode 100644 index cec0025355e..00000000000 --- a/security/openssh/patches/patch-ba +++ /dev/null @@ -1,25 +0,0 @@ -$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) { |