Date: Tue, 17 Aug 2021 15:59:38 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 257301] net/yggdrasil: Update to 0.4.0 Message-ID: <bug-257301-7788-WBwkiIB2SX@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-257301-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-257301-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D257301 --- Comment #2 from David Hoppenbrouwers <david@salt-inc.org> --- Comment on attachment 226573 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D226573 Update to 0.4.0 diff -ruN /tmp/yggpatch/Makefile ./Makefile --- /tmp/yggpatch/Makefile 2021-07-20 23:35:07.077365000 +0200 +++ ./Makefile 2021-07-20 23:37:27.401902000 +0200 @@ -1,6 +1,8 @@ +# $FreeBSD: head/net/yggdrasil/Makefile 551857 2020-10-10 06:37:36Z lbartoletti $ + PORTNAME=3D yggdrasil DISTVERSIONPREFIX=3D v -DISTVERSION=3D 0.3.16 +DISTVERSION=3D 0.4.0 CATEGORIES=3D net MAINTAINER=3D freebsd@neilalexander.dev @@ -14,30 +16,32 @@ GH_ACCOUNT=3D yggdrasil-network GH_PROJECT=3D yggdrasil-go GH_TUPLE=3D \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 Arceliar:ironwood:6ad55cae5031:arceliar_ironwood/vendor/github.com/Arceliar= /ironwood \ =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 Arceliar:phony:dde1a8dca979:arceliar_phony/vendor/github.com/Arceliar/phony= \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 VividCortex:ewma:v1.1.1:vividcortex_ewma/vendor/github.com/VividCortex/ewma= \ - cheggaaa:pb:v3.0.6:cheggaaa_pb_v3/vendor/github.com/cheggaa= a/pb \ - fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/col= or \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 golang:crypto:5ea612d1eb83:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \ - golang:sys:8fe3ee5dd75b:golang_sys/vendor/golang.org/x/sys \ - golang:text:8f690f22cf1c:golang_text/vendor/golang.org/x/te= xt \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 gologme:log:4e5d8ccb38e8:gologme_log/vendor/github.com/gologme/log \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 VividCortex:ewma:v1.2.0:vividcortex_ewma/vendor/github.com/VividCortex/ewma= \ + cheggaaa:pb:v3.0.8:cheggaaa_pb_v3/vendor/github.com/cheggaa= a/pb \ + fatih:color:v1.12.0:fatih_color/vendor/github.com/fatih/col= or \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:84b48f89b13b:golang_net/vendor/golang.org/x/net \ + golang:sys:a4fc73990273:golang_sys/vendor/golang.org/x/sys \ + golang:text:5c7c50ebbd4f:golang_text/vendor/golang.org/x/te= xt \ + gologme:log:v1.2.0:gologme_log/vendor/github.com/gologme/lo= g \ =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 hashicorp:go-syslog:v1.0.0:hashicorp_go_syslog/vendor/github.com/hashicorp/= go-syslog \ =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 hjson:hjson-go:v3.1.0:hjson_hjson_go/vendor/github.com/hjson/hjson-go \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 kardianos:minwinsvc:cad6b2b879b0:kardianos_minwinsvc/vendor/github.com/kard= ianos/minwinsvc \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mattn:go-colorable:v0.1.2:mattn_go_colorable/vendor/github.com/mattn/go-col= orable \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mattn:go-isatty:v0.0.10:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mattn:go-runewidth:v0.0.7:mattn_go_runewidth/vendor/github.com/mattn/go-run= ewidth \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitc= hellh/mapstructure \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 vishvananda:netlink:v1.0.0:vishvananda_netlink/vendor/github.com/vishvanand= a/netlink \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 vishvananda:netns:7109fa855b0f:vishvananda_netns/vendor/github.com/vishvana= nda/netns \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 wireguard:wireguard-go:v0.0.20200320:wireguard_wireguard_go/vendor/golang.z= x2c4.com/wireguard \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 WireGuard:wireguard-windows:v0.1.0:wireguard_wireguard_windows/vendor/golan= g.zx2c4.com/wireguard/windows -USE_RC_SUBR=3D yggdrasil +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 kardianos:minwinsvc:v1.0.0:kardianos_minwinsvc/vendor/github.com/kardianos/= minwinsvc \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-col= orable \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mattn:go-isatty:v0.0.13:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-ru= newidth \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 mitchellh:mapstructure:v1.4.1:mitchellh_mapstructure/vendor/github.com/mitc= hellh/mapstructure \ + rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/unise= g \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 vishvananda:netlink:v1.1.0:vishvananda_netlink/vendor/github.com/vishvanand= a/netlink \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 vishvananda:netns:2eb08e3e575f:vishvananda_netns/vendor/github.com/vishvana= nda/netns \ +=20=20=20=20=20=20=20=20=20=20=20=20=20=20 wireguard:wireguard-go:f9b48a961cd2:wireguard_wireguard_go/vendor/golang.zx= 2c4.com/wireguard \ + GO_TARGET=3D ./cmd/yggdrasil \ ./cmd/yggdrasilctl + GO_BUILDFLAGS=3D -ldflags=3D"-s -w \ -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=3D${PORTNAM= E} \ -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=3D${PORT= VERSION} \ @@ -45,5 +49,7 @@ PLIST_FILES=3D bin/yggdrasil \ bin/yggdrasilctl + +USE_RC_SUBR=3D yggdrasil .include <bsd.port.mk> diff -ruN /tmp/yggpatch/distinfo ./distinfo --- /tmp/yggpatch/distinfo 2021-07-20 23:35:26.891494000 +0200 +++ ./distinfo 2021-07-20 23:02:20.568231000 +0200 @@ -1,43 +1,45 @@ -TIMESTAMP =3D 1617712629 -SHA256 (yggdrasil-network-yggdrasil-go-v0.3.16_GH0.tar.gz) =3D e03595b78906b171155aaa11c922be3418bd056f8547e4d9f5123b6047316eac -SIZE (yggdrasil-network-yggdrasil-go-v0.3.16_GH0.tar.gz) =3D 166501 +TIMESTAMP =3D 1626814940 +SHA256 (yggdrasil-network-yggdrasil-go-v0.4.0_GH0.tar.gz) =3D 6ad762012ef1a73bfb718db4a23c5a0067e13939d0655221afc4c1f723736cbf +SIZE (yggdrasil-network-yggdrasil-go-v0.4.0_GH0.tar.gz) =3D 89502 +SHA256 (Arceliar-ironwood-6ad55cae5031_GH0.tar.gz) =3D 3f09a5ba5572c0bd77fce4ceaa52c9c58c1c8fb3b0107c655aaaef754d266931 +SIZE (Arceliar-ironwood-6ad55cae5031_GH0.tar.gz) =3D 40400 SHA256 (Arceliar-phony-dde1a8dca979_GH0.tar.gz) =3D bcc79621c9da979c1d357a29f1924d73c86c57c0e901652312d742cbc39e5962 SIZE (Arceliar-phony-dde1a8dca979_GH0.tar.gz) =3D 11118 -SHA256 (VividCortex-ewma-v1.1.1_GH0.tar.gz) =3D 3b2d62412b7ba2726a379cc0ae557595c027dc8206d0ef98f13831281b8f2b85 -SIZE (VividCortex-ewma-v1.1.1_GH0.tar.gz) =3D 6042 -SHA256 (cheggaaa-pb-v3.0.6_GH0.tar.gz) =3D 64e8d89836cde14cb746a91bd6aa33f14ecd3e365231edb95b5223f736ef4da1 -SIZE (cheggaaa-pb-v3.0.6_GH0.tar.gz) =3D 31038 -SHA256 (fatih-color-v1.10.0_GH0.tar.gz) =3D a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e -SIZE (fatih-color-v1.10.0_GH0.tar.gz) =3D 1267532 -SHA256 (golang-crypto-5ea612d1eb83_GH0.tar.gz) =3D ab4d88d6121195632d006705a950adebaf4fa99dd15ea0c508297a17c5d3277e -SIZE (golang-crypto-5ea612d1eb83_GH0.tar.gz) =3D 1726242 -SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) =3D c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89 -SIZE (golang-net-e18ecbb05110_GH0.tar.gz) =3D 1253124 -SHA256 (golang-sys-8fe3ee5dd75b_GH0.tar.gz) =3D 88091001fc7f8d89561f7ce6c28b9eafef82ddecebf8ab9cdaf27d76c18accdd -SIZE (golang-sys-8fe3ee5dd75b_GH0.tar.gz) =3D 1216988 -SHA256 (golang-text-8f690f22cf1c_GH0.tar.gz) =3D 0d0d17d56d912e0625ebbf89fc5f88eb9d5429e56510de7ba40fd8ad50d2d7b0 -SIZE (golang-text-8f690f22cf1c_GH0.tar.gz) =3D 8355724 -SHA256 (gologme-log-4e5d8ccb38e8_GH0.tar.gz) =3D d5873e95bd5459d9a4813e7020236f15db01277ffba0abfc9f80c5bac7477157 -SIZE (gologme-log-4e5d8ccb38e8_GH0.tar.gz) =3D 5613 +SHA256 (VividCortex-ewma-v1.2.0_GH0.tar.gz) =3D 2f26521a9207b91dfbca3d28e5545bc11cb098888ecf3e9ba8e5936387b06a33 +SIZE (VividCortex-ewma-v1.2.0_GH0.tar.gz) =3D 6683 +SHA256 (cheggaaa-pb-v3.0.8_GH0.tar.gz) =3D 17cb166dfe931ccdf3742271442dcfb2b886099d3e32fb706e2c4752133b2910 +SIZE (cheggaaa-pb-v3.0.8_GH0.tar.gz) =3D 31487 +SHA256 (fatih-color-v1.12.0_GH0.tar.gz) =3D 8f4cef62c8aafdf7e7b3097e9f97c236bb31a47f2c939a54da92235c30ae9dcb +SIZE (fatih-color-v1.12.0_GH0.tar.gz) =3D 10711 +SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) =3D bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4 +SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) =3D 1732023 +SHA256 (golang-net-84b48f89b13b_GH0.tar.gz) =3D 2937fbc6cdc2dfcf2db9a20bddd42cc0e18a433e0e7a3820af4e152ff0d2b584 +SIZE (golang-net-84b48f89b13b_GH0.tar.gz) =3D 1252079 +SHA256 (golang-sys-a4fc73990273_GH0.tar.gz) =3D a4fa3667e73a94fa8ce9f0fd85c38a6b993d7343dbe5212ba29f92b49c10afc0 +SIZE (golang-sys-a4fc73990273_GH0.tar.gz) =3D 1200476 +SHA256 (golang-text-5c7c50ebbd4f_GH0.tar.gz) =3D c060571a3ee810fa52e9d8965c1b57c1a5367fe6c7fb358117a971f982c7ef68 +SIZE (golang-text-5c7c50ebbd4f_GH0.tar.gz) =3D 8355892 +SHA256 (gologme-log-v1.2.0_GH0.tar.gz) =3D 06b94718ea898c01c176a8915ccd119d511ee41de388611d8e9afeb1a17bfff6 +SIZE (gologme-log-v1.2.0_GH0.tar.gz) =3D 5610 SHA256 (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) =3D be4bda814c068311ea8e185e2d108077f167897cfa868ada7f56d97a10f3d602 SIZE (hashicorp-go-syslog-v1.0.0_GH0.tar.gz) =3D 4517 SHA256 (hjson-hjson-go-v3.1.0_GH0.tar.gz) =3D 4a06364b44121e442e7c880aa1abb048e96ef23e685ef853aed9eedcb454f0ef SIZE (hjson-hjson-go-v3.1.0_GH0.tar.gz) =3D 25729 -SHA256 (kardianos-minwinsvc-cad6b2b879b0_GH0.tar.gz) =3D 820c068dfee3306853cb6cc63becb96b9f972a14a97ad71df3332f98bc4866cb -SIZE (kardianos-minwinsvc-cad6b2b879b0_GH0.tar.gz) =3D 1804 -SHA256 (mattn-go-colorable-v0.1.2_GH0.tar.gz) =3D a7189bd9005c571303b117261955ce53b0e2aa89fe415e2289659be343fe1651 -SIZE (mattn-go-colorable-v0.1.2_GH0.tar.gz) =3D 8518 -SHA256 (mattn-go-isatty-v0.0.10_GH0.tar.gz) =3D 55408e1afd78eaa112842ae2263e70703d5b5133feaa17fa477980a87a961fe7 -SIZE (mattn-go-isatty-v0.0.10_GH0.tar.gz) =3D 4465 -SHA256 (mattn-go-runewidth-v0.0.7_GH0.tar.gz) =3D 09270ddb93b2d77d4b3903bbadacbb3a3d4f0cce93c373fb21503840829d8697 -SIZE (mattn-go-runewidth-v0.0.7_GH0.tar.gz) =3D 16089 -SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) =3D 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b -SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) =3D 20980 -SHA256 (vishvananda-netlink-v1.0.0_GH0.tar.gz) =3D a621be56e9a161eae72bc9f14849fef9a23076af87e6c0997d1cdf4208530a2a -SIZE (vishvananda-netlink-v1.0.0_GH0.tar.gz) =3D 119941 -SHA256 (vishvananda-netns-7109fa855b0f_GH0.tar.gz) =3D c7b2eb08c983dfc2c2deeaec182e1cfd24fb5ff22f7448fc30f6a9480bbb9b3f -SIZE (vishvananda-netns-7109fa855b0f_GH0.tar.gz) =3D 7868 -SHA256 (wireguard-wireguard-go-v0.0.20200320_GH0.tar.gz) =3D a40f5ca7c33b0d631c2777b992d7a398491bc4d72ed1e559a86055637a708844 -SIZE (wireguard-wireguard-go-v0.0.20200320_GH0.tar.gz) =3D 96760 -SHA256 (WireGuard-wireguard-windows-v0.1.0_GH0.tar.gz) =3D 92b9f99d06843ef49aef4b5798dc4531220c79b3c11d02d1f7ad4ffb2071e1aa -SIZE (WireGuard-wireguard-windows-v0.1.0_GH0.tar.gz) =3D 191555 +SHA256 (kardianos-minwinsvc-v1.0.0_GH0.tar.gz) =3D 211be15df1ceceb865afed15eca304620f0e2f10014b8318639c723cad75e697 +SIZE (kardianos-minwinsvc-v1.0.0_GH0.tar.gz) =3D 2063 +SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) =3D 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f +SIZE (mattn-go-colorable-v0.1.8_GH0.tar.gz) =3D 9571 +SHA256 (mattn-go-isatty-v0.0.13_GH0.tar.gz) =3D d25318d3c4e174e1ffb5d90c9d3e6887cc050f76e403b7b3d6163f4338fac952 +SIZE (mattn-go-isatty-v0.0.13_GH0.tar.gz) =3D 4440 +SHA256 (mattn-go-runewidth-v0.0.13_GH0.tar.gz) =3D 9b2aeafa5d95a40b32067ba22accdf42cc83414ec5b433ea7de330791beaa196 +SIZE (mattn-go-runewidth-v0.0.13_GH0.tar.gz) =3D 17353 +SHA256 (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) =3D d936baa5006f7dda1346aff863745a110981f7583a1184e93b9077fa52cd4048 +SIZE (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) =3D 27826 +SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) =3D 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197 +SIZE (rivo-uniseg-v0.2.0_GH0.tar.gz) =3D 44036 +SHA256 (vishvananda-netlink-v1.1.0_GH0.tar.gz) =3D c72754916ac1551cea4e1f801d5b2c26c1476f11bd3130382a4a890822eb5929 +SIZE (vishvananda-netlink-v1.1.0_GH0.tar.gz) =3D 147026 +SHA256 (vishvananda-netns-2eb08e3e575f_GH0.tar.gz) =3D 049a592025d3b7011acb83f2c6074a75143d3d95f842526d10f0589155283f0c +SIZE (vishvananda-netns-2eb08e3e575f_GH0.tar.gz) =3D 8579 +SHA256 (wireguard-wireguard-go-f9b48a961cd2_GH0.tar.gz) =3D 7a8a182a07b9e47e61531a3a73203ae28418ed1c0d822399c45f648813d0c655 +SIZE (wireguard-wireguard-go-f9b48a961cd2_GH0.tar.gz) =3D 126551 diff -ruN /tmp/yggpatch/files/yggdrasil.in ./files/yggdrasil.in --- /tmp/yggpatch/files/yggdrasil.in 2021-07-20 23:34:40.070359000 +0200 +++ ./files/yggdrasil.in 2020-08-17 17:51:07.376865000 +0200 @@ -1,8 +1,15 @@ #!/bin/sh # +# Put the yggdrasil and yggdrasilctl binaries into /usr/local/bin +# Then copy this script into /etc/rc.d/yggdrasil +# Finally, run: +# 1. chmod +x /etc/rc.d/yggdrasil /usr/local/bin/{yggdrasil,yggdrasilctl} +# 2. echo "yggdrasil_enable=3Dyes" >> /etc/rc.d +# 3. service yggdrasil start +# # PROVIDE: yggdrasil # REQUIRE: networking -# KEYWORD: shutdown +# KEYWORD: . /etc/rc.subr @@ -10,10 +17,11 @@ rcvar=3D"yggdrasil_enable" start_cmd=3D"${name}_start" +stop_cmd=3D"${name}_stop" pidfile=3D"/var/run/yggdrasil/${name}.pid" command=3D"/usr/sbin/daemon" -command_args=3D"-P ${pidfile} -r" +command_args=3D"-P ${pidfile} -r -f ${yggdrasil_command}" yggdrasil_start() { @@ -32,7 +40,21 @@ logger -s -t yggdrasil "Starting yggdrasil" ${command} ${command_args} %%PREFIX%%/bin/yggdrasil -useconffile %%PREFIX%%/etc/yggdrasil.conf \ - -logto /var/log/yggdrasil.log + 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) + + tap_name=3D"$(egrep '^[ \t]+IfName:' %%PREFIX%%/etc/yggdrasil.conf = | sed 's/[ \t]*IfName:[ \t]*//')" + + /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" + ) } load_rc_config $name --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-257301-7788-WBwkiIB2SX>