diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 295f1753fcf9..0ff1b95c07a4 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -1,56 +1,56 @@ PORTNAME= zerotier -DISTVERSION= 1.8.9 +DISTVERSION= 1.10.1 CATEGORIES= net MAINTAINER= dch@FreeBSD.org COMMENT= Network virtualization everywhere WWW= https://www.zerotier.com/ # No SaaS or Govt usage: https://github.com/zerotier/ZeroTierOne/blob/master/LICENSE.txt LICENSE= BUSINESS MIT PD LICENSE_COMB= multi LICENSE_NAME_BUSINESS= Business Source License LICENSE_FILE_BUSINESS= ${WRKSRC}/LICENSE.txt -LICENSE_FILE_MIT= ${WRKSRC}/ext/json/LICENSE.MIT +LICENSE_FILE_MIT= ${WRKSRC}/ext/http-parser/LICENSE-MIT LICENSE_PERMS_BUSINESS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= as:devel/binutils USES= gmake compiler:c++14-lang USE_RC_SUBR= zerotier USE_GITHUB= yes GH_PROJECT= ZeroTierOne CFLAGS+= -flax-vector-conversions OPTIONS_DEFINE= DBG DBG_DESC= Enable foreground debugging for zerotier-one daemon DBG_ALL_TARGET= debug PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one .include .if ${OPSYS} == "FreeBSD" # log output via syslog SUB_LIST+= ZEROTIER_SYSLOG="-s debug -T zerotier" # after r347241 tun(4) and tap(4) have been merged to tuntap(4) .if (${OSVERSION} >= 1300028) SUB_LIST+= ZEROTIER_IF_TAP="if_tuntap" .else SUB_LIST+= ZEROTIER_IF_TAP="if_tap" .endif .else # we are not on FreeBSD SUB_LIST+= ZEROTIER_IF_TAP="if_tap" \ ZEROTIER_SYSLOG="" .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/ .for l in zerotier-cli zerotier-idtool ${RLN} ${STAGEDIR}${PREFIX}/sbin/zerotier-one ${STAGEDIR}${PREFIX}/bin/${l} .endfor .include diff --git a/net/zerotier/distinfo b/net/zerotier/distinfo index b4f53bfddb74..99beb9984a7a 100644 --- a/net/zerotier/distinfo +++ b/net/zerotier/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651180441 -SHA256 (zerotier-ZeroTierOne-1.8.9_GH0.tar.gz) = 78fc0dda08d022b4fff9b88449d21a62016452304e930d4ee8393fe2930e65a8 -SIZE (zerotier-ZeroTierOne-1.8.9_GH0.tar.gz) = 14537624 +TIMESTAMP = 1657526197 +SHA256 (zerotier-ZeroTierOne-1.10.1_GH0.tar.gz) = 1cc6b5da059486aff588fa6e6f43d20a7063569cc108bbe7254969f1cf72c968 +SIZE (zerotier-ZeroTierOne-1.10.1_GH0.tar.gz) = 84019609 diff --git a/net/zerotier/files/patch-Makefile b/net/zerotier/files/patch-Makefile index 92da0851926d..a90b545913e0 100644 --- a/net/zerotier/files/patch-Makefile +++ b/net/zerotier/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2018-09-13 09:39:16 UTC +--- Makefile.orig 2022-07-11 08:31:26 UTC +++ Makefile -@@ -11,8 +11,6 @@ ifeq ($(OSTYPE),Linux) +@@ -11,8 +11,6 @@ ifeq ($(OSTYPE),FreeBSD) endif ifeq ($(OSTYPE),FreeBSD) - CC=clang - CXX=clang++ ZT_BUILD_PLATFORM=7 include make-bsd.mk endif