Date: Tue, 16 Dec 2014 20:14:05 +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: r374821 - head/security/openssh-portable Message-ID: <201412162014.sBGKE5kw084356@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Dec 16 20:14:04 2014 New Revision: 374821 URL: https://svnweb.freebsd.org/changeset/ports/374821 QAT: https://qat.redports.org/buildarchive/r374821/ Log: - Update X509 patch to 8.2 which now supports OpenSSH 6.7p1 No PORTREVISION bump since it was BROKEN before with X509. Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/distinfo Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Tue Dec 16 20:12:13 2014 (r374820) +++ head/security/openssh-portable/Makefile Tue Dec 16 20:14:04 2014 (r374821) @@ -71,9 +71,9 @@ NONECIPHER_CONFIGURE_WITH= nonecipher AES_THREADED_CONFIGURE_WITH= aes-threaded # See http://www.roumenpetrov.info/openssh/ -X509_VERSION= 7.9 +X509_VERSION= 8.2 X509_PATCH_SITES= http://www.roumenpetrov.info/openssh/x509-${X509_VERSION}/:x509 -X509_PATCHFILES= ${PORTNAME}-6.6p1+x509-${X509_VERSION}.diff.gz:-p1:x509 +X509_PATCHFILES= ${PORTNAME}-6.7p1+x509-${X509_VERSION}.diff.gz:-p1:x509 # See https://bugzilla.mindrot.org/show_bug.cgi?id=2016 SCTP_PATCHFILES= ${PORTNAME}-6.7p1-sctp-2496.patch.gz:-p1 @@ -97,6 +97,11 @@ BSM_CONFIGURE_ON= --with-audit=bsm PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex +# X509 patch includes TCP Wrapper support already +.if ${PORT_OPTIONS:MX509} +EXTRA_PATCHES:= ${EXTRA_PATCHES:N${TCP_WRAPPERS_EXTRA_PATCHES}} +.endif + # http://www.psc.edu/index.php/hpn-ssh .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} PORTDOCS+= HPN-README @@ -123,9 +128,6 @@ CONFIGURE_ARGS+= --disable-utmp --disabl EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sshd-utmp-size .endif -.if ${PORT_OPTIONS:MX509} -BROKEN= X509 does not apply yet. Use security/openssh-portable66 -.endif .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} BROKEN= HPN does not apply yet. Use security/openssh-portable66 .endif Modified: head/security/openssh-portable/distinfo ============================================================================== --- head/security/openssh-portable/distinfo Tue Dec 16 20:12:13 2014 (r374820) +++ head/security/openssh-portable/distinfo Tue Dec 16 20:14:04 2014 (r374821) @@ -2,8 +2,8 @@ SHA256 (openssh-6.7p1.tar.gz) = b2f8394e 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.6p1+x509-7.9.diff.gz) = 463473f75c1dc250ea4eda21f2c79df6f0b479ea499d044cb51d73073881ca34 -SIZE (openssh-6.6p1+x509-7.9.diff.gz) = 224691 +SHA256 (openssh-6.7p1+x509-8.2.diff.gz) = 85acfcd560b40d4533b82a4e3f443b7137b377868bab424dacdf00581c83240f +SIZE (openssh-6.7p1+x509-8.2.diff.gz) = 241798 SHA256 (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 9436c03ba46cdda8753f8957816a9832fd04e1244992ba8e729968c93682a236 SIZE (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 24299 SHA256 (openssh-lpk-6.3p1.patch.gz) = d2a8b7da7acebac2afc4d0a3dffe8fca2e49900cf733af2e7012f2449b3668e1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412162014.sBGKE5kw084356>