View | Details | Raw Unified | Return to bug 193127 | Differences between
and this patch

Collapse All | Expand All

(-)security/openssh-portable/Makefile (-3 / +6 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	openssh
4
PORTNAME=	openssh
5
DISTVERSION=	6.6p1
5
DISTVERSION=	6.6p1
6
PORTREVISION=	3
6
PORTREVISION=	4
7
PORTEPOCH=	1
7
PORTEPOCH=	1
8
CATEGORIES=	security ipv6
8
CATEGORIES=	security ipv6
9
MASTER_SITES=	${MASTER_SITE_OPENBSD}
9
MASTER_SITES=	${MASTER_SITE_OPENBSD}
Lines 37-44 Link Here
37
37
38
OPTIONS_DEFINE=		PAM TCP_WRAPPERS LIBEDIT BSM \
38
OPTIONS_DEFINE=		PAM TCP_WRAPPERS LIBEDIT BSM \
39
			HPN LPK X509 KERB_GSSAPI \
39
			HPN LPK X509 KERB_GSSAPI \
40
			OVERWRITE_BASE SCTP AES_THREADED LDNS NONECIPHER
40
			OVERWRITE_BASE SCTP AES_THREADED LDNS NONECIPHER SSH_VERSIONMOD
41
OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS HPN LDNS NONECIPHER
41
OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS HPN LDNS NONECIPHER SSH_VERSIONMOD
42
OPTIONS_RADIO=		KERBEROS
42
OPTIONS_RADIO=		KERBEROS
43
OPTIONS_RADIO_KERBEROS=	MIT HEIMDAL HEIMDAL_BASE
43
OPTIONS_RADIO_KERBEROS=	MIT HEIMDAL HEIMDAL_BASE
44
TCP_WRAPPERS_DESC=	tcp_wrappers support
44
TCP_WRAPPERS_DESC=	tcp_wrappers support
Lines 55-60 Link Here
55
MIT_DESC=		MIT Kerberos (security/krb5)
55
MIT_DESC=		MIT Kerberos (security/krb5)
56
AES_THREADED_DESC=	Threaded AES-CTR
56
AES_THREADED_DESC=	Threaded AES-CTR
57
NONECIPHER_DESC=	NONE Cipher support
57
NONECIPHER_DESC=	NONE Cipher support
58
SSH_VERSIONMOD_DESC=	Add patch versions to sshd protocol version string
58
59
59
OPTIONS_SUB=		yes
60
OPTIONS_SUB=		yes
60
PLIST_SUB+=		MANPREFIX=${MANPREFIX}
61
PLIST_SUB+=		MANPREFIX=${MANPREFIX}
Lines 239-244 Link Here
239
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|' \
240
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|' \
240
		-e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8
241
		-e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8
241
.endif
242
.endif
243
.if ${PORT_OPTIONS:MSSH_VERSIONMOD}
242
	@${REINPLACE_CMD} -E -e 's|SSH_VERSION|TMP_SSH_VERSION|' \
244
	@${REINPLACE_CMD} -E -e 's|SSH_VERSION|TMP_SSH_VERSION|' \
243
		-e 's|.*SSH_RELEASE.*||' ${WRKSRC}/version.h
245
		-e 's|.*SSH_RELEASE.*||' ${WRKSRC}/version.h
244
	@${ECHO_CMD} '#define FREEBSD_PORT_VERSION	" FreeBSD-${PKGNAME}"' >> \
246
	@${ECHO_CMD} '#define FREEBSD_PORT_VERSION	" FreeBSD-${PKGNAME}"' >> \
Lines 247-252 Link Here
247
		${WRKSRC}/version.h
249
		${WRKSRC}/version.h
248
	@${ECHO_CMD} '#define SSH_RELEASE	TMP_SSH_VERSION SSH_PORTABLE FREEBSD_PORT_VERSION' >> \
250
	@${ECHO_CMD} '#define SSH_RELEASE	TMP_SSH_VERSION SSH_PORTABLE FREEBSD_PORT_VERSION' >> \
249
		${WRKSRC}/version.h
251
		${WRKSRC}/version.h
252
.endif
250
.if ${PORT_OPTIONS:MHPN}
253
.if ${PORT_OPTIONS:MHPN}
251
	@${REINPLACE_CMD} -e 's|TMP_SSH_VERSION SSH_PORTABLE|TMP_SSH_VERSION SSH_PORTABLE SSH_HPN|' \
254
	@${REINPLACE_CMD} -e 's|TMP_SSH_VERSION SSH_PORTABLE|TMP_SSH_VERSION SSH_PORTABLE SSH_HPN|' \
252
		${WRKSRC}/version.h
255
		${WRKSRC}/version.h

Return to bug 193127