From d214a5437f160700021cf8e9ca2f090e19c385da Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 23 Aug 2019 15:24:52 -0700
Subject: [PATCH 1/6] Bump Mac pkg version

---
 ext/installfiles/mac/ZeroTier One.pkgproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index 2bd19123c..948070ccc 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.2</string>
+				<string>1.4.4</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>

From 25a48f2f44e81690a6a652c960a09606a3cdfc20 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 23 Aug 2019 21:24:05 -0700
Subject: [PATCH 2/6] Fix RedHat sub-version.

---
 zerotier-one.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zerotier-one.spec b/zerotier-one.spec
index ccec532a6..eb13e6790 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,6 +1,6 @@
 Name:           zerotier-one
 Version:        1.4.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        ZeroTier One network virtualization service
 
 License:        ZeroTier BSL 1.1

From 633cf9ec04a60e8b0aa7a9a2911e35564d61d481 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 23 Aug 2019 21:28:26 -0700
Subject: [PATCH 3/6] Warning removal

---
 node/Membership.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/node/Membership.hpp b/node/Membership.hpp
index e9fbd5406..caff957b7 100644
--- a/node/Membership.hpp
+++ b/node/Membership.hpp
@@ -183,10 +183,10 @@ private:
 	{
 		if ((ip.isV6())&&(nconf.ndpEmulation())) {
 			const InetAddress sixpl(InetAddress::makeIpv66plane(nconf.networkId,nconf.issuedTo.toInt()));
-			for(int i=0;i<nconf.staticIpCount;++i) {
+			for(unsigned int i=0;i<nconf.staticIpCount;++i) {
 				if (nconf.staticIps[i].ipsEqual(sixpl)) {
 					bool prefixMatches = true;
-					for(int j=0;j<5;++j) { // check for match on /40
+					for(unsigned int j=0;j<5;++j) { // check for match on /40
 						if ((((const struct sockaddr_in6 *)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&sixpl)->sin6_addr.s6_addr)[j]) {
 							prefixMatches = false;
 							break;
@@ -199,10 +199,10 @@ private:
 			}
 
 			const InetAddress rfc4193(InetAddress::makeIpv6rfc4193(nconf.networkId,nconf.issuedTo.toInt()));
-			for(int i=0;i<nconf.staticIpCount;++i) {
+			for(unsigned int i=0;i<nconf.staticIpCount;++i) {
 				if (nconf.staticIps[i].ipsEqual(rfc4193)) {
 					bool prefixMatches = true;
-					for(int j=0;j<11;++j) { // check for match on /88
+					for(unsigned int j=0;j<11;++j) { // check for match on /88
 						if ((((const struct sockaddr_in6 *)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&rfc4193)->sin6_addr.s6_addr)[j]) {
 							prefixMatches = false;
 							break;

From 05470bf202efb4647162863e577592c606ec6fd7 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 23 Aug 2019 21:38:04 -0700
Subject: [PATCH 4/6] Fix RPM targets

---
 make-linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-linux.mk b/make-linux.mk
index 6fdfb8a4d..329726622 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -403,7 +403,7 @@ debian-clean: FORCE
 	rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp
 
 redhat:	FORCE
-	rpmbuild -ba zerotier-one.spec
+	rpmbuild --target `rpm -q bash --qf "%{arch}"` -ba zerotier-one.spec
 
 # This installs the packages needed to build ZT locally on CentOS 7 and
 # is here largely for documentation purposes.

From 609873e6d1eb7f892ee2365939371cd42488c01b Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 23 Aug 2019 22:10:15 -0700
Subject: [PATCH 5/6] Windows version bump

---
 ext/installfiles/windows/ZeroTier One.aip | 8 ++++----
 windows/WinUI/AboutView.xaml              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
index 1694f87f6..83b07c252 100644
--- a/ext/installfiles/windows/ZeroTier One.aip	
+++ b/ext/installfiles/windows/ZeroTier One.aip	
@@ -27,10 +27,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
     <ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
-    <ROW Property="ProductCode" Value="1033:{E5E38B77-644B-48BA-A120-3CA86EECA9B1} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{5ADB2CD5-4478-4B41-87C5-0DEF9FEE61BD} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ZeroTier One"/>
-    <ROW Property="ProductVersion" Value="1.4.2" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.4.4" Type="32"/>
     <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
@@ -64,7 +64,7 @@
     <ROW Directory="x86_Dir" Directory_Parent="tapwindows_Dir" DefaultDir="x86"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
-    <ROW Component="AI_CustomARPName" ComponentId="{A660DE2F-81EF-45AB-AC9B-BAD4AB0E806D}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
+    <ROW Component="AI_CustomARPName" ComponentId="{6186488E-626B-4975-BE77-6EDCC27F3F4F}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
     <ROW Component="AI_DisableModify" ComponentId="{020DCABD-5D56-49B9-AF48-F07F0B55E590}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
     <ROW Component="AI_ExePath" ComponentId="{8E02B36C-7A19-429B-A93E-77A9261AC918}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
     <ROW Component="Hardcodet.Wpf.TaskbarNotification.dll" ComponentId="{BEA825AF-2555-44AF-BE40-47FFC16DCBA6}" Directory_="APPDIR" Attributes="0" KeyPath="Hardcodet.Wpf.TaskbarNotification.dll"/>
@@ -454,7 +454,7 @@
     <ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
-    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="2"/>
+    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="4"/>
     <ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false"/>
     <ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1"/>
     <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="4"/>
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index 43dca4c0b..3e7b2bd6f 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.2"/>
+                    <Run FontSize="14" Text="Version 1.4.4"/>
                     <LineBreak/>
                     <Run FontSize="14" Text="(c) 2011-2019 ZeroTier, Inc."/>
                     <LineBreak/>

From 91b16310ea47a6de96edb488a61494f8ed8c139c Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 26 Aug 2019 10:33:26 -0700
Subject: [PATCH 6/6]  * Change license from GPL3 to BSL 1.1, see LICENSE.txt 
 * Fix an issue with the "ipauth" rule and auto-generated unforgeable IPv6
 addresses  * Fix socket/bind errors setting IPs and routes on Linux

---
 RELEASE-NOTES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3b0902cb6..5b6d24b79 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -3,8 +3,9 @@ ZeroTier Release Notes
 
 # 2019-08-23 -- Version 1.4.4
 
- * Change license to BSL 1.1, see LICENSE.txt
+ * Change license from GPL3 to BSL 1.1, see LICENSE.txt
  * Fix an issue with the "ipauth" rule and auto-generated unforgeable IPv6 addresses
+ * Fix socket/bind errors setting IPs and routes on Linux
 
 # 2019-08-12 -- Version 1.4.2