From 1b66a1cd2f493f369b923a9e0497aeaa79970fea Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Tue, 21 Sep 2021 14:26:00 -0400
Subject: [PATCH] Version bump.

---
 RELEASE-NOTES.md                          | 4 ++++
 debian/changelog                          | 6 ++++++
 ext/installfiles/mac/ZeroTier One.pkgproj | 9 ++++++++-
 version.h                                 | 2 +-
 windows/WinUI/AboutView.xaml              | 2 +-
 zerotier-one.spec                         | 5 ++++-
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 5b3ccb85c..97adc1029 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,10 @@
 ZeroTier Release Notes
 ======
 
+# 2021-09-21 -- Version 1.6.6
+
+ * Backport COM hash check mitigation against network member impersonation.
+
 # 2021-04-13 -- Version 1.6.5
 
  * Fix a bug in potential network path filtering that could in some circumstances lead to "software laser" effects.
diff --git a/debian/changelog b/debian/changelog
index 52593f067..bab26cd55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zerotier-one (1.6.6) unstable; urgency=medium
+
+  * Backport endpoint mitigation against address collision attack.
+
+ -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 21 Sep 2021 01:00:00 -0700
+
 zerotier-one (1.6.5) unstable; urgency=medium
 
   * Fix path filtering bug that could cause "software laser" effect.
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index fcc1676c0..bcc461afb 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj	
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj	
@@ -689,7 +689,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.6.5</string>
+				<string>1.6.6</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -865,6 +865,13 @@
 		</dict>
 		<key>PROJECT_SETTINGS</key>
 		<dict>
+                        <key>ADVANCED_OPTIONS</key>
+                        <dict>
+                                <key>installer-script.options:hostArchitectures</key>
+                                <array>
+                                        <string>x86_64,arm64</string>
+                                </array>
+                        </dict>
 			<key>BUILD_FORMAT</key>
 			<integer>0</integer>
 			<key>BUILD_PATH</key>
diff --git a/version.h b/version.h
index d6c2612e0..81286f557 100644
--- a/version.h
+++ b/version.h
@@ -27,7 +27,7 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 5
+#define ZEROTIER_ONE_VERSION_REVISION 6
 
 /**
  * Build version
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index cbebc2c5a..295d27bd5 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.6.5"/>
+                    <Run FontSize="14" Text="Version 1.6.6"/>
                     <LineBreak/>
                     <Run FontSize="14" Text="(c) 2011-2021 ZeroTier, Inc."/>
                     <LineBreak/>
diff --git a/zerotier-one.spec b/zerotier-one.spec
index cdad9b51b..7c32bee48 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
 Name:           zerotier-one
-Version:        1.6.5
+Version:        1.6.6
 Release:        1%{?dist}
 Summary:        ZeroTier network virtualization service
 
@@ -152,6 +152,9 @@ esac
 %endif
 
 %changelog
+* Tue Sep 21 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.6
+- see https://github.com/zerotier/ZeroTierOne for release notes
+
 * Tue Apr 13 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.5
 - see https://github.com/zerotier/ZeroTierOne for release notes