cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12542 from neheb/opens

Browse Source 
openssh: always enable stackprotect option
This commit is contained in:
Rosen Penev
2020-06-23 15:03:23 -07:00
committed by GitHub
parent 65cba88cdf 69c297971c
commit e9abcd7482
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/openssh/Makefile
+4 -12
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=8.2p1 PKG_VERSION:=8.2p1
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -166,7 +166,9 @@ CONFIGURE_ARGS+= \
--disable-wtmpx \ --disable-wtmpx \
--without-bsd-auth \ --without-bsd-auth \
--without-kerberos5 \ --without-kerberos5 \
--without-x --without-x \
--with-stackprotect \
--with$(if $(CONFIG_OPENSSL_ENGINE),,out)-ssl-engine
ifeq ($(BUILD_VARIANT),with-pam) ifeq ($(BUILD_VARIANT),with-pam)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
@@ -176,16 +178,6 @@ CONFIGURE_ARGS += \
--without-pam --without-pam
endif 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)" CONFIGURE_VARS += LD="$(TARGET_CC)"
ifeq ($(BUILD_VARIANT),with-pam) ifeq ($(BUILD_VARIANT),with-pam)