[pkgsrc/trunk]: pkgsrc/security/openssh Add an option to build without openss...

[alnsn <alnsn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f72ba91da826
branches:  trunk
changeset: 348246:f72ba91da826
user:      alnsn <alnsn%pkgsrc.org@localhost>
date:      Fri Jun 10 23:15:36 2016 +0000

description:
Add an option to build without openssl. Fix pkg/50936. Improve PIE build.

diffstat:

 security/openssh/Makefile   |  14 ++++++++++----
 security/openssh/options.mk |  12 ++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diffs (78 lines):

diff -r 069459ba3337 -r f72ba91da826 security/openssh/Makefile
--- a/security/openssh/Makefile Fri Jun 10 21:43:16 2016 +0000
+++ b/security/openssh/Makefile Fri Jun 10 23:15:36 2016 +0000
@@ -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 @@
 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 @@
 # 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 @@
 # 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_VARS.patch=      PKG_SYSCONFDIR
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
 #
diff -r 069459ba3337 -r f72ba91da826 security/openssh/options.mk
--- a/security/openssh/options.mk       Fri Jun 10 21:43:16 2016 +0000
+++ b/security/openssh/options.mk       Fri Jun 10 23:15:36 2016 +0000
@@ -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}