Attachment 146504 Details for Bug 193127 – Patch to allow bare SSH protocol version string (updated)

[patch] Patch to allow bare SSH protocol version string (updated)

openssh-portable-ssh-version-option-2.patch (text/plain), 1.80 KB, created by Adam McDougall on 2014-08-29 20:20:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam McDougall

Created: 2014-08-29 20:20:23 UTC

Size: 1.80 KB

patch

obsolete

>diff -urN security/openssh-portable.orig/Makefile security/openssh-portable/Makefile
>--- security/openssh-portable.orig/Makefile	2014-07-24 15:16:09.000000000 -0400
>+++ security/openssh-portable/Makefile	2014-08-29 16:09:50.456294342 -0400
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	openssh
> DISTVERSION=	6.6p1
>-PORTREVISION=	3
>+PORTREVISION=	4
> PORTEPOCH=	1
> CATEGORIES=	security ipv6
> MASTER_SITES=	${MASTER_SITE_OPENBSD}
>@@ -37,8 +37,8 @@
> 
> OPTIONS_DEFINE=		PAM TCP_WRAPPERS LIBEDIT BSM \
> 			HPN LPK X509 KERB_GSSAPI \
>-			OVERWRITE_BASE SCTP AES_THREADED LDNS NONECIPHER
>-OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS HPN LDNS NONECIPHER
>+			OVERWRITE_BASE SCTP AES_THREADED LDNS NONECIPHER SSH_VERSIONMOD
>+OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS HPN LDNS NONECIPHER SSH_VERSIONMOD
> OPTIONS_RADIO=		KERBEROS
> OPTIONS_RADIO_KERBEROS=	MIT HEIMDAL HEIMDAL_BASE
> TCP_WRAPPERS_DESC=	tcp_wrappers support
>@@ -55,6 +55,7 @@
> MIT_DESC=		MIT Kerberos (security/krb5)
> AES_THREADED_DESC=	Threaded AES-CTR
> NONECIPHER_DESC=	NONE Cipher support
>+SSH_VERSIONMOD_DESC=	Append sshd protocol version string with port patch versions
> 
> OPTIONS_SUB=		yes
> PLIST_SUB+=		MANPREFIX=${MANPREFIX}
>@@ -239,6 +240,7 @@
> 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|' \
> 		-e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8
> .endif
>+.if ${PORT_OPTIONS:MSSH_VERSIONMOD}
> 	@${REINPLACE_CMD} -E -e 's|SSH_VERSION|TMP_SSH_VERSION|' \
> 		-e 's|.*SSH_RELEASE.*||' ${WRKSRC}/version.h
> 	@${ECHO_CMD} '#define FREEBSD_PORT_VERSION	" FreeBSD-${PKGNAME}"' >> \
>@@ -247,6 +249,7 @@
> 		${WRKSRC}/version.h
> 	@${ECHO_CMD} '#define SSH_RELEASE	TMP_SSH_VERSION SSH_PORTABLE FREEBSD_PORT_VERSION' >> \
> 		${WRKSRC}/version.h
>+.endif
> .if ${PORT_OPTIONS:MHPN}
> 	@${REINPLACE_CMD} -e 's|TMP_SSH_VERSION SSH_PORTABLE|TMP_SSH_VERSION SSH_PORTABLE SSH_HPN|' \
> 		${WRKSRC}/version.h

Actions: View | Diff

Attachments on bug 193127: 146494 | 146504 | 146507 | 146576 | 149338 | 149339 | 149340