[PR PATCH] zerotier-one: update to 1.4.6.

[PR PATCH] zerotier-one: update to 1.4.6.

[evandeaubl]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is a new pull request by evandeaubl against master on the void-packages repository

https://github.com/evandeaubl/void-packages zerotier-one-1.4.6
https://github.com/void-linux/void-packages/pull/20953

zerotier-one: update to 1.4.6.


A patch file from https://github.com/void-linux/void-packages/pull/20953.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zerotier-one-1.4.6-20953.patch --]
[-- Type: text/x-diff, Size: 2300 bytes --]

From a80368c901939fa9351237a93a8b43edb5d45412 Mon Sep 17 00:00:00 2001
From: Evan Deaubl <evan@deaubl.name>
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 <maldridge@voidlinux.org>"
 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

Re: [PR PATCH] [Updated] zerotier-one: update to 1.4.6.

[evandeaubl]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

There is an updated pull request by evandeaubl against master on the void-packages repository

https://github.com/evandeaubl/void-packages zerotier-one-1.4.6
https://github.com/void-linux/void-packages/pull/20953

zerotier-one: update to 1.4.6.


A patch file from https://github.com/void-linux/void-packages/pull/20953.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zerotier-one-1.4.6-20953.patch --]
[-- Type: text/x-diff, Size: 2300 bytes --]

From 8b57e2f1d6772f19a6ae9957ef18b2b632895329 Mon Sep 17 00:00:00 2001
From: Evan Deaubl <evan@deaubl.name>
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 <maldridge@voidlinux.org>"
 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

Re: [PR PATCH] [Updated] zerotier-one: update to 1.4.6.

[evandeaubl]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

There is an updated pull request by evandeaubl against master on the void-packages repository

https://github.com/evandeaubl/void-packages zerotier-one-1.4.6
https://github.com/void-linux/void-packages/pull/20953

zerotier-one: update to 1.4.6.


A patch file from https://github.com/void-linux/void-packages/pull/20953.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zerotier-one-1.4.6-20953.patch --]
[-- Type: text/x-diff, Size: 2546 bytes --]

From 2f2d03a83a002bb596fe04576babc63e5b7f9e9a Mon Sep 17 00:00:00 2001
From: Evan Deaubl <evan@deaubl.name>
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                |  9 +++++----
 2 files changed, 7 insertions(+), 16 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..2e4783812cc 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
@@ -8,10 +8,10 @@ hostmakedepends="nodejs"
 makedepends="sqlite-devel"
 short_desc="Network Virtualization Everywhere"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-3"
+license="custom:Business-Source-License-1.1"
 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
@@ -19,4 +19,5 @@ pre_install() {
 
 post_install() {
 	vsv zerotier
+	vlicense LICENSE.txt
 }

Re: zerotier-one: update to 1.4.6.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/20953#issuecomment-613268950

Comment:
> The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited
production use.

New license needs repository=nonfree and maybe restricted=yes to prevent automatic update from free version.

Calling @the-maldridge.

Re: zerotier-one: update to 1.4.6.

[the-maldridge]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/20953#issuecomment-613269801

Comment:
Hmm.  When I packaged this there weren't any good VPN systems available that could create overlay networks.  There are now a large number of these systems, and I'm not sure its worth continuing to maintain ZeroTier One.  Given the work required to move it, I might consider just dropping the package now that superior options such as wireguard are available.

Re: zerotier-one: update to 1.4.6.

[evandeaubl]

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

New comment by evandeaubl on void-packages repository

https://github.com/void-linux/void-packages/pull/20953#issuecomment-613527043

Comment:
I was thinking about the license last night and realizing it would probably need to be moved into nonfree. I’ve just been using it because it’s what I’ve always used. Sounds like a good time to check out alternatives! 😄 I have no problem dropping this package altogether.

Re: zerotier-one: update to 1.4.6.

[evandeaubl]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

New comment by evandeaubl on void-packages repository

https://github.com/void-linux/void-packages/pull/20953#issuecomment-613527043

Comment:
I was thinking about the license last night and realizing it would probably need to be moved into nonfree. I've just been using it because it’s what I've always used. Sounds like a good time to check out alternatives! 😄 I have no problem dropping this package altogether.

Re: zerotier-one: update to 1.4.6.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/20953#issuecomment-630857121

Comment:
@evandeaubl ping.
i vote for dropping it