OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

ZeroTier-One version update to 1.12.1 ()

pull/980/head
cronyx 2023-08-28 17:35:14 +03:00 committed by GitHub
parent cd92d00833
commit b7a526587c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
br-ext-chip-goke/board/gk7205v200/kernel
general/package/zerotier-one

2
br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config
View File

@ -810,7 +810,7 @@ CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_CORE=y CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y CONFIG_WEXT_PROC=y
CONFIG_WEXT_PRIV=y CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m CONFIG_CFG80211=y
# CONFIG_NL80211_TESTMODE is not set # CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211_DEFAULT_PS=y CONFIG_CFG80211_DEFAULT_PS=y

18
general/package/zerotier-one/00000-makefile.patch
View File

@ -1,5 +1,5 @@
--- a/make-linux.mk 2023-03-21 11:52:14.865595394 +0300 --- a/make-linux.mk 2023-08-26 02:03:03.000000000 +0300
+++ b/make-linux.mk 2023-03-21 12:00:11.781207402 +0300 +++ b/make-linux.mk 2023-08-28 14:20:07.436267795 +0300
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
# otherwise build into binary as done on Mac and Windows. # otherwise build into binary as done on Mac and Windows.
ONE_OBJS+=osdep/PortMapper.o ONE_OBJS+=osdep/PortMapper.o
@ -26,14 +26,14 @@
+ CFLAGS?=-Os + CFLAGS?=-Os
override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
- CXXFLAGS?=-O3 -fstack-protector - CXXFLAGS?=-O3 -fstack-protector
+ CXXFLAGS?=-Os + CXXFLAGS?=-Os -latomic
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) 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= + LDFLAGS=
RUSTFLAGS=--release RUSTFLAGS=--release
endif endif
@@ -299,7 +299,7 @@ @@ -310,7 +310,7 @@
# Static builds, which are currently done for a number of Linux targets # Static builds, which are currently done for a number of Linux targets
ifeq ($(ZT_STATIC),1) ifeq ($(ZT_STATIC),1)
@ -42,7 +42,7 @@
endif endif
# For building an official semi-static binary on CentOS 7 # For building an official semi-static binary on CentOS 7
@@ -317,13 +317,13 @@ @@ -328,13 +328,13 @@
# ARM32 hell -- use conservative CFLAGS # ARM32 hell -- use conservative CFLAGS
ifeq ($(ZT_ARCHITECTURE),3) ifeq ($(ZT_ARCHITECTURE),3)
@ -61,7 +61,7 @@
ZT_USE_ARM32_NEON_ASM_CRYPTO=0 ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif endif
endif endif
@@ -343,8 +343,8 @@ @@ -354,8 +354,8 @@
endif endif
# Position Independence # Position Independence
@ -70,9 +70,9 @@
+override CFLAGS+=-flto +override CFLAGS+=-flto
+override CXXFLAGS+=-flto +override CXXFLAGS+=-flto
.PHONY: all # Non-executable stack
all: one override ASFLAGS+=--noexecstack
@@ -368,7 +368,7 @@ @@ -382,7 +382,7 @@
$(ONE_OBJS): zeroidc $(ONE_OBJS): zeroidc
libzerotiercore.a: FORCE libzerotiercore.a: FORCE

2
general/package/zerotier-one/zerotier-one.mk
View File

@ -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_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION))
ZEROTIER_ONE_LICENSE = BUSL-1.1 ZEROTIER_ONE_LICENSE = BUSL-1.1