ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-07 03:40:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge dev

Browse Source
This commit is contained in:
Adam Ierymenko 2019-08-30 15:40:00 -07:00
commit 5435ec7545
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSE.txt
View File

@ -22,7 +22,9 @@ Additional Use Grant: You may make use of the Licensed Work, provided you
generation components of the Licensed Work as a generation components of the Licensed Work as a
for-profit service, regardless of whether the use of for-profit service, regardless of whether the use of
these components is sold alone or is bundled with other these components is sold alone or is bundled with other
services. services. Note that this does not apply to the use of
ZeroTier behind the scenes to operate a service not
related to ZeroTier network administration.
* Create Non-Open-Source Commercial Derviative Works * Create Non-Open-Source Commercial Derviative Works

9
debian/changelog vendored
View File

@ -1,7 +1,10 @@
zerotier-one (1.4.4-2) unstable; urgency=medium zerotier-one (1.4.6) unstable; urgency=medium
* Re-build with new planet/world file and a flags and build process * Update default root server list
update for armhf (32-bit ARM) targets. * Fix build flags on "armhf" (32-bit ARM) platforms for better
compatibility with Pi Zero and other devices.
* Fix license text in one.cpp.
* Add a clarification to LICENSE.txt.
-- Adam Ierymenko <adam.ierymenko@zerotier.com> Fri, 30 Aug 2019 01:00:00 -0700 -- Adam Ierymenko <adam.ierymenko@zerotier.com> Fri, 30 Aug 2019 01:00:00 -0700

2
ext/installfiles/mac/ZeroTier One.pkgproj
View File

@ -717,7 +717,7 @@
<key>USE_HFS+_COMPRESSION</key> <key>USE_HFS+_COMPRESSION</key>
<false/> <false/>
<key>VERSION</key> <key>VERSION</key>
<string>1.4.4</string> <string>1.4.6</string>
</dict> </dict>
<key>TYPE</key> <key>TYPE</key>
<integer>0</integer> <integer>0</integer>

8
one.cpp
View File

@ -82,12 +82,8 @@ using namespace ZeroTier;
static OneService *volatile zt1Service = (OneService *)0; static OneService *volatile zt1Service = (OneService *)0;
#define PROGRAM_NAME "ZeroTier One" #define PROGRAM_NAME "ZeroTier One"
#define COPYRIGHT_NOTICE "Copyright (c) 2011-2018 ZeroTier, Inc." #define COPYRIGHT_NOTICE "Copyright (c) 2019 ZeroTier, Inc."
#define LICENSE_GRANT \ #define LICENSE_GRANT "Licensed under the ZeroTier BSL 1.1 (see LICENSE.txt)"
"This is free software: you may copy, modify, and/or distribute this" ZT_EOL_S \
"work under the terms of the GNU General Public License, version 3 or" ZT_EOL_S \
"later as published by the Free Software Foundation." ZT_EOL_S \
"No warranty expressed or implied." ZT_EOL_S
/****************************************************************************/ /****************************************************************************/
/* zerotier-cli personality */ /* zerotier-cli personality */

2
windows/WinUI/AboutView.xaml
View File

@ -19,7 +19,7 @@
<Run Text="ZeroTier One"/> <Run Text="ZeroTier One"/>
</Paragraph> </Paragraph>
<Paragraph TextAlignment="Center"> <Paragraph TextAlignment="Center">
<Run FontSize="14" Text="Version 1.4.4"/> <Run FontSize="14" Text="Version 1.4.6"/>
<LineBreak/> <LineBreak/>
<Run FontSize="14" Text="(c) 2011-2019 ZeroTier, Inc."/> <Run FontSize="14" Text="(c) 2011-2019 ZeroTier, Inc."/>
<LineBreak/> <LineBreak/>

2
zerotier-one.spec
View File

@ -1,5 +1,5 @@
Name: zerotier-one Name: zerotier-one
Version: 1.4.4 Version: 1.4.6
Release: 1%{?dist} Release: 1%{?dist}
Summary: ZeroTier One network virtualization service Summary: ZeroTier One network virtualization service