From f6bf15847d82d8c93e4c2245bcf29ff378c7a37b Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Wed, 2 May 2018 00:55:14 +0200
Subject: [PATCH] update package

---
 zerotier/Makefile                             |  2 +-
 ...ind-miniupnpc.h-in-staging-directory.patch |  8 ++---
 zerotier/patches/0002-remove-pie.patch        | 33 +++++++++++++++++++
 ...v5.patch => 0003-remove-march-armv5.patch} | 10 +++---
 4 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 zerotier/patches/0002-remove-pie.patch
 rename zerotier/patches/{0002-remove-march-armv5.patch => 0003-remove-march-armv5.patch} (85%)

diff --git a/zerotier/Makefile b/zerotier/Makefile
index 605b0ef..750dfef 100644
--- a/zerotier/Makefile
+++ b/zerotier/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zerotier
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.8
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-3.0
diff --git a/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch b/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch
index a126b98..d987f33 100644
--- a/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch
+++ b/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch
@@ -1,14 +1,14 @@
-From 58aa0c46860bc1700d3277222a9d5ddf37721d65 Mon Sep 17 00:00:00 2001
+From c578216351a4daa3916265b39b14f7c23ef15c90 Mon Sep 17 00:00:00 2001
 From: Moritz Warning <moritzwarning@web.de>
 Date: Mon, 23 Apr 2018 22:12:31 +0200
-Subject: [PATCH 1/2] find miniupnpc.h in staging directory
+Subject: [PATCH 1/3] find miniupnpc.h in staging directory
 
 ---
  make-linux.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/make-linux.mk b/make-linux.mk
-index c318c785..5b271b0a 100644
+index 2e6a8632..0cd955d1 100644
 --- a/make-linux.mk
 +++ b/make-linux.mk
 @@ -22,8 +22,8 @@ ONE_OBJS+=osdep/LinuxEthernetTap.o
@@ -23,5 +23,5 @@ index c318c785..5b271b0a 100644
  	override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
  	LDLIBS+=-lminiupnpc
 -- 
-2.16.3
+2.17.0
 
diff --git a/zerotier/patches/0002-remove-pie.patch b/zerotier/patches/0002-remove-pie.patch
new file mode 100644
index 0000000..d527931
--- /dev/null
+++ b/zerotier/patches/0002-remove-pie.patch
@@ -0,0 +1,33 @@
+From 7cfe751128d412a9b780ba5e4cb11908fc71cd3d Mon Sep 17 00:00:00 2001
+From: Moritz Warning <moritzwarning@web.de>
+Date: Mon, 30 Apr 2018 16:14:30 +0200
+Subject: [PATCH 2/3] remove -pie
+
+fixes relocation "against `a local symbol' can not be used
+when making a shared object; recompile with -fPIC" error
+---
+ make-linux.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/make-linux.mk b/make-linux.mk
+index 0cd955d1..add1d3ae 100644
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -71,11 +71,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
+ 	STRIP?=strip
+ 	STRIP+=--strip-all
+ endif
+-- 
+2.17.0
+
diff --git a/zerotier/patches/0002-remove-march-armv5.patch b/zerotier/patches/0003-remove-march-armv5.patch
similarity index 85%
rename from zerotier/patches/0002-remove-march-armv5.patch
rename to zerotier/patches/0003-remove-march-armv5.patch
index f9044cb..e663d46 100644
--- a/zerotier/patches/0002-remove-march-armv5.patch
+++ b/zerotier/patches/0003-remove-march-armv5.patch
@@ -1,17 +1,17 @@
-From dacdb368a5a147e0f4f618e66423923bf301a5c2 Mon Sep 17 00:00:00 2001
+From bfb1a652dbf897dc065d2a1414296eb145a2224b Mon Sep 17 00:00:00 2001
 From: Moritz Warning <moritzwarning@web.de>
 Date: Mon, 23 Apr 2018 22:31:03 +0200
-Subject: [PATCH 2/2] remove -march=armv5
+Subject: [PATCH 3/3] remove -march=armv5
 
 ---
  make-linux.mk | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/make-linux.mk b/make-linux.mk
-index 5b271b0a..31ec4dcb 100644
+index add1d3ae..49e14f70 100644
 --- a/make-linux.mk
 +++ b/make-linux.mk
-@@ -231,12 +231,12 @@ endif
+@@ -229,12 +229,12 @@ endif
  # ARM32 hell -- use conservative CFLAGS
  ifeq ($(ZT_ARCHITECTURE),3)
  	ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
@@ -29,5 +29,5 @@ index 5b271b0a..31ec4dcb 100644
  endif
  
 -- 
-2.16.3
+2.17.0