Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zerotier version bump #1553

Merged
merged 1 commit into from
Sep 19, 2024
Merged

zerotier version bump #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions general/package/zerotier-one/00000-makefile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -62,7 +61,7 @@
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif
endif
@@ -360,8 +361,8 @@
@@ -360,11 +360,11 @@
endif

# Position Independence
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion general/package/zerotier-one/zerotier-one.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down