From 48487a3423cfb060164536e0f5cef8ee935180e4 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Sat, 30 Apr 2022 17:38:25 +0200 Subject: [PATCH] zerotier: update to 1.8.9 Replace patch with Makefile options to disable Rust components that cannot be build with OpenWrt. Signed-off-by: Moritz Warning --- net/zerotier/Makefile | 6 ++- net/zerotier/patches/0001-fix-makefile.patch | 8 ++-- ...x-compilation-for-arm_cortex-a7-neon.patch | 4 +- .../0003-do-not-use-zt-SSO-and-OIDC.patch | 38 ------------------- 4 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 net/zerotier/patches/0003-do-not-use-zt-SSO-and-OIDC.patch diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index ca3222cf21..76e5f5772e 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier -PKG_VERSION:=1.8.8 +PKG_VERSION:=1.8.9 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? -PKG_HASH:=324799e10c04ccac43c67e733eacabe29d2cb3d2eb9b782f11b86c43ad714e3b +PKG_HASH:=78fc0dda08d022b4fff9b88449d21a62016452304e930d4ee8393fe2930e65a8 PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) PKG_MAINTAINER:=Moritz Warning @@ -45,6 +45,8 @@ MAKE_FLAGS += ZT_DEBUG=1 endif MAKE_FLAGS += \ + ZT_EMBEDDED=1 \ + ZT_SSO_SUPPORTED=0 \ DEFS="" \ OSTYPE="Linux" \ diff --git a/net/zerotier/patches/0001-fix-makefile.patch b/net/zerotier/patches/0001-fix-makefile.patch index 2bc1aae8f2..493cd6c4da 100644 --- a/net/zerotier/patches/0001-fix-makefile.patch +++ b/net/zerotier/patches/0001-fix-makefile.patch @@ -1,11 +1,11 @@ -From 4965b6d10b2f51f4b30a8c0a8f3a64cf48dea635 Mon Sep 17 00:00:00 2001 +From 2a867d408c7488a273022652c55e1b31545eba4c Mon Sep 17 00:00:00 2001 From: Moritz Warning 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(-) + make-linux.mk | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) --- a/make-linux.mk +++ b/make-linux.mk @@ -44,7 +44,7 @@ Subject: [PATCH 1/3] fix makefile RUSTFLAGS=--release endif -@@ -300,7 +300,7 @@ ifeq ($(ZT_CONTROLLER),1) +@@ -310,7 +310,7 @@ ifeq ($(ZT_CONTROLLER),1) endif # ARM32 hell -- use conservative CFLAGS diff --git a/net/zerotier/patches/0002-fix-compilation-for-arm_cortex-a7-neon.patch b/net/zerotier/patches/0002-fix-compilation-for-arm_cortex-a7-neon.patch index 150129ab7a..b45b916b22 100644 --- a/net/zerotier/patches/0002-fix-compilation-for-arm_cortex-a7-neon.patch +++ b/net/zerotier/patches/0002-fix-compilation-for-arm_cortex-a7-neon.patch @@ -1,4 +1,4 @@ -From 8c24328d41a3a25db3b3d73baf86ed2c71160774 Mon Sep 17 00:00:00 2001 +From 1f03e3ddf714063da645cf62d9df08cbcb3ddfb3 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Mon, 30 Nov 2020 12:25:42 +0100 Subject: [PATCH 2/3] fix compilation for arm_cortex-a7+neon @@ -12,7 +12,7 @@ Signed-off-by: Rosen Penev --- a/node/Constants.hpp +++ b/node/Constants.hpp -@@ -118,7 +118,7 @@ +@@ -123,7 +123,7 @@ #include #endif diff --git a/net/zerotier/patches/0003-do-not-use-zt-SSO-and-OIDC.patch b/net/zerotier/patches/0003-do-not-use-zt-SSO-and-OIDC.patch deleted file mode 100644 index 297f4e7774..0000000000 --- a/net/zerotier/patches/0003-do-not-use-zt-SSO-and-OIDC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 826718bdbbd42fcf56bdb45dd9e71af10299cfa3 Mon Sep 17 00:00:00 2001 -From: Oskari Rauta -Date: Sun, 13 Mar 2022 10:06:08 +0100 -Subject: [PATCH 3/3] do not use zt SSO and OIDC - -These features need Rust/Cargo support -in the build system. OpenWrt does not -have that yet. ---- - make-linux.mk | 4 ++++ - node/Constants.hpp | 3 +++ - 2 files changed, 7 insertions(+) - ---- a/make-linux.mk -+++ b/make-linux.mk -@@ -268,6 +268,10 @@ ifeq ($(ZT_IA32),1) - endif - - ifeq ($(ZT_SSO_SUPPORTED), 1) -+ ZT_SSO_SUPPORTED=0 -+endif -+ -+ifeq ($(ZT_SSO_SUPPORTED), 1) - ifeq ($(ZT_DEBUG),1) - LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl -lssl -lcrypto - else ---- a/node/Constants.hpp -+++ b/node/Constants.hpp -@@ -72,6 +72,9 @@ - #include - #endif - -+#undef OIDC_SUPPORTED -+#define OIDC_SUPPORTED 0 -+ - #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - #define OIDC_SUPPORTED 0 - #ifndef __UNIX_LIKE__