diff options
author | Carson Page <me@carson.page> | 2021-04-16 05:00:42 +0000 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2021-04-17 12:13:31 +0000 |
commit | b6418ae0dc39a774e6073059e6abad8a7745292a (patch) | |
tree | b1d7a1769c0f4090bda3b60bbcf0aac49004f3ed | |
parent | 61c17ec2cb9036242ba76dcd28b1fe9c31618bd5 (diff) |
community/zerotier-one: upgrade to 1.6.4
-rw-r--r-- | community/zerotier-one/APKBUILD | 8 | ||||
-rw-r--r-- | community/zerotier-one/make-linux.patch | 21 |
2 files changed, 6 insertions, 23 deletions
diff --git a/community/zerotier-one/APKBUILD b/community/zerotier-one/APKBUILD index 2a0a5a6f447..72bb88f1bbe 100644 --- a/community/zerotier-one/APKBUILD +++ b/community/zerotier-one/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kyle Parisi <kyleparisi@gmail.com> # Maintainer: Kyle Parisi <kyleparisi@gmail.com> pkgname=zerotier-one -pkgver=1.6.2 +pkgver=1.6.4 pkgrel=0 pkgdesc="ZeroTier One allows systems to join and participate in ZeroTier virtual networks." url="https://www.zerotier.com/" @@ -32,6 +32,6 @@ package() { echo "tun" > "$pkgdir"/usr/lib/modules-load.d/$pkgname.conf } -sha512sums="8abb31ba8aed4c187a4e88ffe6f536ed7d0fe2421f89ae706eef620cc9508372a089ce9e9579df372e21b6dab271bea91e2d12b424dd85ece8c19885a6caa643 $pkgname-$pkgver.tar.gz -a63f8e649d63a3de58a556b3adca440cd0c0d4b36239ea547d555b97852d89d0a1446f348d35e98f77faabe1fe4ffb76868b8290ad9f2b4cd8b6c599945a176c $pkgname.initd -181f1fc99552e53d2979680b85037a29de20b60b89322122baf82b4765691a8773221d97136a984629404027608b1a1a30467dff3f111f924f4b4ddde2095980 make-linux.patch" +sha512sums="b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c zerotier-one-1.6.4.tar.gz +a63f8e649d63a3de58a556b3adca440cd0c0d4b36239ea547d555b97852d89d0a1446f348d35e98f77faabe1fe4ffb76868b8290ad9f2b4cd8b6c599945a176c zerotier-one.initd +efee4e5e6d553d4914e4de35844a5fddd42af3a1bcb1e8b54a3c1e62529fe3b75a5ca3ebc7f1ec0e531f5c72547cec68c6dd5acb33000664b148117ed89ecc53 make-linux.patch" diff --git a/community/zerotier-one/make-linux.patch b/community/zerotier-one/make-linux.patch index 287dd022a25..6cccf43b8f6 100644 --- a/community/zerotier-one/make-linux.patch +++ b/community/zerotier-one/make-linux.patch @@ -1,17 +1,6 @@ --- a/make-linux.mk +++ b/make-linux.mk -@@ -238,6 +238,10 @@ - ZT_ARCHITECTURE=6 - override DEFS+=-DZT_NO_TYPE_PUNNING - endif -+ifeq ($(CC_MACH),powerpc64le) -+ ZT_ARCHITECTURE=7 -+ override DEFS+=-DZT_NO_TYPE_PUNNING -+endif - ifeq ($(CC_MACH),s390x) - ZT_ARCHITECTURE=16 - endif -@@ -278,12 +278,12 @@ +@@ -278,8 +278,8 @@ # ARM32 hell -- use conservative CFLAGS ifeq ($(ZT_ARCHITECTURE),3) ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel) @@ -21,10 +10,4 @@ + override CXXFLAGS+=-march=armv6z -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm ZT_USE_ARM32_NEON_ASM_CRYPTO=0 else -- override CFLAGS+=-march=armv5t -mno-unaligned-access -marm -fexceptions -- override CXXFLAGS+=-march=armv5t -mno-unaligned-access -marm -fexceptions -+ override CFLAGS+=-march=armv6z -mno-unaligned-access -marm -fexceptions -+ override CXXFLAGS+=-march=armv6z -mno-unaligned-access -marm -fexceptions - ZT_USE_ARM32_NEON_ASM_CRYPTO=0 - endif - endif + override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -mcpu=arm1176jzf-s -marm -mno-unaligned-access |