From: Eneas U de Queiroz <redacted>
Date: Thu, 21 Feb 2019 10:47:12 +0000 (-0300)
Subject: openssh: adjust engine support to openssl 1.1.1
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=06e1764afa210fda00c17d2d919601e62ca216f3;p=openwrt-packages.git

openssh: adjust engine support to openssl 1.1.1

Openssl 1.1.1 package in openwrt enabled more than just the devcrypto
engine, so the engine support in openssh should be enabled when general
engine support is enabled in openssl.

Signed-off-by: Eneas U de Queiroz <redacted>
---

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index d71cee690..39b02758f 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
 PKG_VERSION:=7.9p1
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -180,7 +180,7 @@ CONFIGURE_ARGS += \
 	--without-pam
 endif
 
-ifeq ($(CONFIG_OPENSSL_ENGINE_CRYPTO),y)
+ifeq ($(CONFIG_OPENSSL_ENGINE),y)
 CONFIGURE_ARGS+= \
 	--with-ssl-engine
 endif