github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 22:03:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

License stuff, version bump, CLI output.
Some checks are pending
/ build_macos (push) Waiting to run
Details
/ build_windows (push) Waiting to run
Details
/ build_ubuntu (push) Waiting to run
Details

Browse source
This commit is contained in:
Adam Ierymenko 2025-08-21 11:01:52 -04:00
commit ca4e35d52c
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
6 changed files with 1437 additions and 1439 deletions
Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
zerotier-one (1.16.0) unstable; urgency=medium
* See RELEASE-NOTES.md for release notes.
-- Adam Ierymenko <adam.ierymenko@zerotier.com> Thu, 21 Aug 2025 01:00:00 -0700
zerotier-one (1.14.2) unstable; urgency=medium
* See RELEASE-NOTES.md for release notes.

18
ext/installfiles/mac/ZeroTier One.pkgproj
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PACKAGES</key>
@ -695,13 +696,13 @@
<key>PAYLOAD_SIZE</key>
<integer>-1</integer>
<key>REFERENCE_PATH</key>
<string></string>
<string />
<key>RELOCATABLE</key>
<false />
<key>USE_HFS+_COMPRESSION</key>
<false />
<key>VERSION</key>
<string>1.14.2</string>
<string>1.16.0</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@ -970,7 +971,8 @@
<key>PROXY_NAME</key>
<string>Remove .pbdevelopment files</string>
<key>PROXY_TOOLTIP</key>
<string>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
<string
>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
<key>STATE</key>
<true />
</dict>
@ -1031,7 +1033,8 @@
<key>PROXY_NAME</key>
<string>Remove SCM metadata</string>
<key>PROXY_TOOLTIP</key>
<string>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
<string
>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
<key>STATE</key>
<false />
</dict>
@ -1068,7 +1071,8 @@
<key>PROXY_NAME</key>
<string>Optimize nib files</string>
<key>PROXY_TOOLTIP</key>
<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
<string
>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
<key>STATE</key>
<false />
</dict>
@ -1109,7 +1113,7 @@
<key>SHARED_GLOBAL_DATA</key>
<dict>
<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
<string></string>
<string />
</dict>
<key>TYPE</key>
<integer>0</integer>

30
one.cpp
View file

@ -1,15 +1,10 @@
/*
* Copyright (c)2020 ZeroTier, Inc.
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file in the project's root directory.
*
* Change Date: 2026-01-01
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2.0 of the Apache License.
* (c) ZeroTier, Inc.
* https://www.zerotier.com/
*/
/****/
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@ -105,15 +100,18 @@ using namespace ZeroTier;
static OneService* volatile zt1Service = (OneService*)0;
#define PROGRAM_NAME "ZeroTier One"
#define COPYRIGHT_NOTICE "Copyright (c) 2020 ZeroTier, Inc."
#define LICENSE_GRANT "Licensed under the ZeroTier BSL 1.1 (see LICENSE.txt)"
#define COPYRIGHT_NOTICE "Copyright (c) ZeroTier, Inc."
#ifdef ZT_NONFREE_CONTROLLER
#define LICENSE_GRANT "Licensed under a non-commercial source-available license (nonfree/LICENSE.md)."
#else
#define LICENSE_GRANT "Licensed under Mozilla Public License v2.0 (LICENSE-MPL.txt)."
#endif
/****************************************************************************/
/* zerotier-cli personality */
/****************************************************************************/
// This is getting deprecated soon in favor of the stuff in cli/
static void cliPrintHelp(const char* pn, FILE* out)
{
fprintf(
@ -127,7 +125,7 @@ static void cliPrintHelp(const char* pn, FILE* out)
ZT_BUILD_PLATFORM,
ZT_BUILD_ARCHITECTURE);
fprintf(out, COPYRIGHT_NOTICE ZT_EOL_S LICENSE_GRANT ZT_EOL_S);
fprintf(out, "Usage: %s [-switches] <command/path> [<args>]" ZT_EOL_S "" ZT_EOL_S, pn);
fprintf(out, ZT_EOL_S "Usage: %s [-switches] <command/path> [<args>]" ZT_EOL_S "" ZT_EOL_S, pn);
fprintf(out, "Available switches:" ZT_EOL_S);
fprintf(out, " -h - Display this help" ZT_EOL_S);
fprintf(out, " -v - Show version" ZT_EOL_S);
@ -2018,7 +2016,7 @@ static void printHelp(const char* cn, FILE* out)
{
fprintf(out, "%s version %d.%d.%d" ZT_EOL_S, PROGRAM_NAME, ZEROTIER_ONE_VERSION_MAJOR, ZEROTIER_ONE_VERSION_MINOR, ZEROTIER_ONE_VERSION_REVISION);
fprintf(out, COPYRIGHT_NOTICE ZT_EOL_S LICENSE_GRANT ZT_EOL_S);
fprintf(out, "Usage: %s [-switches] [home directory]" ZT_EOL_S "" ZT_EOL_S, cn);
fprintf(out, ZT_EOL_S "Usage: %s [-switches] [home directory]" ZT_EOL_S "" ZT_EOL_S, cn);
fprintf(out, "Available switches:" ZT_EOL_S);
fprintf(out, " -h - Display this help" ZT_EOL_S);
fprintf(out, " -v - Show version" ZT_EOL_S);

15
selftest.cpp
View file

@ -1,15 +1,10 @@
/*
* Copyright (c)2019 ZeroTier, Inc.
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file in the project's root directory.
*
* Change Date: 2026-01-01
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2.0 of the Apache License.
* (c) ZeroTier, Inc.
* https://www.zerotier.com/
*/
/****/
#include "node/Buffer.hpp"
#include "node/CertificateOfMembership.hpp"

19
version.h
View file

@ -1,15 +1,10 @@
/*
* Copyright (c)2019 ZeroTier, Inc.
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file in the project's root directory.
*
* Change Date: 2026-01-01
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2.0 of the Apache License.
* (c) ZeroTier, Inc.
* https://www.zerotier.com/
*/
/****/
#ifndef _ZT_VERSION_H
#define _ZT_VERSION_H
@ -22,12 +17,12 @@
/**
* Minor version
*/
#define ZEROTIER_ONE_VERSION_MINOR 15
#define ZEROTIER_ONE_VERSION_MINOR 16
/**
* Revision
*/
#define ZEROTIER_ONE_VERSION_REVISION 3
#define ZEROTIER_ONE_VERSION_REVISION 0
/**
* Build version

4
zerotier-one.spec
View file

@ -1,9 +1,9 @@
Name: zerotier-one
Version: 1.14.2
Version: 1.16.0
Release: 1%{?dist}
Summary: ZeroTier network virtualization service
License: ZeroTier BUSL 1.1
License: MPL 2.0
URL: https://www.zerotier.com
# Fedora