Github messages for voidlinux
 help / color / mirror / Atom feed
From: whoizit <whoizit@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] yggdrasil: update to 0.3.16.
Date: Tue, 23 Mar 2021 02:48:58 +0100	[thread overview]
Message-ID: <20210323014858.pWYnXFiRrO_xE5N9Ubi43G-_DOPPOPnJd2t8mwcv8qU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29577@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]

There is an updated pull request by whoizit against master on the void-packages repository

https://github.com/whoizit/void-packages yggdrasil
https://github.com/void-linux/void-packages/pull/29577

yggdrasil: update to 0.3.16.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29577.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yggdrasil-29577.patch --]
[-- Type: text/x-diff, Size: 4855 bytes --]

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 354f017e85c69b6271a18f338e15be899cafacf7 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/log/run | 2 ++
 srcpkgs/yggdrasil/files/yggdrasil/run     | 4 ++--
 srcpkgs/yggdrasil/template                | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100755 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 100755
index 000000000000..9ef14420666c
--- /dev/null
+++ b/srcpkgs/yggdrasil/files/yggdrasil/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t yggdrasil
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

  parent reply	other threads:[~2021-03-23  1:49 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-19  0:15 [PR PATCH] " whoizit
2021-03-19 13:57 ` ericonr
2021-03-19 18:12 ` [PR PATCH] [Updated] " whoizit
2021-03-19 18:17 ` whoizit
2021-03-19 18:22 ` whoizit
2021-03-19 18:38 ` jcgruenhage
2021-03-19 19:05 ` whoizit
2021-03-22 23:43 ` jcgruenhage
2021-03-23  1:48 ` whoizit [this message]
2021-03-23  1:51 ` whoizit
2021-03-23  2:04 ` whoizit
2021-03-23  9:40 ` jcgruenhage
2021-03-23 13:47 ` [PR PATCH] [Updated] " whoizit
2021-03-23 13:50 ` whoizit
2021-03-23 15:10 ` jcgruenhage
2021-03-23 15:19 ` ericonr
2021-03-23 15:38 ` [PR PATCH] [Updated] " whoizit
2021-03-23 15:45 ` jcgruenhage
2021-03-23 15:57 ` [PR PATCH] [Updated] " whoizit
2021-03-24  2:30 ` jcgruenhage
2021-03-24  2:52 ` [PR PATCH] [Updated] " ericonr
2021-03-24  2:52 ` ericonr
2021-03-24  2:52 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210323014858.pWYnXFiRrO_xE5N9Ubi43G-_DOPPOPnJd2t8mwcv8qU@z \
    --to=whoizit@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).