diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-06-17 15:43:51 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-06-20 00:17:37 -0700 |
| commit | 69c297971ceb86d5616f1d88a86bda6cd42d2782 (patch) | |
| tree | 716bf40487646d85143d1039f01fde5764f509cd /net | |
| parent | 34f7b0092fa249e5626f2e47b0ef40559827d7a0 (diff) | |
openssh: always enable stackprotect option
b933f9cf0cb254e368027cad6d5799e45b237df5 in base made several changes
to OpenWrt's libssp support. It seems this workaround is no longer
needed.
Simplified the configure script slightly.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openssh/Makefile | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 2e9302d00..36f47e72a 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=8.2p1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ @@ -149,7 +149,7 @@ define Package/openssh-sftp-avahi-service/conffiles /etc/avahi/services/sftp-ssh.service endef -CONFIGURE_ARGS+= \ +CONFIGURE_ARGS += \ $(DISABLE_NLS) \ --sysconfdir=/etc/ssh \ --with-privsep-user=sshd \ @@ -166,7 +166,9 @@ CONFIGURE_ARGS+= \ --disable-wtmpx \ --without-bsd-auth \ --without-kerberos5 \ - --without-x + --without-x \ + --with-stackprotect \ + --with$(if $(CONFIG_OPENSSL_ENGINE),,out)-ssl-engine ifeq ($(BUILD_VARIANT),with-pam) CONFIGURE_ARGS += \ @@ -176,16 +178,6 @@ CONFIGURE_ARGS += \ --without-pam endif -ifeq ($(CONFIG_OPENSSL_ENGINE),y) -CONFIGURE_ARGS+= \ - --with-ssl-engine -endif - -ifneq ($(CONFIG_SSP_SUPPORT),y) -CONFIGURE_ARGS += \ - --without-stackprotect -endif - CONFIGURE_VARS += LD="$(TARGET_CC)" ifeq ($(BUILD_VARIANT),with-pam) |