svn commit: r393000 - in head/security/openssh-portable-devel: . files
Bryan Drewery
bdrewery at FreeBSD.org
Mon Jul 27 18:36:17 UTC 2015
Author: bdrewery
Date: Mon Jul 27 18:36:15 2015
New Revision: 393000
URL: https://svnweb.freebsd.org/changeset/ports/393000
Log:
Update to snapshot 20150727
Modified:
head/security/openssh-portable-devel/Makefile
head/security/openssh-portable-devel/distinfo
head/security/openssh-portable-devel/files/extra-patch-hpn
Modified: head/security/openssh-portable-devel/Makefile
==============================================================================
--- head/security/openssh-portable-devel/Makefile Mon Jul 27 18:30:35 2015 (r392999)
+++ head/security/openssh-portable-devel/Makefile Mon Jul 27 18:36:15 2015 (r393000)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= openssh
-DISTVERSION= 20150624
-PORTREVISION= 1
+DISTVERSION= 20150727
+PORTREVISION= 0
CATEGORIES= security ipv6
MASTER_SITES= http://www.mindrot.org/openssh_snap/ \
OPENBSD/OpenSSH/portable
@@ -63,9 +63,9 @@ HPN_CONFIGURE_WITH= hpn
NONECIPHER_CONFIGURE_WITH= nonecipher
# See http://www.roumenpetrov.info/openssh/
-X509_VERSION= 8.3
+X509_VERSION= 8.4
X509_PATCH_SITES= http://www.roumenpetrov.info/openssh/x509-${X509_VERSION}/:x509
-X509_PATCHFILES= ${PORTNAME}-6.8p1+x509-${X509_VERSION}.diff.gz:-p1:x509
+X509_PATCHFILES= ${PORTNAME}-6.9p1+x509-${X509_VERSION}.diff.gz:-p1:x509
# See https://bugzilla.mindrot.org/show_bug.cgi?id=2016
# and https://bugzilla.mindrot.org/show_bug.cgi?id=1604
Modified: head/security/openssh-portable-devel/distinfo
==============================================================================
--- head/security/openssh-portable-devel/distinfo Mon Jul 27 18:30:35 2015 (r392999)
+++ head/security/openssh-portable-devel/distinfo Mon Jul 27 18:36:15 2015 (r393000)
@@ -1,6 +1,6 @@
-SHA256 (openssh-SNAP-20150624.tar.gz) = 4dde67c6bf82562bd56320bf85513475778d91b685b2533834aff81452e977d1
-SIZE (openssh-SNAP-20150624.tar.gz) = 1468022
+SHA256 (openssh-SNAP-20150727.tar.gz) = 56b9494352c2b0dcd81935c02bcca9a0d65399fe3cf894e07cce3fa05cdd3742
+SIZE (openssh-SNAP-20150727.tar.gz) = 1470849
SHA256 (openssh-6.8p1-sctp-2573.patch.gz) = 0348713ad4cb4463e90cf5202ed41c8f726d7d604f3f93922a9aa55b86abf04a
SIZE (openssh-6.8p1-sctp-2573.patch.gz) = 8531
-SHA256 (openssh-6.8p1+x509-8.3.diff.gz) = 34dbefcce8509d3c876be3e7d8966455c7c3589a6872bdfb1f8ce3d133f4d304
-SIZE (openssh-6.8p1+x509-8.3.diff.gz) = 347942
+SHA256 (openssh-6.9p1+x509-8.4.diff.gz) = 0ed8bfff0d2ecd9f3791ae1f168ca3270bb66d7ab7bc0a8ff2d61d2ab829c3fb
+SIZE (openssh-6.9p1+x509-8.4.diff.gz) = 425687
Modified: head/security/openssh-portable-devel/files/extra-patch-hpn
==============================================================================
--- head/security/openssh-portable-devel/files/extra-patch-hpn Mon Jul 27 18:30:35 2015 (r392999)
+++ head/security/openssh-portable-devel/files/extra-patch-hpn Mon Jul 27 18:36:15 2015 (r393000)
@@ -548,9 +548,9 @@ diff -urN -x configure -x config.guess -
/* OLD API */
extern struct ssh *active_state;
#include "opacket.h"
---- work.clean/openssh-6.8p1/readconf.c 2015-04-01 22:07:18.135435000 -0500
-+++ work/openssh-6.8p1/readconf.c 2015-04-03 15:10:44.188916000 -0500
-@@ -154,6 +154,12 @@
+--- work/openssh-6.9p1/readconf.c.orig 2015-07-27 13:32:13.169218000 -0500
++++ work/openssh-6.9p1/readconf.c 2015-07-27 13:33:00.429332000 -0500
+@@ -153,6 +153,12 @@ typedef enum {
oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
oVisualHostKey, oUseRoaming,
oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
@@ -563,10 +563,10 @@ diff -urN -x configure -x config.guess -
oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
-@@ -276,6 +282,16 @@
- { "fingerprinthash", oFingerprintHash },
+@@ -277,6 +283,16 @@ static struct {
{ "updatehostkeys", oUpdateHostkeys },
{ "hostbasedkeytypes", oHostbasedKeyTypes },
+ { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
+#ifdef NONE_CIPHER_ENABLED
+ { "noneenabled", oNoneEnabled },
+ { "noneswitch", oNoneSwitch },
@@ -580,7 +580,7 @@ diff -urN -x configure -x config.guess -
{ "ignoreunknown", oIgnoreUnknown },
{ NULL, oBadOption }
-@@ -917,6 +933,44 @@
+@@ -906,6 +922,44 @@ parse_time:
intptr = &options->check_host_ip;
goto parse_flag;
@@ -625,7 +625,7 @@ diff -urN -x configure -x config.guess -
case oVerifyHostKeyDNS:
intptr = &options->verify_host_key_dns;
multistate_ptr = multistate_yesnoask;
-@@ -1678,6 +1732,16 @@
+@@ -1665,6 +1719,16 @@ initialize_options(Options * options)
options->ip_qos_interactive = -1;
options->ip_qos_bulk = -1;
options->request_tty = -1;
@@ -642,7 +642,7 @@ diff -urN -x configure -x config.guess -
options->proxy_use_fdpass = -1;
options->ignored_unknown = NULL;
options->num_canonical_domains = 0;
-@@ -1838,6 +1902,35 @@
+@@ -1826,6 +1890,35 @@ fill_default_options(Options * options)
options->server_alive_interval = 0;
if (options->server_alive_count_max == -1)
options->server_alive_count_max = 3;
More information about the svn-ports-all
mailing list