From 891815054c74bd80414bb8a2d429e69c2cce3912 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 24 Nov 2020 16:27:19 -0500 Subject: [PATCH 1/4] Version bumps. --- RELEASE-NOTES.md | 5 ++++- debian/changelog | 6 ++++++ ext/installfiles/mac/ZeroTier One.pkgproj | 2 +- version.h | 2 +- windows/WinUI/AboutView.xaml | 2 +- zerotier-one.spec | 9 ++++++--- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 9e94b1a0b..16f677618 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,12 +1,15 @@ ZeroTier Release Notes ====== -# ??? -- Version 1.6.1 +# 2020-11-24 -- Version 1.6.1 + +This release fixes some minor bugs and other issues in 1.6.0. * Fixed a bug that caused IP addresses in the 203.0.0.0/8 block to be miscategorized as not being in global scope. * Changed Linux builds to (hopefully) fix LXC and SELinux issues. * Fixed unaligned memory access that caused crash on FreeBSD systems on the ARM architecture. * Merged CLI options for controlling bonded devices into the beta multipath code. + * Updated Windows driver with Microsoft cross-signing to fix issues on some Windows systems. # 2020-11-19 -- Version 1.6.0 diff --git a/debian/changelog b/debian/changelog index f921505dd..da41dbf27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zerotier-one (1.6.1) unstable; urgency=medium + + * See RELEASE-NOTES.md for release notes. + + -- Adam Ierymenko Tue, 24 Nov 2020 01:00:00 -0700 + zerotier-one (1.6.0) unstable; urgency=medium * See RELEASE-NOTES.md for release notes. diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 42a377d83..3be5ac341 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -689,7 +689,7 @@ USE_HFS+_COMPRESSION VERSION - 1.6.0 + 1.6.1 TYPE 0 diff --git a/version.h b/version.h index df5e72ce4..bef75b186 100644 --- a/version.h +++ b/version.h @@ -27,7 +27,7 @@ /** * Revision */ -#define ZEROTIER_ONE_VERSION_REVISION 0 +#define ZEROTIER_ONE_VERSION_REVISION 1 /** * Build version diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml index f57c15c95..09958402b 100644 --- a/windows/WinUI/AboutView.xaml +++ b/windows/WinUI/AboutView.xaml @@ -19,7 +19,7 @@ - + diff --git a/zerotier-one.spec b/zerotier-one.spec index 452b3b5c1..57a7e0122 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,7 +1,7 @@ Name: zerotier-one -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?dist} -Summary: ZeroTier One network virtualization service +Summary: ZeroTier network virtualization service License: ZeroTier BSL 1.1 URL: https://www.zerotier.com @@ -37,7 +37,7 @@ It can be used for on-premise network virtualization, as a peer to peer VPN for mobile teams, for hybrid or multi-data-center cloud deployments, or just about anywhere else secure software defined virtual networking is useful. -ZeroTier One is our OS-level client service. It allows Mac, Linux, Windows, +This is our OS-level client service. It allows Mac, Linux, Windows, FreeBSD, and soon other types of clients to join ZeroTier virtual networks like conventional VPNs or VLANs. It can run on native systems, VMs, or containers (Docker, OpenVZ, etc.). @@ -145,6 +145,9 @@ esac %endif %changelog +* Tue Nov 24 2020 Adam Ierymenko - 1.6.1-0.1 +- see https://github.com/zerotier/ZeroTierOne for release notes + * Thu Nov 19 2020 Adam Ierymenko - 1.6.0-0.1 - see https://github.com/zerotier/ZeroTierOne for release notes From 6b21a4f4946a003f134fae2714c1559a418f92af Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 24 Nov 2020 13:51:00 -0800 Subject: [PATCH 2/4] fix dns equality check in Android --- java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java index b5e9041d7..867d013b0 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java @@ -151,6 +151,11 @@ public final class VirtualNetworkConfig implements Comparable Date: Tue, 24 Nov 2020 14:01:46 -0800 Subject: [PATCH 3/4] CentOS build fixes to build in Cent7. --- one.cpp | 2 +- zerotier-one.spec | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/one.cpp b/one.cpp index f09ad5df1..2f4d7edef 100644 --- a/one.cpp +++ b/one.cpp @@ -2068,7 +2068,7 @@ int __cdecl _tmain(int argc, _TCHAR* argv[]) int main(int argc,char **argv) #endif { -#ifdef __LINUX__ +#if defined(__LINUX__) && ( (!defined(__GLIBC__)) || ((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 18)) ) // This corrects for systems with abnormally small defaults (musl) and also // shrinks the stack on systems with large defaults to save a bit of memory. pthread_attr_t tattr; diff --git a/zerotier-one.spec b/zerotier-one.spec index 57a7e0122..e415bbb54 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -43,18 +43,21 @@ like conventional VPNs or VLANs. It can run on native systems, VMs, or containers (Docker, OpenVZ, etc.). %prep -#rm -rf * -#ln -s %{getenv:PWD} %{name}-%{version} -#tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf %{_sourcedir}/%{name}-%{version}.tar.gz %{name}-%{version}/* -#rm -f %{name}-%{version} -#cp -a %{getenv:PWD}/* . +%if 0%{?rhel} >= 7 +rm -rf * +ln -s %{getenv:PWD} %{name}-%{version} +tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf %{_sourcedir}/%{name}-%{version}.tar.gz %{name}-%{version}/* +rm -f %{name}-%{version} +cp -a %{getenv:PWD}/* . +%endif %build #%if 0%{?rhel} <= 7 #make CFLAGS="`echo %{optflags} | sed s/stack-protector-strong/stack-protector/`" CXXFLAGS="`echo %{optflags} | sed s/stack-protector-strong/stack-protector/`" ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one manpages selftest #%else -#make CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one manpages selftest -#%endif +%if 0%{?rhel} >= 7 +make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one +%endif %pre %if 0%{?rhel} >= 7 @@ -66,9 +69,13 @@ containers (Docker, OpenVZ, etc.). %install rm -rf $RPM_BUILD_ROOT +%if 0%{?rhel} < 7 pushd %{getenv:PWD} +%endif make install DESTDIR=$RPM_BUILD_ROOT +%if 0%{?rhel} < 7 popd +%endif %if 0%{?rhel} >= 7 mkdir -p $RPM_BUILD_ROOT%{_unitdir} cp %{getenv:PWD}/debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service @@ -157,9 +164,6 @@ esac * Fri Aug 23 2019 Adam Ierymenko - 1.4.4-0.1 - see https://github.com/zerotier/ZeroTierOne for release notes -* Mon Aug 04 2019 Adam Ierymenko - 1.4.2-0.1 -- see https://github.com/zerotier/ZeroTierOne for release notes - * Mon Jul 29 2019 Adam Ierymenko - 1.4.0-0.1 - see https://github.com/zerotier/ZeroTierOne for release notes From 86ff1e7cd299c602ad282b21e6dfa0a154a56880 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 24 Nov 2020 14:12:03 -0800 Subject: [PATCH 4/4] another comparison fix --- java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 4 +++- java/src/com/zerotier/sdk/VirtualNetworkDNS.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java index 867d013b0..c7b48d5c5 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java @@ -152,7 +152,9 @@ public final class VirtualNetworkConfig implements Comparable { public VirtualNetworkDNS() {} public boolean equals(VirtualNetworkDNS o) { + if (o == null) return false; return domain.equals(o.domain) && servers.equals(o.servers); }