Merge branch 'dev' into edge

15 files changed, 29 insertions, 12 deletions

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index a73671d7..0ff36519 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,14 @@
 ZeroTier Release Notes
 ======
 
+# 2018-04-27 -- Version 1.2.8
+
+ * Linux version once again builds with PIE (position independent executable) flags
+ * Fixed bug in zerotier-idtool file sign and verify
+ * Fixed minor OSX app typo
+ * Merged alpha NetBSD support (mostly untested, so YMMV)
+ * Merged several minor typo and one-liner bug fixes
+
 # 2018-04-17 -- Version 1.2.6
 
  * Features and Core Improvements
diff --git a/artwork/AppIcon_1024x1024.png b/artwork/AppIcon_1024x1024.png
new file mode 100644
index 00000000..dc0ba2fc
--- /dev/null
+++ b/artwork/AppIcon_1024x1024.png
diff --git a/artwork/AppIcon_20x20.png b/artwork/AppIcon_20x20.png
new file mode 100644
index 00000000..bb10b478
--- /dev/null
+++ b/artwork/AppIcon_20x20.png
diff --git a/artwork/AppIcon_60x60.png b/artwork/AppIcon_60x60.png
new file mode 100644
index 00000000..bb46ae75
--- /dev/null
+++ b/artwork/AppIcon_60x60.png
diff --git a/debian/changelog b/debian/changelog
index b13e179a..bc89ab07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zerotier-one (1.2.8) unstable; urgency=medium
+
+  * See https://github.com/zerotier/ZeroTierOne for release notes.
+
+ -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 27 Apr 2018 01:00:00 -0700
+
 zerotier-one (1.2.6) unstable; urgency=medium
 
   * See https://github.com/zerotier/ZeroTierOne for release notes.
diff --git a/debian/compat b/debian/compat
index f11c82a4..301160a9 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
\ No newline at end of file
+8
\ No newline at end of file
diff --git a/debian/control b/debian/control
index a9554f19..1eb147e0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
 Section: net
 Priority: optional
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), dh-systemd
+Build-Depends: debhelper (>= 9)
 Vcs-Git: git://github.com/zerotier/ZeroTierOne
 Vcs-Browser: https://github.com/zerotier/ZeroTierOne
 Homepage: https://www.zerotier.com/
diff --git a/debian/control.wheezy b/debian/control.wheezy
index f14c8760..a8e24084 100644
--- a/debian/control.wheezy
+++ b/debian/control.wheezy
@@ -3,7 +3,7 @@ Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
 Section: net
 Priority: optional
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper
 Vcs-Git: git://github.com/zerotier/ZeroTierOne
 Vcs-Browser: https://github.com/zerotier/ZeroTierOne
 Homepage: https://www.zerotier.com/
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index 59c22dde..1083d47b 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj
@@ -664,7 +664,7 @@
 			<key>USE_HFS+_COMPRESSION</key>
 			<false/>
 			<key>VERSION</key>
-			<string>1.2.6</string>
+			<string>1.2.8</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>
diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
index f75edaed..d160a167 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:{BCCDCFD7-34FA-473E-9E50-20314D1017F6} " Type="16"/>

+    <ROW Property="ProductCode" Value="1033:{D70A2F09-236E-4BB0-8BD9-9E08EA43824B} " Type="16"/>

     <ROW Property="ProductLanguage" Value="1033"/>

     <ROW Property="ProductName" Value="ZeroTier One"/>

-    <ROW Property="ProductVersion" Value="1.2.6" Type="32"/>

+    <ROW Property="ProductVersion" Value="1.2.8" 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="{A4BB4E68-0DD2-4052-BE60-CDCCB9BAC409}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>

+    <ROW Component="AI_CustomARPName" ComponentId="{3579DC29-4B25-4F56-A1D5-AFDE6883AA9C}" 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="6"/>

+    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="8"/>

     <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="2"/>

diff --git a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
index 3d090a7b..c0112029 100644
--- a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
+++ b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
@@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- version should MATCH as closely as possible with the underlying software -->
     <!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
     <!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
-    <version>1.2.6</version>
+    <version>1.2.8</version>
     <!-- <packageSourceUrl>Where is this Chocolatey package located (think GitHub)? packageSourceUrl is highly recommended for the community feed</packageSourceUrl>-->
     <!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
     <!--<owners>ZeroTier, Inc.</owners>-->
diff --git a/make-linux.mk b/make-linux.mk
index c8474a44..1590828c 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -358,6 +358,9 @@ uninstall:	FORCE
 debian:	FORCE
 	debuild -I -i -us -uc -nc -b
 
+debian-clean: FORCE
+	rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one
+
 redhat:	FORCE
 	rpmbuild -ba zerotier-one.spec
 
diff --git a/version.h b/version.h
index 064f2585..c82986fe 100644
--- a/version.h
+++ b/version.h
@@ -40,7 +40,7 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 6
+#define ZEROTIER_ONE_VERSION_REVISION 8
 
 /**
  * Build version
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index 39213b73..3e83c2e2 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.2.6"/>
+                    <Run FontSize="14" Text="Version 1.2.8"/>
                     <LineBreak/>
                     <Run FontSize="14" Text="(c) 2011-2017 ZeroTier, Inc."/>
                     <LineBreak/>
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 2e78cba9..bc8eaf80 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
 Name:           zerotier-one
-Version:        1.2.6
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        ZeroTier One network virtualization service