From 9dca212b9a478b8b60b23efc26e278acfb5692e8 Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Thu, 19 Sep 2024 17:41:43 +0300
Subject: [PATCH] zerotier version bump (#1553)

---
 .../package/zerotier-one/00000-makefile.patch | 19 +++++++++++--------
 general/package/zerotier-one/zerotier-one.mk  |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/general/package/zerotier-one/00000-makefile.patch b/general/package/zerotier-one/00000-makefile.patch
index 74561d61..e5c0ea30 100644
--- a/general/package/zerotier-one/00000-makefile.patch
+++ b/general/package/zerotier-one/00000-makefile.patch
@@ -1,5 +1,5 @@
---- a/make-linux.mk	2024-05-07 15:30:36.796169232 +0300
-+++ b/make-linux.mk	2024-05-07 15:30:18.156127097 +0300
+--- a/make-linux.mk	2024-09-19 15:35:10.221093737 +0300
++++ b/make-linux.mk	2024-09-19 16:33:05.452310051 +0300
 @@ -26,7 +26,7 @@
  # otherwise build into binary as done on Mac and Windows.
  ONE_OBJS+=osdep/PortMapper.o
@@ -28,7 +28,7 @@
 -	CXXFLAGS?=-O3 -fstack-protector
 +	CXXFLAGS?=-Os -latomic
  	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
--	LDFLAGS=-pie -Wl,-z,relro,-z,now
+-	LDFLAGS?=-pie -Wl,-z,relro,-z,now
 +	LDFLAGS=
  	ZT_CARGO_FLAGS=--release
  endif
@@ -42,7 +42,7 @@
  endif
  
  # For building an official semi-static binary on CentOS 7
-@@ -334,13 +334,14 @@
+@@ -334,13 +334,13 @@
  
  # ARM32 hell -- use conservative CFLAGS
  ifeq ($(ZT_ARCHITECTURE),3)
@@ -53,7 +53,6 @@
 +		override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -marm -mno-unaligned-access
 +		override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -marm -fexceptions -mno-unaligned-access
  		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
-+
  	else
 -		override CFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
 -		override CXXFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
@@ -62,7 +61,7 @@
  		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
  	endif
  endif
-@@ -360,8 +361,8 @@
+@@ -360,11 +360,11 @@
  endif
  
  # Position Independence
@@ -72,8 +71,12 @@
 +override CXXFLAGS+=-flto
  
  # Non-executable stack
- override ASFLAGS+=--noexecstack
-@@ -388,7 +389,7 @@
+-override LDFLAGS+=-Wl,-z,noexecstack
++override ASFLAGS+=--noexecstack
+ 
+ .PHONY: all
+ all:	one
+@@ -388,7 +388,7 @@
  $(ONE_OBJS): zeroidc smeeclient
  
  libzerotiercore.a:	FORCE
diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk
index dde75c99..26aea481 100644
--- a/general/package/zerotier-one/zerotier-one.mk
+++ b/general/package/zerotier-one/zerotier-one.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZEROTIER_ONE_VERSION = 1.14.0
+ZEROTIER_ONE_VERSION = 1.14.1
 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION))
 
 ZEROTIER_ONE_LICENSE = BUSL-1.1