Date: Wed, 17 Dec 2014 02:34:44 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374833 - in head/security/openssh-portable: . files Message-ID: <201412170234.sBH2YiZb070655@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Dec 17 02:34:43 2014 New Revision: 374833 URL: https://svnweb.freebsd.org/changeset/ports/374833 QAT: https://qat.redports.org/buildarchive/r374833/ Log: - Fix HPN patches for 6.7p1 - Add back HPN and NONECIPHER for the default options and bump PORTREVISION due to this. Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/distinfo head/security/openssh-portable/files/extra-patch-hpn-build-options Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Wed Dec 17 01:22:46 2014 (r374832) +++ head/security/openssh-portable/Makefile Wed Dec 17 02:34:43 2014 (r374833) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.7p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -36,13 +36,13 @@ MAKE_ENV+= SUDO="${SUDO}" OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \ HPN X509 KERB_GSSAPI \ OVERWRITE_BASE SCTP AES_THREADED LDNS NONECIPHER -OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS LDNS +OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS HPN LDNS NONECIPHER OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE TCP_WRAPPERS_DESC= tcp_wrappers support BSM_DESC= OpenBSM Auditing KERB_GSSAPI_DESC= Kerberos/GSSAPI patch (req: GSSAPI) -HPN_DESC= HPN-SSH patch [BROKEN] +HPN_DESC= HPN-SSH patch LDNS_DESC= SSHFP/LDNS support X509_DESC= x509 certificate patch SCTP_DESC= SCTP support @@ -50,8 +50,8 @@ OVERWRITE_BASE_DESC= OpenSSH overwrite b HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) HEIMDAL_BASE_DESC= Heimdal Kerberos (base) MIT_DESC= MIT Kerberos (security/krb5) -AES_THREADED_DESC= Threaded AES-CTR [BROKEN] -NONECIPHER_DESC= NONE Cipher support [BROKEN] +AES_THREADED_DESC= Threaded AES-CTR +NONECIPHER_DESC= NONE Cipher support OPTIONS_SUB= yes PLIST_SUB+= MANPREFIX=${MANPREFIX} @@ -106,10 +106,10 @@ EXTRA_PATCHES:= ${EXTRA_PATCHES:N${TCP_ # http://www.psc.edu/index.php/hpn-ssh .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} PORTDOCS+= HPN-README -HPN_VERSION= 14v2 -HPN_DISTVERSION= 6.6.1p1 -PATCH_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:hpn/} -PATCH_SITE_SUBDIR+= hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn +HPN_VERSION= 14v5 +HPN_DISTVERSION= 6.7p1 +#PATCH_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:hpn/} +#PATCH_SITE_SUBDIR+= hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn PATCHFILES+= ${PORTNAME}-${HPN_DISTVERSION}-hpnssh${HPN_VERSION}.diff.gz:-p1:hpn EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-build-options # Remove HPN if only AES requested @@ -129,10 +129,6 @@ CONFIGURE_ARGS+= --disable-utmp --disabl EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sshd-utmp-size .endif -.if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} -BROKEN= HPN does not apply yet. Use security/openssh-portable66 -.endif - .if ${PORT_OPTIONS:MX509} . if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} BROKEN= X509 patch and HPN patch do not apply cleanly together Modified: head/security/openssh-portable/distinfo ============================================================================== --- head/security/openssh-portable/distinfo Wed Dec 17 01:22:46 2014 (r374832) +++ head/security/openssh-portable/distinfo Wed Dec 17 02:34:43 2014 (r374833) @@ -1,7 +1,7 @@ SHA256 (openssh-6.7p1.tar.gz) = b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507 SIZE (openssh-6.7p1.tar.gz) = 1351367 -SHA256 (openssh-6.6.1p1-hpnssh14v2.diff.gz) = b7f5bd22f1c0bacd41fc4884aeb19bba460d548af875eeb6c857cb77bab53376 -SIZE (openssh-6.6.1p1-hpnssh14v2.diff.gz) = 24473 +SHA256 (openssh-6.7p1-hpnssh14v5.diff.gz) = 846ad51577de8308d60dbfaa58ba18d112d0732fdf21063ebc78407fc8e4a7b6 +SIZE (openssh-6.7p1-hpnssh14v5.diff.gz) = 24326 SHA256 (openssh-6.7p1+x509-8.2.diff.gz) = 85acfcd560b40d4533b82a4e3f443b7137b377868bab424dacdf00581c83240f SIZE (openssh-6.7p1+x509-8.2.diff.gz) = 241798 SHA256 (openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz) = 9a361408269a542d28dae77320f30e94a44098acdbbbc552efb0bdeac6270dc8 Modified: head/security/openssh-portable/files/extra-patch-hpn-build-options ============================================================================== --- head/security/openssh-portable/files/extra-patch-hpn-build-options Wed Dec 17 01:22:46 2014 (r374832) +++ head/security/openssh-portable/files/extra-patch-hpn-build-options Wed Dec 17 02:34:43 2014 (r374833) @@ -37,9 +37,9 @@ --- readconf.c.orig 2013-10-11 09:24:10.812126846 -0500 +++ readconf.c 2013-10-11 09:19:12.295135966 -0500 @@ -268,12 +268,16 @@ static struct { - { "canonicalizehostname", oCanonicalizeHostname }, - { "canonicalizemaxdots", oCanonicalizeMaxDots }, { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs }, + { "streamlocalbindmask", oStreamLocalBindMask }, + { "streamlocalbindunlink", oStreamLocalBindUnlink }, +#ifdef NONECIPHER { "noneenabled", oNoneEnabled }, { "noneswitch", oNoneSwitch }, @@ -53,7 +53,7 @@ { "ignoreunknown", oIgnoreUnknown }, { NULL, oBadOption } -@@ -1739,12 +1743,20 @@ fill_default_options(Options * options) +@@ -1819,12 +1823,20 @@ fill_default_options(Options * options) options->server_alive_interval = 0; if (options->server_alive_count_max == -1) options->server_alive_count_max = 3;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412170234.sBH2YiZb070655>