Browse Source

Merge pull request #9903 from mwarning/zerotier

zerotier: update to 1.4.4
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
8c6373f74e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
  1. +3
    -3
      net/zerotier/Makefile
  2. +3
    -0
      net/zerotier/files/etc/config/zerotier
  3. +6
    -1
      net/zerotier/files/etc/init.d/zerotier

+ 3
- 3
net/zerotier/Makefile View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zerotier
PKG_VERSION:=1.4.2
PKG_VERSION:=1.4.4
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:=557a444127812384265ec97232bae43dce1d4b1545ddd72e2b1646c971dad7c5
PKG_HASH:=0c11aab77b1c30fb8932e31906fc93fe7cb38c579c33740c1d407ec13d5b3e12
PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)
PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
@ -54,7 +54,7 @@ endef
# Make binary smaller
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
ifdef CONFIG_USE_UCLIBC
TARGET_CFLAGS += -D'valloc(a)=aligned_alloc(getpagesize(),a)'


+ 3
- 0
net/zerotier/files/etc/config/zerotier View File

@ -7,6 +7,9 @@ config zerotier sample_config
#option port '9993'
# path to the local.conf
#option local_conf '/etc/zerotier.conf'
# Generate secret on first start
option secret ''


+ 6
- 1
net/zerotier/files/etc/init.d/zerotier View File

@ -14,7 +14,7 @@ section_enabled() {
start_instance() {
local cfg="$1"
local port secret config_path path
local port secret config_path local_conf path
local args=""
if ! section_enabled "$cfg"; then
@ -25,6 +25,7 @@ start_instance() {
config_get config_path $cfg 'config_path'
config_get port $cfg 'port'
config_get secret $cfg 'secret'
config_get local_conf $cfg 'local_conf'
path=${CONFIG_PATH}_$cfg
@ -71,6 +72,10 @@ start_instance() {
rm -f $path/identity.public
fi
if [ -f "$local_conf" ]; then
ln -s "$local_conf" $path/local.conf
fi
add_join() {
# an (empty) config file will cause ZT to join a network
touch $path/networks.d/$1.conf


Loading…
Cancel
Save