Re: security/openssh crash and "openssl" option

[Alexander Nasonov <alnsn%yandex.ru@localhost>]

coypu%SDF.ORG@localhost wrote:
> I had it too and filed pr 50936

Ok, it's not only me.

Patch is attached.

Alex

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh/Makefile,v
retrieving revision 1.244
diff -p -u -u -r1.244 Makefile
--- Makefile	6 Jun 2016 08:55:35 -0000	1.244
+++ Makefile	10 Jun 2016 19:39:09 -0000
@@ -2,7 +2,7 @@
 
 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=${O
 # 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
 SUBST_VARS.patch=	PKG_SYSCONFDIR
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
 #
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh/options.mk,v
retrieving revision 1.31
diff -p -u -u -r1.31 options.mk
--- options.mk	22 Aug 2015 05:17:22 -0000	1.31
+++ options.mk	10 Jun 2016 19:39:09 -0000
@@ -3,10 +3,18 @@
 .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}