From a80368c901939fa9351237a93a8b43edb5d45412 Mon Sep 17 00:00:00 2001 From: Evan Deaubl Date: Mon, 13 Apr 2020 07:36:21 -0700 Subject: [PATCH] zerotier-one: update to 1.4.6. --- srcpkgs/zerotier-one/patches/fix-cross.patch | 14 ++------------ srcpkgs/zerotier-one/template | 6 +++--- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/srcpkgs/zerotier-one/patches/fix-cross.patch b/srcpkgs/zerotier-one/patches/fix-cross.patch index 6f7bbd90e8f..3605d48b6aa 100644 --- a/srcpkgs/zerotier-one/patches/fix-cross.patch +++ b/srcpkgs/zerotier-one/patches/fix-cross.patch @@ -1,15 +1,5 @@ --- make-linux.mk 2019-07-31 22:25:58.000000000 +0200 +++ make-linux.mk 2019-08-10 07:30:54.288571780 +0200 -@@ -147,6 +147,9 @@ - ifeq ($(CC_MACH),ppc64el) - ZT_ARCHITECTURE=8 - endif -+ifeq ($(CC_MACH),powerpc64) -+ ZT_ARCHITECTURE=8 -+endif - ifeq ($(CC_MACH),i386) - ZT_ARCHITECTURE=1 - endif @@ -177,22 +177,22 @@ ifeq ($(CC_MACH),armv6) ZT_ARCHITECTURE=3 @@ -48,8 +38,8 @@ - override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm - ZT_USE_ARM32_NEON_ASM_CRYPTO=0 - else -- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm +- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions +- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions - ZT_USE_ARM32_NEON_ASM_CRYPTO=0 - endif -endif diff --git a/srcpkgs/zerotier-one/template b/srcpkgs/zerotier-one/template index 41e0a842c71..382f0d026ff 100644 --- a/srcpkgs/zerotier-one/template +++ b/srcpkgs/zerotier-one/template @@ -1,6 +1,6 @@ -# Template file for 'zerotier' +# Template file for 'zerotier-one' pkgname=zerotier-one -version=1.4.0.1 +version=1.4.6 revision=1 wrksrc=ZeroTierOne-${version} build_style=gnu-makefile @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="https://www.zerotier.com/" distfiles="https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz" -checksum=39f5cdbe589ff550dca9d407f579e87b55a750dbb46458914476fa7dbafb8214 +checksum=d1a0eeb03acfa446f67adf5901902d17de14b4648c21e160024acf476e3d4fba pre_install() { sed -i 's/sbin/bin/g' make-linux.mk