From 503fe17f3d750f3f75ef92aaae397d3050682107 Mon Sep 17 00:00:00 2001
From: whoizit <whoami@systemli.org>
Date: Fri, 19 Mar 2021 20:51:07 +0300
Subject: [PATCH 1/2] Revert "yggdrasil: update to 0.3.15."

This reverts commit c33aec8e707d49731c7b94996450d3ebb0178ce0.
---
 srcpkgs/yggdrasil/files/yggdrasil/log/run |  1 -
 srcpkgs/yggdrasil/files/yggdrasil/run     | 12 ++++--------
 srcpkgs/yggdrasil/template                |  6 +++---
 3 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/yggdrasil/files/yggdrasil/log/run

diff --git a/srcpkgs/yggdrasil/files/yggdrasil/log/run b/srcpkgs/yggdrasil/files/yggdrasil/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/yggdrasil/files/yggdrasil/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/yggdrasil/files/yggdrasil/run b/srcpkgs/yggdrasil/files/yggdrasil/run
index 40460c8a1ef1..4ee19bbaf774 100755
--- a/srcpkgs/yggdrasil/files/yggdrasil/run
+++ b/srcpkgs/yggdrasil/files/yggdrasil/run
@@ -1,13 +1,9 @@
 #!/bin/sh
 modprobe tun
-# limiting caps is temporarily disabled, as it breaks with
-# setpriv: libcap-ng is too old for "all" caps
-# TODO: instead of dropping all caps, start with a
-# non-priv user and manually add needed privileges instead.
-#caps='-all,+NET_ADMIN,+NET_RAW'
-#drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
+caps='-all,+NET_ADMIN,+NET_RAW'
+drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
 if [ -f /etc/yggdrasil.conf ]; then
-	exec yggdrasil -useconffile /etc/yggdrasil.conf 2>&1
+	exec $drop_caps yggdrasil --useconffile /etc/yggdrasil.conf 1>/dev/null
 else
-	exec yggdrasil -autoconf 2>&1
+	exec $drop_caps yggdrasil --autoconf 1>/dev/null
 fi
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 74c3c32537e0..646d1c47796d 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
-version=0.3.15
-revision=1
+version=0.3.14
+revision=2
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
@@ -11,7 +11,7 @@ maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"
 homepage="https://yggdrasil-network.github.io/"
 distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz"
-checksum=25ea85399a142aa7a3d6f6886fd4e0d215116c4c8c33453de43999787d735565
+checksum=e8579a04bf289434e7b8caaf621e2c0b853e83cc06f136c4f9e4bfc667df5a27
 
 do_build() {
 	PKGNAME=${pkgname} PKGVER=${version} ./build

From 08a35596aa8e273b8aaf92ae794ace116791db1d Mon Sep 17 00:00:00 2001
From: whoizit <whoami@systemli.org>
Date: Fri, 19 Mar 2021 21:02:33 +0300
Subject: [PATCH 2/2] yggdrasil: update to 0.3.16.

---
 srcpkgs/yggdrasil/files/yggdrasil/run | 4 ++--
 srcpkgs/yggdrasil/template            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/yggdrasil/files/yggdrasil/run b/srcpkgs/yggdrasil/files/yggdrasil/run
index 4ee19bbaf774..0c5e259b3ae5 100755
--- a/srcpkgs/yggdrasil/files/yggdrasil/run
+++ b/srcpkgs/yggdrasil/files/yggdrasil/run
@@ -3,7 +3,7 @@ modprobe tun
 caps='-all,+NET_ADMIN,+NET_RAW'
 drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
 if [ -f /etc/yggdrasil.conf ]; then
-	exec $drop_caps yggdrasil --useconffile /etc/yggdrasil.conf 1>/dev/null
+	exec $drop_caps yggdrasil -useconffile /etc/yggdrasil.conf 2>&1
 else
-	exec $drop_caps yggdrasil --autoconf 1>/dev/null
+	exec $drop_caps yggdrasil -autoconf 2>&1
 fi
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 646d1c47796d..4f7408506d1a 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
-version=0.3.14
-revision=2
+version=0.3.16
+revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
@@ -11,7 +11,7 @@ maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"
 homepage="https://yggdrasil-network.github.io/"
 distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz"
-checksum=e8579a04bf289434e7b8caaf621e2c0b853e83cc06f136c4f9e4bfc667df5a27
+checksum=e03595b78906b171155aaa11c922be3418bd056f8547e4d9f5123b6047316eac
 
 do_build() {
 	PKGNAME=${pkgname} PKGVER=${version} ./build