From 393bb305fcea78cd2e4c3222f9b3a1c36a0a5691 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Sat, 3 Aug 2019 21:42:58 +0200 Subject: [PATCH] zerotier: update to zerotier 1.4.0 Signed-off-by: Moritz Warning --- net/zerotier/Makefile | 8 ++++---- ...1-find-miniupnpc.h-in-staging-directory.patch | 8 ++++---- net/zerotier/patches/0002-remove-pie.patch | 8 ++++---- .../0003-remove-arm32-conservative-CFLAGS.patch | 16 +++++++++++++++- .../0004-accept-external-linker-flags.patch | 8 ++++---- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 7cf5a44cb7..d1f5533f25 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier -PKG_VERSION:=1.2.12 -PKG_RELEASE:=4 +PKG_VERSION:=1.4.0.1 +PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=212799bfaeb5e7dff20f2cd83f15742c8e13b8e9535606cfb85abcfb5fb6fed4 +PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? +PKG_HASH:=39f5cdbe589ff550dca9d407f579e87b55a750dbb46458914476fa7dbafb8214 PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) PKG_MAINTAINER:=Moritz Warning diff --git a/net/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch b/net/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch index 5ea4d697ee..7aa9c7ead3 100644 --- a/net/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch +++ b/net/zerotier/patches/0001-find-miniupnpc.h-in-staging-directory.patch @@ -1,4 +1,4 @@ -From c578216351a4daa3916265b39b14f7c23ef15c90 Mon Sep 17 00:00:00 2001 +From 14454285d7ef5b9cd134c86059933036c1aa2fef Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Mon, 23 Apr 2018 22:12:31 +0200 Subject: [PATCH 1/4] find miniupnpc.h in staging directory @@ -8,10 +8,10 @@ Subject: [PATCH 1/4] find miniupnpc.h in staging directory 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-linux.mk b/make-linux.mk -index 2e6a8632..0cd955d1 100644 +index b81c7aeb..a547125d 100644 --- a/make-linux.mk +++ b/make-linux.mk -@@ -22,8 +22,8 @@ ONE_OBJS+=osdep/LinuxEthernetTap.o +@@ -29,8 +29,8 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M") # otherwise build into binary as done on Mac and Windows. ONE_OBJS+=osdep/PortMapper.o override DEFS+=-DZT_USE_MINIUPNPC @@ -23,5 +23,5 @@ index 2e6a8632..0cd955d1 100644 override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC LDLIBS+=-lminiupnpc -- -2.17.0 +2.22.0 diff --git a/net/zerotier/patches/0002-remove-pie.patch b/net/zerotier/patches/0002-remove-pie.patch index 849cb20f91..8f90d8f0a2 100644 --- a/net/zerotier/patches/0002-remove-pie.patch +++ b/net/zerotier/patches/0002-remove-pie.patch @@ -1,4 +1,4 @@ -From 7cfe751128d412a9b780ba5e4cb11908fc71cd3d Mon Sep 17 00:00:00 2001 +From 68fe97ef6b05e3709cd4b67c7681dcfc63bfaf80 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Mon, 30 Apr 2018 16:14:30 +0200 Subject: [PATCH 2/4] remove -pie @@ -10,10 +10,10 @@ when making a shared object; recompile with -fPIC" error 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make-linux.mk b/make-linux.mk -index 0cd955d1..add1d3ae 100644 +index a547125d..13244741 100644 --- a/make-linux.mk +++ b/make-linux.mk -@@ -63,11 +63,11 @@ ifeq ($(ZT_DEBUG),1) +@@ -77,11 +77,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 @@ -29,5 +29,5 @@ index 0cd955d1..add1d3ae 100644 STRIP+=--strip-all endif -- -2.17.0 +2.22.0 diff --git a/net/zerotier/patches/0003-remove-arm32-conservative-CFLAGS.patch b/net/zerotier/patches/0003-remove-arm32-conservative-CFLAGS.patch index ea74d0d8cb..f2189b97f1 100644 --- a/net/zerotier/patches/0003-remove-arm32-conservative-CFLAGS.patch +++ b/net/zerotier/patches/0003-remove-arm32-conservative-CFLAGS.patch @@ -1,6 +1,17 @@ +From a856855ab97e0775a08e1571a4ad26c264cb13f4 Mon Sep 17 00:00:00 2001 +From: Moritz Warning +Date: Sun, 4 Aug 2019 03:56:37 +0200 +Subject: [PATCH 3/4] remove arm32 conservative CFLAGS + +--- + make-linux.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/make-linux.mk b/make-linux.mk +index 13244741..fd164dfa 100644 --- a/make-linux.mk +++ b/make-linux.mk -@@ -231,7 +231,7 @@ ifeq ($(ZT_OFFICIAL),1) +@@ -262,7 +262,7 @@ ifeq ($(ZT_OFFICIAL),1) endif # ARM32 hell -- use conservative CFLAGS @@ -9,3 +20,6 @@ ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel) override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm +-- +2.22.0 + diff --git a/net/zerotier/patches/0004-accept-external-linker-flags.patch b/net/zerotier/patches/0004-accept-external-linker-flags.patch index d50143a612..a28f4d8266 100644 --- a/net/zerotier/patches/0004-accept-external-linker-flags.patch +++ b/net/zerotier/patches/0004-accept-external-linker-flags.patch @@ -1,4 +1,4 @@ -From a2cf8bf645d25f18cbc2ed7ad4b9a25725811afd Mon Sep 17 00:00:00 2001 +From 5169e5328525af28f6b7de087ece10a9bc0a2282 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Wed, 2 May 2018 16:06:46 +0200 Subject: [PATCH 4/4] accept external linker flags @@ -8,10 +8,10 @@ Subject: [PATCH 4/4] accept external linker flags 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-linux.mk b/make-linux.mk -index 49e14f70..8e766bfb 100644 +index fd164dfa..29ff8813 100644 --- a/make-linux.mk +++ b/make-linux.mk -@@ -67,7 +67,7 @@ else +@@ -81,7 +81,7 @@ else override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) CXXFLAGS?=-O3 -fstack-protector override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS) @@ -21,5 +21,5 @@ index 49e14f70..8e766bfb 100644 STRIP+=--strip-all endif -- -2.17.0 +2.22.0 -- 2.30.2