diff --git a/general/package/zerotier-one/0001-makefile.patch b/general/package/zerotier-one/0001-makefile.patch index 08746d98..70c4848a 100644 --- a/general/package/zerotier-one/0001-makefile.patch +++ b/general/package/zerotier-one/0001-makefile.patch @@ -1,5 +1,5 @@ ---- a/make-linux.mk 2022-04-18 13:32:33.520498886 +0300 -+++ b/make-linux.mk 2022-04-18 13:35:04.312959847 +0300 +--- a/make-linux.mk 2022-04-29 20:05:45.861358153 +0300 ++++ b/make-linux.mk 2022-04-29 20:07:28.121520301 +0300 @@ -25,8 +25,8 @@ # otherwise build into binary as done on Mac and Windows. ONE_OBJS+=osdep/PortMapper.o @@ -20,14 +20,14 @@ ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o else LDLIBS+=-lnatpmp -@@ -312,8 +312,8 @@ +@@ -316,8 +316,8 @@ override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm ZT_USE_ARM32_NEON_ASM_CRYPTO=0 else -- override CFLAGS+=-mfloat-abi=hard -march=armv6kz -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s -- override CXXFLAGS+=-mfloat-abi=hard -march=armv6kz -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s -+ override CFLAGS+=-mfloat-abi=soft -march=armv6kz -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s -+ override CXXFLAGS+=-mfloat-abi=soft -march=armv6kz -marm -mfpu=vfp -fexceptions -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 CFLAGS+=-mfloat-abi=soft -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s ++ override CXXFLAGS+=-mfloat-abi=soft -march=armv6zk -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s ZT_USE_ARM32_NEON_ASM_CRYPTO=0 endif endif diff --git a/general/package/zerotier-one/zerotier-one b/general/package/zerotier-one/zerotier-one new file mode 100755 index 00000000..e12214a5 Binary files /dev/null and b/general/package/zerotier-one/zerotier-one differ diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk index cfc213b0..87444959 100644 --- a/general/package/zerotier-one/zerotier-one.mk +++ b/general/package/zerotier-one/zerotier-one.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZEROTIER_ONE_VERSION = 1294767b44c20faf069f5ddbe287fb96ad0750d1 +ZEROTIER_ONE_VERSION = 7ea2354540cd891f61d0944ff8a25c53a42bd038 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION)) # ZEROTIER_ONE_DEPENDENCIES += libminiupnpc libnatpmp ZEROTIER_ONE_LICENSE = BUSL-1.1