Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/workflows/multi-arch-test-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Test Build

on: [push, pull_request]

jobs:
build:
name: ${{ matrix.arch }} build
runs-on: ubuntu-latest
strategy:
matrix:
arch:
- x86_64
- mips_24kc
- mipsel_24kc

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Build
uses: openwrt/gh-action-sdk@main
env:
ARCH: ${{ matrix.arch }}
PACKAGES: zerotier
V: s

- name: Store packages
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.arch }}-packages
path: bin/packages/${{ matrix.arch }}/action/*.apk

- name: Store logs
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.arch }}-logs
path: |
logs/
PKG-INFO
4 changes: 2 additions & 2 deletions zerotier/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=zerotier
PKG_VERSION:=1.14.1
PKG_VERSION:=1.16.0
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
PKG_HASH:=4f9f40b27c5a78389ed3f3216c850921f6298749e5819e9f2edabb2672ce9ca0
PKG_HASH:=aa9de313d365bf0efb3871aaa56f2d323a08f46df47b627c4eff4f4203fa7fc5
PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)

PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
Expand Down
8 changes: 4 additions & 4 deletions zerotier/patches/0001-fix-miniupnpc-natpmp-include-path.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From ec02787ae7c5b6e906ab50bcebcd676d4219c812 Mon Sep 17 00:00:00 2001
From f3e384fbf686847850ba63e56054e00ba321c48c Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Tue, 17 Sep 2024 14:17:08 +0200
Date: Fri, 12 Sep 2025 11:07:23 +0200
Subject: [PATCH 1/5] fix miniupnpc natpmp include path

---
Expand All @@ -9,7 +9,7 @@ Subject: [PATCH 1/5] fix miniupnpc natpmp include path

--- a/make-linux.mk
+++ b/make-linux.mk
@@ -26,8 +26,8 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M")
@@ -41,8 +41,8 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M")
# otherwise build into binary as done on Mac and Windows.
ONE_OBJS+=osdep/PortMapper.o
override DEFS+=-DZT_USE_MINIUPNPC
Expand All @@ -20,7 +20,7 @@ Subject: [PATCH 1/5] fix miniupnpc natpmp include path
ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
LDLIBS+=-lminiupnpc
@@ -35,7 +35,7 @@ else
@@ -50,7 +50,7 @@ else
override DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING="\"Linux\"" -DMINIUPNPC_VERSION_STRING="\"2.0\"" -DUPNP_VERSION_STRING="\"UPnP/1.1\"" -DENABLE_STRNATPMPERR
ONE_OBJS+=ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o
endif
Expand Down
8 changes: 4 additions & 4 deletions zerotier/patches/0002-remove-PIE-options.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 81a632c99b581790344729ad327eb473c4c05260 Mon Sep 17 00:00:00 2001
From f4c0a10fca2b4e5d2e56c9b489ce812dd2fd2b0a Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Tue, 17 Sep 2024 15:36:36 +0200
Date: Fri, 12 Sep 2025 11:12:27 +0200
Subject: [PATCH 2/5] remove PIE options

---
Expand All @@ -9,7 +9,7 @@ Subject: [PATCH 2/5] remove PIE options

--- a/make-linux.mk
+++ b/make-linux.mk
@@ -333,7 +333,7 @@ ifeq ($(ZT_CONTROLLER),1)
@@ -359,7 +359,7 @@ ifeq ($(ZT_CONTROLLER),1)
endif

# ARM32 hell -- use conservative CFLAGS
Expand All @@ -18,7 +18,7 @@ Subject: [PATCH 2/5] remove PIE options
ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
override CFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
@@ -360,8 +360,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
@@ -390,8 +390,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
endif

# Position Independence
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 71ed5b791fb0f7bfe1f564726fdc979b71313fbe Mon Sep 17 00:00:00 2001
From 8d1f35972534da800a6e2b468bfc2a64098ce427 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Tue, 17 Sep 2024 15:38:01 +0200
Date: Fri, 12 Sep 2025 10:35:32 +0200
Subject: [PATCH 3/5] fix compilation for arm_cortex a7 neon

---
Expand All @@ -9,12 +9,12 @@ Subject: [PATCH 3/5] fix compilation for arm_cortex a7 neon

--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -123,7 +123,7 @@
#include <immintrin.h>
@@ -118,7 +118,7 @@
#include <xmmintrin.h>
#endif

-#if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON))
+#if (defined(__aarch64__) || defined(ZT_ARCH_ARM_HAS_NEON))
#if (defined(__APPLE__) && !defined(__LP64__)) || (defined(__ANDROID__) && defined(__arm__))
#if (defined(__APPLE__) && ! defined(__LP64__)) || (defined(__ANDROID__) && defined(__arm__))
#ifdef ZT_ARCH_ARM_HAS_NEON
#undef ZT_ARCH_ARM_HAS_NEON
4 changes: 2 additions & 2 deletions zerotier/patches/0004-add-missing-libatomic.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From d6197554b3f52ee9d8d81374141aa82014b4fc7b Mon Sep 17 00:00:00 2001
From 25f065c6e59ca61d86099365b0099d415362f122 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Tue, 17 Sep 2024 15:38:34 +0200
Date: Fri, 12 Sep 2025 11:15:43 +0200
Subject: [PATCH 4/5] add missing libatomic

---
Expand Down
6 changes: 3 additions & 3 deletions zerotier/patches/0005-remove-noexecstack.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 8e89af98ac00b1c9c019865faca7479fa0de6084 Mon Sep 17 00:00:00 2001
From f781df4a2c4f5a7b5877dd6fed95316c8a9ad58c Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Tue, 17 Sep 2024 21:26:08 +0200
Date: Fri, 12 Sep 2025 11:17:47 +0200
Subject: [PATCH 5/5] remove noexecstack

---
Expand All @@ -9,7 +9,7 @@ Subject: [PATCH 5/5] remove noexecstack

--- a/make-linux.mk
+++ b/make-linux.mk
@@ -364,7 +364,7 @@ endif
@@ -394,7 +394,7 @@ endif
#override CXXFLAGS+=-fPIC -fPIE

# Non-executable stack
Expand Down