diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 3b0902cb6..5b6d24b79 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -3,8 +3,9 @@ ZeroTier Release Notes # 2019-08-23 -- Version 1.4.4 - * Change license to BSL 1.1, see LICENSE.txt + * Change license from GPL3 to BSL 1.1, see LICENSE.txt * Fix an issue with the "ipauth" rule and auto-generated unforgeable IPv6 addresses + * Fix socket/bind errors setting IPs and routes on Linux # 2019-08-12 -- Version 1.4.2 diff --git a/attic/make-linux.mk b/attic/make-linux.mk index 6fdfb8a4d..329726622 100644 --- a/attic/make-linux.mk +++ b/attic/make-linux.mk @@ -403,7 +403,7 @@ debian-clean: FORCE rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp redhat: FORCE - rpmbuild -ba zerotier-one.spec + rpmbuild --target `rpm -q bash --qf "%{arch}"` -ba zerotier-one.spec # This installs the packages needed to build ZT locally on CentOS 7 and # is here largely for documentation purposes. diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 2bd19123c..948070ccc 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -717,7 +717,7 @@ USE_HFS+_COMPRESSION VERSION - 1.4.2 + 1.4.4 TYPE 0 diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index 1694f87f6..83b07c252 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -27,10 +27,10 @@ - + - + @@ -64,7 +64,7 @@ - + @@ -454,7 +454,7 @@ - + diff --git a/node/Membership.hpp b/node/Membership.hpp index a58f09ca9..94248f2a5 100644 --- a/node/Membership.hpp +++ b/node/Membership.hpp @@ -186,10 +186,10 @@ private: { if ((ip.isV6())&&(nconf.ndpEmulation())) { const InetAddress sixpl(InetAddress::makeIpv66plane(nconf.networkId,nconf.issuedTo.toInt())); - for(int i=0;isin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&sixpl)->sin6_addr.s6_addr)[j]) { prefixMatches = false; break; @@ -202,10 +202,10 @@ private: } const InetAddress rfc4193(InetAddress::makeIpv6rfc4193(nconf.networkId,nconf.issuedTo.toInt())); - for(int i=0;isin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&rfc4193)->sin6_addr.s6_addr)[j]) { prefixMatches = false; break; diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml index 43dca4c0b..3e7b2bd6f 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 ccec532a6..eb13e6790 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,6 +1,6 @@ Name: zerotier-one Version: 1.4.4 -Release: 2%{?dist} +Release: 1%{?dist} Summary: ZeroTier One network virtualization service License: ZeroTier BSL 1.1