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

zerotier version bump (#1553)

pull/1554/head
cronyx 2024-09-19 17:41:43 +03:00 committed by GitHub
parent 0120911b30
commit 9dca212b9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
--- a/make-linux.mk 2024-05-07 15:30:36.796169232 +0300 --- a/make-linux.mk 2024-09-19 15:35:10.221093737 +0300
+++ b/make-linux.mk 2024-05-07 15:30:18.156127097 +0300 +++ b/make-linux.mk 2024-09-19 16:33:05.452310051 +0300
@@ -26,7 +26,7 @@ @@ -26,7 +26,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
@ -28,7 +28,7 @@
- CXXFLAGS?=-O3 -fstack-protector - CXXFLAGS?=-O3 -fstack-protector
+ CXXFLAGS?=-Os -latomic + 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=
ZT_CARGO_FLAGS=--release ZT_CARGO_FLAGS=--release
endif endif
@ -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
@@ -334,13 +334,14 @@ @@ -334,13 +334,13 @@
# ARM32 hell -- use conservative CFLAGS # ARM32 hell -- use conservative CFLAGS
ifeq ($(ZT_ARCHITECTURE),3) ifeq ($(ZT_ARCHITECTURE),3)
@ -53,7 +53,6 @@
+ override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -marm -mno-unaligned-access + override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -marm -mno-unaligned-access
+ override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -marm -fexceptions -mno-unaligned-access + override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -marm -fexceptions -mno-unaligned-access
ZT_USE_ARM32_NEON_ASM_CRYPTO=0 ZT_USE_ARM32_NEON_ASM_CRYPTO=0
+
else else
- override CFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s - 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 - 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 ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif endif
endif endif
@@ -360,8 +361,8 @@ @@ -360,11 +360,11 @@
endif endif
# Position Independence # Position Independence
@ -72,8 +71,12 @@
+override CXXFLAGS+=-flto +override CXXFLAGS+=-flto
# Non-executable stack # Non-executable stack
override ASFLAGS+=--noexecstack -override LDFLAGS+=-Wl,-z,noexecstack
@@ -388,7 +389,7 @@ +override ASFLAGS+=--noexecstack
.PHONY: all
all: one
@@ -388,7 +388,7 @@
$(ONE_OBJS): zeroidc smeeclient $(ONE_OBJS): zeroidc smeeclient
libzerotiercore.a: FORCE libzerotiercore.a: FORCE

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

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