Index: head/net/yggdrasil/Makefile =================================================================== --- head/net/yggdrasil/Makefile (revision 551856) +++ head/net/yggdrasil/Makefile (revision 551857) @@ -1,52 +1,53 @@ # $FreeBSD$ PORTNAME= yggdrasil DISTVERSIONPREFIX= v -DISTVERSION= 0.3.14 +DISTVERSION= 0.3.15 CATEGORIES= net MAINTAINER= freebsd@neilalexander.dev COMMENT= Experimental end-to-end encrypted self-arranging IPv6 network LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules USE_GITHUB= yes GH_ACCOUNT= yggdrasil-network GH_PROJECT= yggdrasil-go GH_TUPLE= \ Arceliar:phony:d0c68492aca0:arceliar_phony/vendor/github.com/Arceliar/phony \ VividCortex:ewma:v1.1.1:vividcortex_ewma/vendor/github.com/VividCortex/ewma \ cheggaaa:pb:v3.0.4:cheggaaa_pb_v3/vendor/github.com/cheggaaa/pb \ fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \ golang:crypto:2aa609cf4a9d:golang_crypto/vendor/golang.org/x/crypto \ golang:net:244492dfa37a:golang_net/vendor/golang.org/x/net \ golang:sys:5c8b2ff67527:golang_sys/vendor/golang.org/x/sys \ golang:text:929e72ca90de:golang_text/vendor/golang.org/x/text \ gologme:log:4e5d8ccb38e8:gologme_log/vendor/github.com/gologme/log \ hashicorp:go-syslog:v1.0.0:hashicorp_go_syslog/vendor/github.com/hashicorp/go-syslog \ - hjson:hjson-go:9147687966d9:hjson_hjson_go/vendor/github.com/hjson/hjson-go \ + hjson:hjson-go:d5d0e8b0617d:hjson_hjson_go/vendor/github.com/hjson/hjson-go \ kardianos:minwinsvc:cad6b2b879b0:kardianos_minwinsvc/vendor/github.com/kardianos/minwinsvc \ mattn:go-colorable:v0.1.2:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ mattn:go-isatty:v0.0.10:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ mattn:go-runewidth:v0.0.7:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ vishvananda:netlink:v1.0.0:vishvananda_netlink/vendor/github.com/vishvananda/netlink \ vishvananda:netns:7109fa855b0f:vishvananda_netns/vendor/github.com/vishvananda/netns \ - wireguard:wireguard-go:v0.0.20200320:wireguard_wireguard_go/vendor/golang.zx2c4.com/wireguard + wireguard:wireguard-go:v0.0.20200320:wireguard_wireguard_go/vendor/golang.zx2c4.com/wireguard \ + WireGuard:wireguard-windows:v0.1.0:wireguard_wireguard_windows/vendor/golang.zx2c4.com/wireguard/windows GO_TARGET= ./cmd/yggdrasil \ ./cmd/yggdrasilctl GO_BUILDFLAGS= -ldflags="-s -w \ -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${PORTNAME} \ -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${PORTVERSION} \ " PLIST_FILES= bin/yggdrasil \ bin/yggdrasilctl USE_RC_SUBR= yggdrasil .include Index: head/net/yggdrasil/distinfo =================================================================== --- head/net/yggdrasil/distinfo (revision 551856) +++ head/net/yggdrasil/distinfo (revision 551857) @@ -1,41 +1,43 @@ -TIMESTAMP = 1591539050 -SHA256 (yggdrasil-network-yggdrasil-go-v0.3.14_GH0.tar.gz) = e8579a04bf289434e7b8caaf621e2c0b853e83cc06f136c4f9e4bfc667df5a27 -SIZE (yggdrasil-network-yggdrasil-go-v0.3.14_GH0.tar.gz) = 165211 +TIMESTAMP = 1601220969 +SHA256 (yggdrasil-network-yggdrasil-go-v0.3.15_GH0.tar.gz) = 25ea85399a142aa7a3d6f6886fd4e0d215116c4c8c33453de43999787d735565 +SIZE (yggdrasil-network-yggdrasil-go-v0.3.15_GH0.tar.gz) = 166072 SHA256 (Arceliar-phony-d0c68492aca0_GH0.tar.gz) = 10a586be941ff65576fd97548cdea7087a5d6d85c99c1b69bc77301d41179e67 SIZE (Arceliar-phony-d0c68492aca0_GH0.tar.gz) = 6835 SHA256 (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 3b2d62412b7ba2726a379cc0ae557595c027dc8206d0ef98f13831281b8f2b85 SIZE (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 6042 SHA256 (cheggaaa-pb-v3.0.4_GH0.tar.gz) = a781c6ca68580ba99d5e146405290abf4547e6155ba229fefd66d162874e6060 SIZE (cheggaaa-pb-v3.0.4_GH0.tar.gz) = 29954 SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755 SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449 SHA256 (golang-crypto-2aa609cf4a9d_GH0.tar.gz) = 5fe90bd9def2114d4772a2e394ac1a5e015b2bca17678f358371f93eb332536e SIZE (golang-crypto-2aa609cf4a9d_GH0.tar.gz) = 1726702 SHA256 (golang-net-244492dfa37a_GH0.tar.gz) = 511fcc4f88e15cf97dccca6ea4bdde6d240ebd7e1b14212a0447fc4f5b54031c SIZE (golang-net-244492dfa37a_GH0.tar.gz) = 1172556 SHA256 (golang-sys-5c8b2ff67527_GH0.tar.gz) = 9f8cc5b07a664262b956c4f687e6078da265e119a093bb542d3bd132afef2db6 SIZE (golang-sys-5c8b2ff67527_GH0.tar.gz) = 1040138 SHA256 (golang-text-929e72ca90de_GH0.tar.gz) = 7f50c36d2c3a7a05921df33e61006703776959fcf0d16d834232af03444f48cd SIZE (golang-text-929e72ca90de_GH0.tar.gz) = 7745335 SHA256 (gologme-log-4e5d8ccb38e8_GH0.tar.gz) = d5873e95bd5459d9a4813e7020236f15db01277ffba0abfc9f80c5bac7477157 SIZE (gologme-log-4e5d8ccb38e8_GH0.tar.gz) = 5613 SHA256 (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = be4bda814c068311ea8e185e2d108077f167897cfa868ada7f56d97a10f3d602 SIZE (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) = 4517 -SHA256 (hjson-hjson-go-9147687966d9_GH0.tar.gz) = 784f53c32a62cad8ec6c03243b7531d8f16a4ce9ddec61b4615442709a955d84 -SIZE (hjson-hjson-go-9147687966d9_GH0.tar.gz) = 25559 +SHA256 (hjson-hjson-go-d5d0e8b0617d_GH0.tar.gz) = 78f0e0b7c73705e32540bd1d1d954965585144d95867603b7a0475d13ae3298d +SIZE (hjson-hjson-go-d5d0e8b0617d_GH0.tar.gz) = 25621 SHA256 (kardianos-minwinsvc-cad6b2b879b0_GH0.tar.gz) = 820c068dfee3306853cb6cc63becb96b9f972a14a97ad71df3332f98bc4866cb SIZE (kardianos-minwinsvc-cad6b2b879b0_GH0.tar.gz) = 1804 SHA256 (mattn-go-colorable-v0.1.2_GH0.tar.gz) = a7189bd9005c571303b117261955ce53b0e2aa89fe415e2289659be343fe1651 SIZE (mattn-go-colorable-v0.1.2_GH0.tar.gz) = 8518 SHA256 (mattn-go-isatty-v0.0.10_GH0.tar.gz) = 55408e1afd78eaa112842ae2263e70703d5b5133feaa17fa477980a87a961fe7 SIZE (mattn-go-isatty-v0.0.10_GH0.tar.gz) = 4465 SHA256 (mattn-go-runewidth-v0.0.7_GH0.tar.gz) = 09270ddb93b2d77d4b3903bbadacbb3a3d4f0cce93c373fb21503840829d8697 SIZE (mattn-go-runewidth-v0.0.7_GH0.tar.gz) = 16089 SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980 SHA256 (vishvananda-netlink-v1.0.0_GH0.tar.gz) = a621be56e9a161eae72bc9f14849fef9a23076af87e6c0997d1cdf4208530a2a SIZE (vishvananda-netlink-v1.0.0_GH0.tar.gz) = 119941 SHA256 (vishvananda-netns-7109fa855b0f_GH0.tar.gz) = c7b2eb08c983dfc2c2deeaec182e1cfd24fb5ff22f7448fc30f6a9480bbb9b3f SIZE (vishvananda-netns-7109fa855b0f_GH0.tar.gz) = 7868 SHA256 (wireguard-wireguard-go-v0.0.20200320_GH0.tar.gz) = a40f5ca7c33b0d631c2777b992d7a398491bc4d72ed1e559a86055637a708844 SIZE (wireguard-wireguard-go-v0.0.20200320_GH0.tar.gz) = 96760 +SHA256 (WireGuard-wireguard-windows-v0.1.0_GH0.tar.gz) = 92b9f99d06843ef49aef4b5798dc4531220c79b3c11d02d1f7ad4ffb2071e1aa +SIZE (WireGuard-wireguard-windows-v0.1.0_GH0.tar.gz) = 191555 Index: head/net/yggdrasil/files/yggdrasil.in =================================================================== --- head/net/yggdrasil/files/yggdrasil.in (revision 551856) +++ head/net/yggdrasil/files/yggdrasil.in (revision 551857) @@ -1,78 +1,41 @@ #!/bin/sh # # PROVIDE: yggdrasil # REQUIRE: networking # KEYWORD: shutdown . /etc/rc.subr name="yggdrasil" rcvar="yggdrasil_enable" start_cmd="${name}_start" -start_precmd="${name}_prestart" -stop_cmd="${name}_stop" -stop_postcmd="${name}_poststop" pidfile="/var/run/yggdrasil/${name}.pid" command="/usr/sbin/daemon" -command_args="-P ${pidfile} -r -f ${yggdrasil_command}" +command_args="-P ${pidfile} -r" -yggdrasil_prestart() +yggdrasil_start() { test ! -x %%PREFIX%%/bin/yggdrasil && ( logger -s -t yggdrasil "Warning: %%PREFIX%%/bin/yggdrasil is missing or not executable" logger -s -t yggdrasil "Copy the yggdrasil binary into %%PREFIX%%/bin and then chmod +x %%PREFIX%%/bin/yggdrasil" return 1 ) test ! -f %%PREFIX%%/etc/yggdrasil.conf && ( logger -s -t yggdrasil "Generating new configuration file into %%PREFIX%%/etc/yggdrasil.conf" %%PREFIX%%/bin/yggdrasil -genconf > %%PREFIX%%/etc/yggdrasil.conf ) - tap_path="$(cat %%PREFIX%%/etc/yggdrasil.conf | egrep -o '/dev/tap[0-9]{1,2}$')" - tap_name="$(echo -n ${tap_path} | tr -d '/dev/')" - - /sbin/ifconfig ${tap_name} >/dev/null 2>&1 || ( - logger -s -t yggdrasil "Creating ${tap_name} adapter" - /sbin/ifconfig ${tap_name} create || logger -s -t yggdrasil "Failed to create ${tap_name} adapter" - ) - mkdir -p /var/run/yggdrasil -} -yggdrasil_start() -{ - /sbin/ifconfig ${tap_name} >/dev/null 2>&1 || ( - logger -s -t yggdrasil "Creating ${tap_name} adapter" - /sbin/ifconfig ${tap_name} create || logger -s -t yggdrasil "Failed to create ${tap_name} adapter" - ) - logger -s -t yggdrasil "Starting yggdrasil" ${command} ${command_args} %%PREFIX%%/bin/yggdrasil -useconffile %%PREFIX%%/etc/yggdrasil.conf \ - 1>/var/log/yggdrasil.stdout.log \ - 2>/var/log/yggdrasil.stderr.log & -} - -yggdrasil_stop() -{ - logger -s -t yggdrasil "Stopping yggdrasil" - test -f /var/run/yggdrasil/${name}.pid && kill -TERM $(cat /var/run/yggdrasil/${name}.pid) -} - -yggdrasil_poststop() -{ - tap_path="$(cat %%PREFIX%%/etc/yggdrasil.conf | grep /dev/tap | egrep -o '/dev/.*$')" - tap_name="$(echo -n ${tap_path} | tr -d '/dev/')" - - /sbin/ifconfig ${tap_name} >/dev/null 2>&1 && ( - logger -s -t yggdrasil "Destroying ${tap_name} adapter" - /sbin/ifconfig ${tap_name} destroy || logger -s -t yggdrasil "Failed to destroy ${tap_name} adapter" - ) + -logto /var/log/yggdrasil.log } load_rc_config $name : ${yggdrasil_enable:=no} run_rc_command "$1"