zerotier: update to 1.8.6

[feed/packages.git] / net / zerotier / patches / 0001-fix-makefile.patch

diff --git a/net/zerotier/patches/0001-fix-makefile.patch b/net/zerotier/patches/0001-fix-makefile.patch
index 0d0de6470dd18e1f6ca1df979468f49e2dd73831..c5fc53feaf269b87dea40ad2602408eef4be1b82 100644 (file)
--- a/net/zerotier/patches/0001-fix-makefile.patch
+++ b/net/zerotier/patches/0001-fix-makefile.patch
@@ -1,3 +1,12 @@
+From 4965b6d10b2f51f4b30a8c0a8f3a64cf48dea635 Mon Sep 17 00:00:00 2001
+From: Moritz Warning <moritzwarning@web.de>
+Date: Tue, 8 Mar 2022 19:09:47 +0100
+Subject: [PATCH 1/3] fix makefile
+
+---
+ make-linux.mk | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/make-linux.mk
 +++ b/make-linux.mk
 @@ -25,8 +25,8 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M")
@@ -20,22 +29,7 @@
        ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
  else
        LDLIBS+=-lnatpmp
-@@ -68,11 +68,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
- endif
- 
- ifeq ($(ZT_QNAP), 1)
-@@ -280,7 +280,7 @@ ifeq ($(ZT_CONTROLLER),1)
+@@ -300,7 +300,7 @@ ifeq ($(ZT_CONTROLLER),1)
  endif
  
  # ARM32 hell -- use conservative CFLAGS