From: Rosen Penev Date: Mon, 9 Mar 2020 20:53:17 +0000 (-0700) Subject: softethervpn: disable PIC X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dc524aa2aab924149f00e71e70ab0b071af4c697;p=feed%2Fpackages.git softethervpn: disable PIC Compilation is broken on AArch64. Reordered some things for consistency between packages. Fixed license information. Signed-off-by: Rosen Penev (cherry picked from commit b8b4e7e2694bb9b6e678f1b06bbe793c9bde0535) --- diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile index b5f9c4378f..5710e8e0df 100644 --- a/net/softethervpn/Makefile +++ b/net/softethervpn/Makefile @@ -12,21 +12,22 @@ PKG_NAME:=softethervpn PKG_VERSION:=4.29-9680 PKG_VERREL:=rtm PKG_VERDATE:=2019.02.28 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=softether-src-v$(PKG_VERSION)-$(PKG_VERREL).tar.gz PKG_SOURCE_URL:=http://www.softether-download.com/files/softether/v$(PKG_VERSION)-$(PKG_VERREL)-$(PKG_VERDATE)-tree/Source_Code/ PKG_HASH:=e6035fa7d9aaf59bdb342cd7ab5ecfdff89811a875f62a3230208cdc8a4e26e4 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/v$(PKG_VERSION) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)/v$(PKG_VERSION) - -PKG_LICENSE:=GPL-2.0 +PKG_MAINTAINER:=Federico Di Marco +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/v$(PKG_VERSION) +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)/v$(PKG_VERSION) PKG_BUILD_DEPENDS:=softethervpn/host HOST_BUILD_DEPENDS:=readline/host libiconv/host +PKG_ASLR_PIE:=0 HAMCORE_SE2:=$(STAGING_DIR_HOST)/share/softethervpn/hamcore.se2 include $(INCLUDE_DIR)/nls.mk @@ -89,7 +90,6 @@ define Package/softethervpn/default SUBMENU:=VPN TITLE:=Free Cross-platform Multi-protocol VPN server and client URL:=http://www.softether.org/ - MAINTAINER:=Federico Di Marco endef define Package/softethervpn/description