From 0bc668adedc9582de3eebd35736bb80fdef41e91 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Fri, 25 May 2018 02:04:01 +0200 Subject: [PATCH] zerotier: update to version 1.2.10 Signed-off-by: Moritz Warning --- net/zerotier/Makefile | 6 ++-- .../patches/0003-remove-march-armv5.patch | 33 ------------------- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 net/zerotier/patches/0003-remove-march-armv5.patch diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 7b23f3e62..cb4bab3a7 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier -PKG_VERSION:=1.2.8 -PKG_RELEASE:=2 +PKG_VERSION:=1.2.10 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0 PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=08e2df34550d6bb68e106eaac48babb481160046818b0944ec41f1e158548a47 +PKG_HASH:=1c79ec57e67764079a77704b336e642ae3cf221dc8088b0cf9e9c81e0a9c0c57 PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) diff --git a/net/zerotier/patches/0003-remove-march-armv5.patch b/net/zerotier/patches/0003-remove-march-armv5.patch deleted file mode 100644 index 2db2d6910..000000000 --- a/net/zerotier/patches/0003-remove-march-armv5.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bfb1a652dbf897dc065d2a1414296eb145a2224b Mon Sep 17 00:00:00 2001 -From: Moritz Warning -Date: Mon, 23 Apr 2018 22:31:03 +0200 -Subject: [PATCH 3/4] remove -march=armv5 - ---- - make-linux.mk | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/make-linux.mk b/make-linux.mk -index add1d3ae..49e14f70 100644 ---- a/make-linux.mk -+++ b/make-linux.mk -@@ -229,12 +229,12 @@ endif - # ARM32 hell -- use conservative CFLAGS - ifeq ($(ZT_ARCHITECTURE),3) - ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel) -- override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm -- override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm -+ override CFLAGS+=-mfloat-abi=soft -msoft-float -mno-unaligned-access -marm -+ override CXXFLAGS+=-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+=-mno-unaligned-access -marm -+ override CXXFLAGS+=-mno-unaligned-access -marm - endif - endif - --- -2.17.0 -