Merge branch 'dev' into zeroidc

.github/workflows/badstrings.yml

@@ -1,17 +0,0 @@
-name: badstrings
-on: [pull_request, push]
-jobs:
-  badstrings:
-    runs-on: ubuntu-latest
-    steps:
-      - name: scanning commit message for bad strings
-        run: |
-          #!/bin/bash
-          set -euo pipefail
-          IFS=$'\n\t'
-          message="${{ github.event.head_commit.message }}"
-          
-          strings=($(curl -s https://raw.githubusercontent.com/someara/badstrings/main/strings.txt))
-          for i in ${strings[@]} ; do
-            echo "${message}" | grep -v "$i" &>/dev/null;
-          done

debian/changelog

@@ -1,3 +1,9 @@
+zerotier-one (1.8.5) unstable; urgency=medium
+
+  * See RELEASE-NOTES.md for release notes.
+
+ -- Adam Ierymenko <[email protected]>  Fri, 17 Dec 2021 01:00:00 -0700
+
 zerotier-one (1.8.4) unstable; urgency=medium
 
   * See RELEASE-NOTES.md for release notes.

ext/installfiles/linux/zerotier-containerized/Dockerfile

@@ -7,11 +7,11 @@ FROM debian:buster-slim as builder
 RUN apt-get update && apt-get install -y curl gnupg
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0x1657198823e52a61  && \
     echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
-RUN apt-get update && apt-get install -y zerotier-one=1.6.2
+RUN apt-get update && apt-get install -y zerotier-one=1.8.4
 COPY ext/installfiles/linux/zerotier-containerized/main.sh /var/lib/zerotier-one/main.sh
 
 FROM debian:buster-slim
-LABEL version="1.6.3"
+LABEL version="1.8.4"
 LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts."
 
 # ZeroTier relies on UDP port 9993

ext/installfiles/mac/ZeroTier One.pkgproj

@@ -701,7 +701,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.8.4</string>
+				<string>1.8.5</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>

version.h

@@ -27,7 +27,7 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 4
+#define ZEROTIER_ONE_VERSION_REVISION 5
 
 /**
  * Build version

zerotier-one.spec

@@ -1,5 +1,5 @@
 Name:           zerotier-one
-Version:        1.8.4
+Version:        1.8.5
 Release:        1%{?dist}
 Summary:        ZeroTier network virtualization service
 
@@ -152,6 +152,9 @@ esac
 %endif
 
 %changelog
+* Fri Dec 17 2021 Adam Ierymenko <[email protected]> - 1.8.5
+- see https://github.com/zerotier/ZeroTierOne for release notes
+
 * Tue Nov 23 2021 Adam Ierymenko <[email protected]> - 1.8.4
 - see https://github.com/zerotier/ZeroTierOne for release notes