From 6897f602bf68ec0bde65539fd54534fd1faae1dc Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 30 Aug 2019 15:30:37 -0700
Subject: [PATCH] 1.4.6 version bump

---
 LICENSE.txt                               | 4 +++-
 debian/changelog                          | 9 ++++++---
 ext/installfiles/mac/ZeroTier One.pkgproj | 2 +-
 one.cpp                                   | 8 ++------
 version.h                                 | 2 +-
 windows/WinUI/AboutView.xaml              | 2 +-
 zerotier-one.spec                         | 2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index c0c40aedd..78daf4c2a 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -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
                       for-profit service, regardless of whether the use of
                       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
 
diff --git a/debian/changelog b/debian/changelog
index 064848b86..dc8363396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 for armhf (32-bit ARM) targets.
+  * Update default root server list
+  * 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
 
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index 948070ccc..c55ae7331 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj	
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj	
@@ -717,7 +717,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.4.4</string>
+				<string>1.4.6</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
diff --git a/one.cpp b/one.cpp
index b229b98e3..06d56e7ae 100644
--- a/one.cpp
+++ b/one.cpp
@@ -83,12 +83,8 @@ using namespace ZeroTier;
 static OneService *volatile zt1Service = (OneService *)0;
 
 #define PROGRAM_NAME "ZeroTier One"
-#define COPYRIGHT_NOTICE "Copyright (c) 2011-2018 ZeroTier, Inc."
-#define LICENSE_GRANT \
-	"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
+#define COPYRIGHT_NOTICE "Copyright (c) 2019 ZeroTier, Inc."
+#define LICENSE_GRANT "Licensed under the ZeroTier BSL 1.1 (see LICENSE.txt)"
 
 /****************************************************************************/
 /* zerotier-cli personality                                                 */
diff --git a/version.h b/version.h
index 7c175456f..2e427cc8d 100644
--- a/version.h
+++ b/version.h
@@ -27,7 +27,7 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 4
+#define ZEROTIER_ONE_VERSION_REVISION 6
 
 /**
  * Build version
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index 3e7b2bd6f..d07a89476 100644
--- a/windows/WinUI/AboutView.xaml
+++ b/windows/WinUI/AboutView.xaml
@@ -19,7 +19,7 @@
                     <Run Text="ZeroTier One"/>
                 </Paragraph>
                 <Paragraph TextAlignment="Center">
-                    <Run FontSize="14" Text="Version 1.4.4"/>
+                    <Run FontSize="14" Text="Version 1.4.6"/>
                     <LineBreak/>
                     <Run FontSize="14" Text="(c) 2011-2019 ZeroTier, Inc."/>
                     <LineBreak/>
diff --git a/zerotier-one.spec b/zerotier-one.spec
index eb13e6790..3767b540e 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
 Name:           zerotier-one
-Version:        1.4.4
+Version:        1.4.6
 Release:        1%{?dist}
 Summary:        ZeroTier One network virtualization service