From 171749f02d8b627a831d5bd60d9f73158762bff0 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Wed, 22 Feb 2023 22:48:00 +0100 Subject: [PATCH] zerotier: update to 1.10.3 Signed-off-by: Moritz Warning (cherry picked from commit 1af4a404a5e3755f22c1ef76968f7b9ff93b038c) --- net/zerotier/Makefile | 6 +++--- net/zerotier/patches/0001-fix-makefile.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 16f85d5889..05c14ef4be 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier -PKG_VERSION:=1.10.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.10.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? -PKG_HASH:=9f98b1670785f42294b9858068d42c6b8c2fdee6402e871a36562b47559e74e7 +PKG_HASH:=f2ce8a63a459a5fab129fb398e379b8c0875bdfeccb7bf15f9683ad22e43e629 PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) PKG_MAINTAINER:=Moritz Warning diff --git a/net/zerotier/patches/0001-fix-makefile.patch b/net/zerotier/patches/0001-fix-makefile.patch index dada5f5fd1..fd8d05e215 100644 --- a/net/zerotier/patches/0001-fix-makefile.patch +++ b/net/zerotier/patches/0001-fix-makefile.patch @@ -38,7 +38,7 @@ Subject: [PATCH 1/2] fix makefile RUSTFLAGS=--release endif -@@ -308,7 +308,7 @@ ifeq ($(ZT_CONTROLLER),1) +@@ -313,7 +313,7 @@ ifeq ($(ZT_CONTROLLER),1) endif # ARM32 hell -- use conservative CFLAGS @@ -47,7 +47,7 @@ Subject: [PATCH 1/2] fix makefile ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel) override CFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm -@@ -335,8 +335,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1) +@@ -340,8 +340,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1) endif # Position Independence