From 0773d439b04aafe2b90049e8b50e331835d32f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 5 Oct 2020 15:41:48 +0200
Subject: [PATCH] yggdrasil: update to 0.3.15.

This also adds log capturing via vlogger and stops dropping all caps due
to a bug in util-linux causing this to break.
---
 srcpkgs/yggdrasil/files/yggdrasil/log/run |  1 +
 srcpkgs/yggdrasil/files/yggdrasil/run     | 12 ++++++++----
 srcpkgs/yggdrasil/template                |  6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/yggdrasil/files/yggdrasil/log/run

diff --git a/srcpkgs/yggdrasil/files/yggdrasil/log/run b/srcpkgs/yggdrasil/files/yggdrasil/log/run
new file mode 120000
index 00000000000000..3a5b4a586051d6
--- /dev/null
+++ b/srcpkgs/yggdrasil/files/yggdrasil/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/yggdrasil/files/yggdrasil/run b/srcpkgs/yggdrasil/files/yggdrasil/run
index 4ee19bbaf77412..40460c8a1ef1a9 100755
--- a/srcpkgs/yggdrasil/files/yggdrasil/run
+++ b/srcpkgs/yggdrasil/files/yggdrasil/run
@@ -1,9 +1,13 @@
 #!/bin/sh
 modprobe tun
-caps='-all,+NET_ADMIN,+NET_RAW'
-drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
+# 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"
 if [ -f /etc/yggdrasil.conf ]; then
-	exec $drop_caps yggdrasil --useconffile /etc/yggdrasil.conf 1>/dev/null
+	exec yggdrasil -useconffile /etc/yggdrasil.conf 2>&1
 else
-	exec $drop_caps yggdrasil --autoconf 1>/dev/null
+	exec yggdrasil -autoconf 2>&1
 fi
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 865baefdd59e20..b9e6246b1cd58b 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.15
+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=25ea85399a142aa7a3d6f6886fd4e0d215116c4c8c33453de43999787d735565
 
 do_build() {
 	PKGNAME=${pkgname} PKGVER=${version} ./build