[129476] trunk/dports/net/openssh
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 13 14:20:11 PST 2014
Revision: 129476
https://trac.macports.org/changeset/129476
Author: ryandesign at macports.org
Date: 2014-12-13 14:20:11 -0800 (Sat, 13 Dec 2014)
Log Message:
-----------
openssh: update to 6.7p1 (#45323)
Modified Paths:
--------------
trunk/dports/net/openssh/Portfile
Removed Paths:
-------------
trunk/dports/net/openssh/files/patch-bug_curve25519pad.diff
Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile 2014-12-13 22:12:42 UTC (rev 129475)
+++ trunk/dports/net/openssh/Portfile 2014-12-13 22:20:11 UTC (rev 129476)
@@ -4,8 +4,7 @@
PortSystem 1.0
name openssh
-version 6.6p1
-revision 4
+version 6.7p1
categories net
platforms darwin
maintainers nomaintainer
@@ -28,8 +27,8 @@
homepage http://www.openbsd.org/openssh/
checksums ${distfiles} \
- rmd160 e19ed34e240001898b6665bb4356b868bba5513d \
- sha256 48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb
+ rmd160 53f684254278e43c3049bd2a260c32f178d46728 \
+ sha256 b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507
master_sites openbsd:OpenSSH/portable \
http://mirror.mcs.anl.gov/openssh/portable/ \
@@ -48,8 +47,7 @@
patchfiles launchd.patch \
pam.patch \
patch-sandbox-darwin.c-apple-sandbox-named-external.diff \
- patch-sshd.c-apple-sandbox-named-external.diff \
- patch-bug_curve25519pad.diff
+ patch-sshd.c-apple-sandbox-named-external.diff
# We need a couple of patches
# - pam.patch
Deleted: trunk/dports/net/openssh/files/patch-bug_curve25519pad.diff
===================================================================
--- trunk/dports/net/openssh/files/patch-bug_curve25519pad.diff 2014-12-13 22:12:42 UTC (rev 129475)
+++ trunk/dports/net/openssh/files/patch-bug_curve25519pad.diff 2014-12-13 22:20:11 UTC (rev 129476)
@@ -1,108 +0,0 @@
---- a/version.h 27 Feb 2014 23:01:54 -0000 1.82
-+++ b/version.h 20 Apr 2014 03:35:15 -0000
-@@ -1,6 +1,6 @@
- /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */
-
--#define SSH_VERSION "OpenSSH_6.6"
-+#define SSH_VERSION "OpenSSH_6.6.1"
-
- #define SSH_PORTABLE "p1"
- #define SSH_RELEASE SSH_VERSION SSH_PORTABLE
---- a/compat.c 31 Dec 2013 01:25:41 -0000 1.82
-+++ b/compat.c 20 Apr 2014 03:33:59 -0000 1.85
-@@ -95,6 +95,9 @@ compat_datafellows(const char *version)
- { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
- { "OpenSSH_4*", 0 },
- { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT},
-+ { "OpenSSH_6.6.1*", SSH_NEW_OPENSSH},
-+ { "OpenSSH_6.5*,"
-+ "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD},
- { "OpenSSH*", SSH_NEW_OPENSSH },
- { "*MindTerm*", 0 },
- { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
-@@ -251,7 +254,6 @@ compat_cipher_proposal(char *cipher_prop
- return cipher_prop;
- }
-
--
- char *
- compat_pkalg_proposal(char *pkalg_prop)
- {
-@@ -263,5 +265,18 @@ compat_pkalg_proposal(char *pkalg_prop)
- if (*pkalg_prop == '\0')
- fatal("No supported PK algorithms found");
- return pkalg_prop;
-+}
-+
-+char *
-+compat_kex_proposal(char *kex_prop)
-+{
-+ if (!(datafellows & SSH_BUG_CURVE25519PAD))
-+ return kex_prop;
-+ debug2("%s: original KEX proposal: %s", __func__, kex_prop);
-+ kex_prop = filter_proposal(kex_prop, "curve25519-sha256 at libssh.org");
-+ debug2("%s: compat KEX proposal: %s", __func__, kex_prop);
-+ if (*kex_prop == '\0')
-+ fatal("No supported key exchange algorithms found");
-+ return kex_prop;
- }
-
---- a/compat.h 31 Dec 2013 01:25:41 -0000 1.42
-+++ b/compat.h 20 Apr 2014 03:25:31 -0000 1.43
-@@ -59,6 +59,7 @@
- #define SSH_BUG_RFWD_ADDR 0x02000000
- #define SSH_NEW_OPENSSH 0x04000000
- #define SSH_BUG_DYNAMIC_RPORT 0x08000000
-+#define SSH_BUG_CURVE25519PAD 0x10000000
-
- void enable_compat13(void);
- void enable_compat20(void);
-@@ -66,6 +67,7 @@ void compat_datafellows(const char *
- int proto_spec(const char *);
- char *compat_cipher_proposal(char *);
- char *compat_pkalg_proposal(char *);
-+char *compat_kex_proposal(char *);
-
- extern int compat13;
- extern int compat20;
---- a/sshd.c 26 Feb 2014 23:20:08 -0000 1.448
-+++ b/sshd.c 20 Apr 2014 03:28:41 -0000 1.453
-@@ -2462,6 +2438,9 @@ do_ssh2_kex(void)
- if (options.kex_algorithms != NULL)
- myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
-
-+ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
-+ myproposal[PROPOSAL_KEX_ALGS]);
-+
- if (options.rekey_limit || options.rekey_interval)
- packet_set_rekey_limits((u_int32_t)options.rekey_limit,
- (time_t)options.rekey_interval);
---- a/sshconnect2.c 4 Feb 2014 00:20:16 -0000 1.197
-+++ b/sshconnect2.c 20 Apr 2014 03:25:31 -0000 1.199
-@@ -195,6 +196,8 @@ ssh_kex2(char *host, struct sockaddr *ho
- }
- if (options.kex_algorithms != NULL)
- myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
-+ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
-+ myproposal[PROPOSAL_KEX_ALGS]);
-
- if (options.rekey_limit || options.rekey_interval)
- packet_set_rekey_limits((u_int32_t)options.rekey_limit,
---- a/bufaux.c 4 Feb 2014 00:20:15 -0000 1.62
-+++ b/bufaux.c 20 Apr 2014 03:24:50 -0000 1.63
-@@ -1,4 +1,4 @@
--/* $OpenBSD: bufaux.c,v 1.56 2014/02/02 03:44:31 djm Exp $ */
-+/* $OpenBSD: bufaux.c,v 1.57 2014/04/16 23:22:45 djm Exp $ */
- /*
- * Author: Tatu Ylonen <ylo at cs.hut.fi>
- * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
-@@ -372,6 +372,9 @@ buffer_put_bignum2_from_string(Buffer *b
-
- if (l > 8 * 1024)
- fatal("%s: length %u too long", __func__, l);
-+ /* Skip leading zero bytes */
-+ for (; l > 0 && *s == 0; l--, s++)
-+ ;
- p = buf = xmalloc(l + 1);
- /*
- * If most significant bit is set then prepend a zero byte to
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141213/37e447f9/attachment.html>
More information about the macports-changes
mailing list