From b7a526587ccbf3a03ee71e83d6b39bcabd8eec2d Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Mon, 28 Aug 2023 17:35:14 +0300
Subject: [PATCH] ZeroTier-One version update to 1.12.1 (#979)

---
 .../kernel/gk7202v300.generic.config           |  2 +-
 .../package/zerotier-one/00000-makefile.patch  | 18 +++++++++---------
 general/package/zerotier-one/zerotier-one.mk   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config
index fdaf6ea4..33a1bd5b 100644
--- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config
+++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config
@@ -810,7 +810,7 @@ CONFIG_WIRELESS_EXT=y
 CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PROC=y
 CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
+CONFIG_CFG80211=y
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
diff --git a/general/package/zerotier-one/00000-makefile.patch b/general/package/zerotier-one/00000-makefile.patch
index f9a9017a..0664da5f 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	2023-03-21 11:52:14.865595394 +0300
-+++ b/make-linux.mk	2023-03-21 12:00:11.781207402 +0300
+--- a/make-linux.mk	2023-08-26 02:03:03.000000000 +0300
++++ b/make-linux.mk	2023-08-28 14:20:07.436267795 +0300
 @@ -25,7 +25,7 @@
  # otherwise build into binary as done on Mac and Windows.
  ONE_OBJS+=osdep/PortMapper.o
@@ -26,14 +26,14 @@
 +	CFLAGS?=-Os
  	override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 -	CXXFLAGS?=-O3 -fstack-protector
-+	CXXFLAGS?=-Os
++	CXXFLAGS?=-Os -latomic
  	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 -	LDFLAGS=-pie -Wl,-z,relro,-z,now
 +	LDFLAGS=
  	RUSTFLAGS=--release
  endif
  
-@@ -299,7 +299,7 @@
+@@ -310,7 +310,7 @@
  
  # Static builds, which are currently done for a number of Linux targets
  ifeq ($(ZT_STATIC),1)
@@ -42,7 +42,7 @@
  endif
  
  # For building an official semi-static binary on CentOS 7
-@@ -317,13 +317,13 @@
+@@ -328,13 +328,13 @@
  
  # ARM32 hell -- use conservative CFLAGS
  ifeq ($(ZT_ARCHITECTURE),3)
@@ -61,7 +61,7 @@
  		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
  	endif
  endif
-@@ -343,8 +343,8 @@
+@@ -354,8 +354,8 @@
  endif
  
  # Position Independence
@@ -70,9 +70,9 @@
 +override CFLAGS+=-flto
 +override CXXFLAGS+=-flto
  
- .PHONY: all
- all:	one
-@@ -368,7 +368,7 @@
+ # Non-executable stack
+ override ASFLAGS+=--noexecstack
+@@ -382,7 +382,7 @@
  $(ONE_OBJS): zeroidc
  
  libzerotiercore.a:	FORCE
diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk
index a31c04b4..13f77094 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.10.4
+ZEROTIER_ONE_VERSION = 1.12.1
 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION))
 
 ZEROTIER_ONE_LICENSE = BUSL-1.1