diff options
| author | alnsn <alnsn@pkgsrc.org> | 2016-06-10 23:15:36 +0000 |
|---|---|---|
| committer | alnsn <alnsn@pkgsrc.org> | 2016-06-10 23:15:36 +0000 |
| commit | 723aa7254ae3c459dee0d90d3e76e9fa07473b4b (patch) | |
| tree | 66a5cb4253a09053fcaf8f84cd65b612dc84c71b | |
| parent | 5c98e4e2fcd12b2c432a254241a7cdc826ce56e7 (diff) | |
| download | pkgsrc-723aa7254ae3c459dee0d90d3e76e9fa07473b4b.tar.gz | |
Add an option to build without openssl. Fix pkg/50936. Improve PIE build.
| -rw-r--r-- | security/openssh/Makefile | 14 | ||||
| -rw-r--r-- | security/openssh/options.mk | 12 |
2 files changed, 20 insertions, 6 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index a624dd836a5..7ab978169d0 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.244 2016/06/06 08:55:35 taca Exp $ +# $NetBSD: Makefile,v 1.245 2016/06/10 23:15:36 alnsn Exp $ DISTNAME= openssh-7.2p2 PKGNAME= ${DISTNAME:S/p2/.2/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_OPENBSD:=OpenSSH/portable/} @@ -72,7 +72,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mantype=man CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q} -CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers} .if ${OPSYS} != "Interix" @@ -84,6 +83,10 @@ CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER:Q} # so skip this bogus version check. CONFIGURE_ARGS+= --without-zlib-version-check +.if ${_PKGSRC_MKPIE} != "no" +CONFIGURE_ARGS+= --with-pie +.endif + # the openssh configure script finds and uses ${LD} if defined and # defaults to ${CC} if not. we override LD here, since running the # linker directly results in undefined symbols for obvious reasons. @@ -108,6 +111,10 @@ CONFIGURE_ARGS+= --disable-libutil # prior version don't have it. So, disable use of strnvis(3) now. # CONFIGURE_ENV+= ac_cv_func_strnvis=no +# +# workaround for ./configure problem, pkg/50936 +# +CONFIGURE_ENV+= ac_cv_func_reallocarray=no .endif .if (${OPSYS} == "SunOS") && (${OS_VERSION} == "5.8" || ${OS_VERSION} == "5.9") @@ -175,7 +182,6 @@ SUBST_SED.patch= -e '/channel_input_port_forward_request/s/0/ROOTUID/' SUBST_VARS.patch= PKG_SYSCONFDIR .include "../../devel/zlib/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" # diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 1c4f9bc5c66..7326be91568 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,12 +1,20 @@ -# $NetBSD: options.mk,v 1.31 2015/08/22 05:17:22 taca Exp $ +# $NetBSD: options.mk,v 1.32 2016/06/10 23:15:36 alnsn Exp $ .include "../../mk/bsd.prefs.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.openssh -PKG_SUPPORTED_OPTIONS= kerberos hpn-patch pam +PKG_SUPPORTED_OPTIONS= hpn-patch kerberos openssl pam +PKG_SUGGESTED_OPTIONS= openssl .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mopenssl) +.include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} +.else +CONFIGURE_ARGS+= --without-openssl +.endif + .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} |