⬆️ Upgrades ZeroTier One to 1.6.0

.gitlab-ci.yml

@@ -6,8 +6,8 @@ variables:
   ADDON_SLUG: "zerotier"
   ADDON_TARGET: "zerotier"
 
-  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:8.0.1"
-  ADDON_AMD64_BASE: "hassioaddons/base-amd64:8.0.1"
-  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:8.0.1"
-  ADDON_ARMV7_BASE: "hassioaddons/base-armv7:8.0.1"
-  ADDON_I386_BASE: "hassioaddons/base-i386:8.0.1"
+  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:8.0.6"
+  ADDON_AMD64_BASE: "hassioaddons/base-amd64:8.0.6"
+  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:8.0.6"
+  ADDON_ARMV7_BASE: "hassioaddons/base-armv7:8.0.6"
+  ADDON_I386_BASE: "hassioaddons/base-i386:8.0.6"

zerotier/Dockerfile

@@ -1,13 +1,10 @@
-ARG BUILD_FROM=hassioaddons/base:8.0.1
+ARG BUILD_FROM=hassioaddons/base:8.0.6
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# We need to copy in the patches need during build
-COPY rootfs/patches /patches
-
 # Setup base
 # hadolint ignore=DL3003
 RUN \
@@ -20,16 +17,15 @@ RUN \
         libgcc=9.3.0-r2 \
         libstdc++=9.3.0-r2 \
     \
-    && git clone --branch "1.4.6" --depth=1 \
+    && git clone --branch "1.6.0" --depth=1 \
         "https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
     \
     && cd /tmp/zerotier \
-    && patch -p1 < /patches/ZeroTierOne/gcc9-compat.patch \
     && make \
     && make install \
     \
-    && rm -f -r /tmp/* \
-    && apk del --purge .build-dependencies
+    && apk del --no-cache --purge .build-dependencies \
+    && rm -f -r /tmp/*
 
 # Copy root filesystem
 COPY rootfs /

zerotier/build.json

@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "hassioaddons/base-aarch64:8.0.1",
-    "amd64": "hassioaddons/base-amd64:8.0.1",
-    "armhf": "hassioaddons/base-armhf:8.0.1",
-    "armv7": "hassioaddons/base-armv7:8.0.1",
-    "i386": "hassioaddons/base-i386:8.0.1"
+    "aarch64": "hassioaddons/base-aarch64:8.0.6",
+    "amd64": "hassioaddons/base-amd64:8.0.6",
+    "armhf": "hassioaddons/base-armhf:8.0.6",
+    "armv7": "hassioaddons/base-armv7:8.0.6",
+    "i386": "hassioaddons/base-i386:8.0.6"
   },
   "args": {}
 }

zerotier/rootfs/patches/ZeroTierOne/gcc9-compat.patch

@@ -1,21 +0,0 @@
-diff --git a/make-linux.mk b/make-linux.mk
-index 9fd4f7b9..c409ce0b 100644
---- a/make-linux.mk
-+++ b/make-linux.mk
-@@ -260,12 +260,12 @@ endif
- # ARM32 hell -- use conservative CFLAGS
- ifeq ($(ZT_ARCHITECTURE),3)
- 	ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
--		override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
--		override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
-+		override CFLAGS+=-march=armv6 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
-+		override CXXFLAGS+=-march=armv6 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
- 	else
--		override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
--		override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
-+		override CFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
-+		override CXXFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
- 	endif
- endif