Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9903 from mwarning/zerotier

Browse source 
zerotier: update to 1.4.4
This commit is contained in:
Rosen Penev 2019-09-03 11:56:16 -07:00 committed by GitHub
commit 8c6373f74e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/zerotier/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=zerotier PKG_NAME:=zerotier
PKG_VERSION:=1.4.2 PKG_VERSION:=1.4.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? 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_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)
PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de> PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
@ -54,7 +54,7 @@ endef
# Make binary smaller # Make binary smaller
TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
ifdef CONFIG_USE_UCLIBC ifdef CONFIG_USE_UCLIBC
TARGET_CFLAGS += -D'valloc(a)=aligned_alloc(getpagesize(),a)' TARGET_CFLAGS += -D'valloc(a)=aligned_alloc(getpagesize(),a)'

3
net/zerotier/files/etc/config/zerotier
View file

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

7
net/zerotier/files/etc/init.d/zerotier
View file

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