View | Details | Raw Unified | Return to bug 272065
Collapse All | Expand All

(-)b/security/openssh-portable/Makefile (-1 / +7 lines)
Lines 41-47 gssapi_PKGNAMESUFFIX= -portable-gssapi Link Here
41
41
42
OPTIONS_DEFINE=		DOCS PAM TCP_WRAPPERS LIBEDIT BSM \
42
OPTIONS_DEFINE=		DOCS PAM TCP_WRAPPERS LIBEDIT BSM \
43
			HPN KERB_GSSAPI \
43
			HPN KERB_GSSAPI \
44
			LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD
44
			LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD BADUSER
45
OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS LDNS FIDO_U2F
45
OPTIONS_DEFAULT=	LIBEDIT PAM TCP_WRAPPERS LDNS FIDO_U2F
46
.if ${FLAVOR:U} == hpn
46
.if ${FLAVOR:U} == hpn
47
OPTIONS_DEFAULT+=	HPN NONECIPHER
47
OPTIONS_DEFAULT+=	HPN NONECIPHER
Lines 63-68 NONECIPHER_DESC= NONE Cipher support Link Here
63
XMSS_DESC=		XMSS key support (experimental)
63
XMSS_DESC=		XMSS key support (experimental)
64
FIDO_U2F_DESC=		FIDO/U2F support (security/libfido2)
64
FIDO_U2F_DESC=		FIDO/U2F support (security/libfido2)
65
BLACKLISTD_DESC=	FreeBSD blacklistd(8) support
65
BLACKLISTD_DESC=	FreeBSD blacklistd(8) support
66
BADUSER_DESC=		Treat "Invalid user" as blacklistd AUTH_FAIL
66
67
67
OPTIONS_SUB=		yes
68
OPTIONS_SUB=		yes
68
69
Lines 92-97 FIDO_U2F_CONFIGURE_ON= --with-security-key-builtin Link Here
92
FIDO_U2F_CONFIGURE_OFF=	--disable-security-key
93
FIDO_U2F_CONFIGURE_OFF=	--disable-security-key
93
94
94
BLACKLISTD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-blacklistd
95
BLACKLISTD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-blacklistd
96
BADUSER_IMPLIES=	BLACKLISTD
95
97
96
ETCDIR?=		${PREFIX}/etc/ssh
98
ETCDIR?=		${PREFIX}/etc/ssh
97
99
Lines 210-215 post-patch: Link Here
210
	@${ECHO_CMD} '#define SSH_VERSION_FREEBSD_PORT	"${VERSION_ADDENDUM_DEFAULT}"' >> \
212
	@${ECHO_CMD} '#define SSH_VERSION_FREEBSD_PORT	"${VERSION_ADDENDUM_DEFAULT}"' >> \
211
		${WRKSRC}/version.h
213
		${WRKSRC}/version.h
212
214
215
post-patch-BADUSER-on:
216
	@${REINPLACE_CMD} \
217
		-e 's|BLACKLIST_BAD_USER|BLACKLIST_AUTH_FAIL|'  ${WRKSRC}/auth.c
218
213
post-configure-XMSS-on:
219
post-configure-XMSS-on:
214
	@${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h
220
	@${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h
215
221

Return to bug 272065