Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit e9abcd7482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/openssh/Makefile
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/ \
@ -149,7 +149,7 @@ define Package/openssh-sftp-avahi-service/conffiles
/etc/avahi/services/sftp-ssh.service /etc/avahi/services/sftp-ssh.service
endef endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS += \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
--sysconfdir=/etc/ssh \ --sysconfdir=/etc/ssh \
--with-privsep-user=sshd \ --with-privsep-user=sshd \
@ -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)