mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-04-07 19:24:13 +00:00
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
This commit is contained in:
Adam Ierymenko
commit
f906eec42e
@ -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
|
||||
|
||||
|
||||
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
zerotier-one (1.6.1) unstable; urgency=medium
|
||||
|
||||
* See RELEASE-NOTES.md for release notes.
|
||||
|
||||
-- Adam Ierymenko <adam.ierymenko@zerotier.com> Tue, 24 Nov 2020 01:00:00 -0700
|
||||
|
||||
zerotier-one (1.6.0) unstable; urgency=medium
|
||||
|
||||
* See RELEASE-NOTES.md for release notes.
|
||||
|
||||
@ -689,7 +689,7 @@
|
||||
<key>USE_HFS+_COMPRESSION</key>
|
||||
<false/>
|
||||
<key>VERSION</key>
|
||||
<string>1.6.0</string>
|
||||
<string>1.6.1</string>
|
||||
</dict>
|
||||
<key>TYPE</key>
|
||||
<integer>0</integer>
|
||||
|
||||
@ -151,6 +151,13 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
|
||||
}
|
||||
}
|
||||
|
||||
boolean dnsEquals = false;
|
||||
if (this.dns == null || cfg.dns == null) {
|
||||
dnsEquals = true;
|
||||
} else if (this.dns != null) {
|
||||
dnsEquals = this.dns.equals(cfg.dns);
|
||||
}
|
||||
|
||||
return this.nwid == cfg.nwid &&
|
||||
this.mac == cfg.mac &&
|
||||
this.name.equals(cfg.name) &&
|
||||
@ -162,7 +169,7 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
|
||||
this.broadcastEnabled == cfg.broadcastEnabled &&
|
||||
this.portError == cfg.portError &&
|
||||
this.enabled == cfg.enabled &&
|
||||
this.dns.equals(cfg.dns) &&
|
||||
dnsEquals &&
|
||||
aaEqual && routesEqual;
|
||||
}
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@ public class VirtualNetworkDNS implements Comparable<VirtualNetworkDNS> {
|
||||
public VirtualNetworkDNS() {}
|
||||
|
||||
public boolean equals(VirtualNetworkDNS o) {
|
||||
if (o == null) return false;
|
||||
return domain.equals(o.domain) && servers.equals(o.servers);
|
||||
}
|
||||
|
||||
|
||||
2
one.cpp
2
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;
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
/**
|
||||
* Revision
|
||||
*/
|
||||
#define ZEROTIER_ONE_VERSION_REVISION 0
|
||||
#define ZEROTIER_ONE_VERSION_REVISION 1
|
||||
|
||||
/**
|
||||
* Build version
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<Run Text="ZeroTier One"/>
|
||||
</Paragraph>
|
||||
<Paragraph TextAlignment="Center">
|
||||
<Run FontSize="14" Text="Version 1.6.0"/>
|
||||
<Run FontSize="14" Text="Version 1.6.1"/>
|
||||
<LineBreak/>
|
||||
<Run FontSize="14" Text="(c) 2011-2020 ZeroTier, Inc."/>
|
||||
<LineBreak/>
|
||||
|
||||
@ -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,24 +37,27 @@ 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.).
|
||||
|
||||
%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
|
||||
@ -145,6 +152,9 @@ esac
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Nov 24 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.1-0.1
|
||||
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||
|
||||
* Thu Nov 19 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.0-0.1
|
||||
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||
|
||||
@ -154,9 +164,6 @@ esac
|
||||
* Fri Aug 23 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.4-0.1
|
||||
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||
|
||||
* Mon Aug 04 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.2-0.1
|
||||
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||
|
||||
* Mon Jul 29 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.0-0.1
|
||||
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user