aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LEGAL1
-rw-r--r--net/zerotier/Makefile15
-rw-r--r--net/zerotier/distinfo6
-rw-r--r--net/zerotier/pkg-message4
4 files changed, 17 insertions, 9 deletions
diff --git a/LEGAL b/LEGAL
index 539b482c4ce0..6861afce2bf0 100644
--- a/LEGAL
+++ b/LEGAL
@@ -240,3 +240,4 @@ vmd-* science/vmd No commercial use: commercial use requires a commercial lic
msms-* science/msms No commercial use, only for use by individuals in scientific research
unifi-devel-* net-mgmt/unifi-devel License restrictions, see https://www.ubnt.com/eula/
netio* benchmarks/netio No commercial use: commercial use requires a commercial license
+zerotier-* net/zerotier No SaaS or Govt usage: https://github.com/zerotier/ZeroTierOne/blob/master/LICENSE.txt
diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile
index 1644d0b03a9a..31b937b1d76c 100644
--- a/net/zerotier/Makefile
+++ b/net/zerotier/Makefile
@@ -2,17 +2,18 @@
# $FreeBSD$
PORTNAME= zerotier
-DISTVERSION= 1.4.2
-
+DISTVERSION= 1.4.6
CATEGORIES= net
MAINTAINER= dch@FreeBSD.org
COMMENT= Network virtualization everywhere
-LICENSE= GPLv3+ MIT PD
-LICENSE_COMB= multi
-LICENSE_FILE_GPLv3+ =${WRKSRC}/LICENSE.GPL-3
-LICENSE_FILE_MIT=${WRKSRC}/ext/json/LICENSE.MIT
+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_PERMS_BUSINESS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= gmake compiler:c++14-lang
USE_RC_SUBR= zerotier
@@ -28,6 +29,8 @@ DBG_ALL_TARGET= debug
PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one
+LEGAL_TEXT= No SaaS or Govt usage: https://github.com/zerotier/ZeroTierOne/blob/master/LICENSE.txt
+
.include <bsd.port.pre.mk>
.if ${OPSYS} == "FreeBSD"
diff --git a/net/zerotier/distinfo b/net/zerotier/distinfo
index 72b1fb7daa27..b02971b6210f 100644
--- a/net/zerotier/distinfo
+++ b/net/zerotier/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566816408
-SHA256 (zerotier-ZeroTierOne-1.4.2_GH0.tar.gz) = 557a444127812384265ec97232bae43dce1d4b1545ddd72e2b1646c971dad7c5
-SIZE (zerotier-ZeroTierOne-1.4.2_GH0.tar.gz) = 13079665
+TIMESTAMP = 1574164422
+SHA256 (zerotier-ZeroTierOne-1.4.6_GH0.tar.gz) = d1a0eeb03acfa446f67adf5901902d17de14b4648c21e160024acf476e3d4fba
+SIZE (zerotier-ZeroTierOne-1.4.6_GH0.tar.gz) = 13055818
diff --git a/net/zerotier/pkg-message b/net/zerotier/pkg-message
index 3f3a0da27a03..0d4edfba8a44 100644
--- a/net/zerotier/pkg-message
+++ b/net/zerotier/pkg-message
@@ -1,6 +1,10 @@
[
{ type: install
message: <<EOM
+Note that ZeroTier 1.4.6+ has a *new* license prohibiting commercial SaaS
+style usage, as well as excluding government organisations. Read the
+license details carefully to ensure your compliance.
+
First start the zerotier service:
service zerotier start