From: Moritz Warning <moritzwarning@web.de>
Date: Wed, 13 Apr 2022 19:19:38 +0000 (+0200)
Subject: zerotier: fix segfault on ARM platforms
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b935346910eb7a295b70d73ff001eb8204c4bec3;p=feed%2Fpackages.git

zerotier: fix segfault on ARM platforms

Signed-off-by: Moritz Warning <moritzwarning@web.de>
(cherry picked from commit b45d39c1423444672abf8ea4ce3b53f75a1b2741)
---

diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile
index f7ffd766eb..a5cfa5fae3 100644
--- a/net/zerotier/Makefile
+++ b/net/zerotier/Makefile
@@ -56,7 +56,7 @@ endif
 endef
 
 # Make binary smaller
-TARGET_CFLAGS += -ffunction-sections -fdata-sections -fPIE
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 
 define Package/zerotier/conffiles
diff --git a/net/zerotier/patches/0001-fix-makefile.patch b/net/zerotier/patches/0001-fix-makefile.patch
index c5fc53feaf..2bc1aae8f2 100644
--- a/net/zerotier/patches/0001-fix-makefile.patch
+++ b/net/zerotier/patches/0001-fix-makefile.patch
@@ -29,6 +29,21 @@ Subject: [PATCH 1/3] fix makefile
  	ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
  else
  	LDLIBS+=-lnatpmp
+@@ -66,11 +66,11 @@ ifeq ($(ZT_DEBUG),1)
+ 	# C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
+ node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
+ else
+-	CFLAGS?=-O3 -fstack-protector -fPIE
++	CFLAGS?=-O3 -fstack-protector
+ 	override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+-	CXXFLAGS?=-O3 -fstack-protector -fPIE
++	CXXFLAGS?=-O3 -fstack-protector
+ 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+-	LDFLAGS=-pie -Wl,-z,relro,-z,now
++	LDFLAGS+=-Wl,-z,relro,-z,now
+ 	RUSTFLAGS=--release
+ endif
+ 
 @@ -300,7 +300,7 @@ ifeq ($(ZT_CONTROLLER),1)
  endif