Date: Sat, 10 Oct 2020 06:37:36 +0000 (UTC) From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= <lbartoletti@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551857 - in head/net/yggdrasil: . files Message-ID: <202010100637.09A6ba9x019593@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lbartoletti Date: Sat Oct 10 06:37:36 2020 New Revision: 551857 URL: https://svnweb.freebsd.org/changeset/ports/551857 Log: net/yggdrasil: Update to 0.3.15 Changelog: - https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.3.15 PR: 249945 Submitted by: rlwestlund@gmail.com Approved by: Neil Alexander (maintainer) Modified: head/net/yggdrasil/Makefile head/net/yggdrasil/distinfo head/net/yggdrasil/files/yggdrasil.in Modified: head/net/yggdrasil/Makefile ============================================================================== --- head/net/yggdrasil/Makefile Sat Oct 10 06:32:23 2020 (r551856) +++ head/net/yggdrasil/Makefile Sat Oct 10 06:37:36 2020 (r551857) @@ -2,7 +2,7 @@ PORTNAME= yggdrasil DISTVERSIONPREFIX= v -DISTVERSION= 0.3.14 +DISTVERSION= 0.3.15 CATEGORIES= net MAINTAINER= freebsd@neilalexander.dev @@ -26,7 +26,7 @@ GH_TUPLE= \ 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 \ @@ -34,7 +34,8 @@ GH_TUPLE= \ 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 Modified: head/net/yggdrasil/distinfo ============================================================================== --- head/net/yggdrasil/distinfo Sat Oct 10 06:32:23 2020 (r551856) +++ head/net/yggdrasil/distinfo Sat Oct 10 06:37:36 2020 (r551857) @@ -1,6 +1,6 @@ -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 @@ -21,8 +21,8 @@ SHA256 (gologme-log-4e5d8ccb38e8_GH0.tar.gz) = d5873e9 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 @@ -39,3 +39,5 @@ SHA256 (vishvananda-netns-7109fa855b0f_GH0.tar.gz) = c 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 Modified: head/net/yggdrasil/files/yggdrasil.in ============================================================================== --- head/net/yggdrasil/files/yggdrasil.in Sat Oct 10 06:32:23 2020 (r551856) +++ head/net/yggdrasil/files/yggdrasil.in Sat Oct 10 06:37:36 2020 (r551857) @@ -10,15 +10,12 @@ 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" @@ -31,45 +28,11 @@ yggdrasil_prestart() %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010100637.09A6ba9x019593>