Version bumps, and fix Debian so default is to build normally and .static files are used in our builds.

RELEASE-NOTES.md

@@ -1,6 +1,16 @@
 ZeroTier Release Notes
 ======
 
+# 2017-03-17 -- Version 1.2.2
+
+Version 1.2.2 fixes a few bugs discovered after the 1.2.0 release. These are:
+
+ * A bug causing unreliable multicast propagation (GitHub issue #461).
+ * A crash in ARM binaries due to a build chain and flags problem.
+ * A bug in the network controller preventing members from being listed (GitHub issue #460).
+
+------
+
 # 2017-03-14 -- Version 1.2.0
 
 Version 1.2.0 is a major milestone release representing almost nine months of work. It includes our rules engine for distributed network packet filtering and security monitoring, federated roots, and many other architectural and UI improvements and bug fixes.

debian/changelog

@@ -1,3 +1,9 @@
+zerotier-one (1.2.2) unstable; urgency=medium
+
+  * See https://github.com/zerotier/ZeroTierOne for release notes.
+
+ -- Adam Ierymenko <[email protected]>  Fri, 17 Mar 2017 01:00:00 -0700
+
 zerotier-one (1.2.0) unstable; urgency=medium
 
   * See https://github.com/zerotier/ZeroTierOne for release notes.

debian/rules

@@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
 	dh $@ --with systemd
 
 override_dh_auto_build:
-#	make -j 2
+	make -j 2
 
 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade

debian/rules.static

@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+CFLAGS=-O3 -fstack-protector-strong
+CXXFLAGS=-O3 -fstack-protector-strong
+
+%:
+	dh $@ --with systemd
+
+override_dh_auto_build:
+#	make -j 2
+
+override_dh_systemd_start:
+	dh_systemd_start --restart-after-upgrade
+
+override_dh_installinit:
+	dh_installinit --name=zerotier-one -- defaults

debian/rules.wheezy

@@ -7,5 +7,5 @@ CXXFLAGS=-O3 -fstack-protector
 	dh $@
 
 override_dh_auto_build:
-#	make -j 2
+	make -j 2
 

debian/rules.wheezy.static

@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+CFLAGS=-O3 -fstack-protector
+CXXFLAGS=-O3 -fstack-protector
+
+%:
+	dh $@
+
+override_dh_auto_build:
+#	make -j 2
+

ext/installfiles/mac/ZeroTier One.pkgproj

@@ -646,7 +646,7 @@
 			<key>OVERWRITE_PERMISSIONS</key>
 			<false/>
 			<key>VERSION</key>
-			<string>1.2.0</string>
+			<string>1.2.2</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>

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.0</version>
+    <version>1.2.2</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>-->

selftest.cpp

@@ -582,8 +582,34 @@ static int testPacket()
 	return 0;
 }
 
+static void _testExcept(int &depth)
+{
+	if (depth >= 16) {
+		throw std::runtime_error("LOL!");
+	} else {
+		++depth;
+		_testExcept(depth);
+	}
+}
+
 static int testOther()
 {
+	std::cout << "[other] Testing C++ exceptions... "; std::cout.flush();
+	int depth = 0;
+	try {
+		_testExcept(depth);
+	} catch (std::runtime_error &e) {
+		if (depth == 16) {
+			std::cout << "OK" << std::endl;
+		} else {
+			std::cout << "ERROR (depth not 16)" << std::endl;
+			return -1;
+		}
+	} catch ( ... ) {
+		std::cout << "ERROR (exception not std::runtime_error)" << std::endl;
+		return -1;
+	}
+
 	std::cout << "[other] Testing Hashtable... "; std::cout.flush();
 	{
 		Hashtable<uint64_t,std::string> ht;

zerotier-one.spec

@@ -1,5 +1,5 @@
 Name:           zerotier-one
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        ZeroTier One network virtualization service
 
@@ -145,6 +145,9 @@ esac
 %endif
 
 %changelog
+* Fri Mar 17 2017 Adam Ierymenko <[email protected]> - 1.2.2-0.1
+- see https://github.com/zerotier/ZeroTierOne for release notes
+
 * Tue Mar 14 2017 Adam Ierymenko <[email protected]> - 1.2.0-0.1
 - see https://github.com/zerotier/ZeroTierOne for release notes