GNU bug report logs - #51594
[PATCH] gnu: yggdrasil: Update to 0.4.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51594 in the body.
You can then email your comments to 51594 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: raingloom <raingloom <at> riseup.net>
To: Guix Patches <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: yggdrasil: Update to 0.4.1.
Date: Wed, 3 Nov 2021 21:42:45 +0100

* gnu/packages/networking.scm (yggdrasil): Update to 0.4.1.
* gnu/packages/patches/yggdrasil-extra-config.patch: Update for new
  version. ---
 gnu/packages/networking.scm                   |  4 +-
 .../patches/yggdrasil-extra-config.patch      | 47 ++++++++++++-------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index d1a437e177..7759e3cb84 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4086,7 +4086,7 @@ (define-public nbd
 (define-public yggdrasil
   (package
     (name "yggdrasil")
-    (version "0.4.0")
+    (version "0.4.1")
     (source
      (origin
        (method git-fetch)
@@ -4097,7 +4097,7 @@ (define-public yggdrasil
          (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
"0mmqw6w5a6ph49xd1yzb7i70xg466k9pi5sdvplhb66x68wipixh"))
+        (base32
"1ajhn0z58ap9jldip7mqj78drmgg4645zfsxsy004cfkm60fasnx")) (patches
(search-patches "yggdrasil-extra-config.patch")))) (build-system
go-build-system) (arguments
diff --git a/gnu/packages/patches/yggdrasil-extra-config.patch
b/gnu/packages/patches/yggdrasil-extra-config.patch index
46fd3f15fc..bd4bea7b9f 100644 ---
a/gnu/packages/patches/yggdrasil-extra-config.patch +++
b/gnu/packages/patches/yggdrasil-extra-config.patch @@ -1,8 +1,20 @@
+From 779f980451d20079b34812f7006f2d7230738ad0 Mon Sep 17 00:00:00 2001
+From: csepp <raingloom <at> riseup.net>
+Date: Wed, 3 Nov 2021 21:14:54 +0100
+Subject: [PATCH] add extra config file option to yggdrasil command
+
+This is useful in Guix and Nix, because one config file can come
+from the world-readable store and another can be placed directly
+into /etc with much stricter permissions.
+---
+ cmd/yggdrasil/main.go | 29 ++++++++++++++++++++++-------
+ 1 file changed, 22 insertions(+), 7 deletions(-)
+
 diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go
-index 813e950..08d35cc 100644
+index 58b8230..b9df98a 100644
 --- a/cmd/yggdrasil/main.go
 +++ b/cmd/yggdrasil/main.go
-@@ -40,11 +40,12 @@ type node struct {
+@@ -43,11 +43,12 @@ type node struct {
  	admin     *admin.AdminSocket
  }
  
@@ -16,7 +28,7 @@ index 813e950..08d35cc 100644
  	var err error
  	if useconffile != "" {
  		// Read the file from the filesystem
-@@ -56,6 +57,21 @@ func readConfig(useconf *bool, useconffile *string,
normaliseconf *bool) *config +@@ -59,6 +60,21 @@ func readConfig(log
*log.Logger, useconf bool, useconffile string, normaliseconf if err !=
nil { panic(err)
  	}
@@ -38,7 +50,7 @@ index 813e950..08d35cc 100644
  	// If there's a byte order mark - which Windows 10 is now
incredibly fond of // throwing everywhere when it's converting things
into UTF-16 for the hell // of it - remove it and decode back down into
UTF-8. This is necessary -@@ -69,11 +85,6 @@ func readConfig(log
*log.Logger, useconf bool, useconffile string, normaliseconf bool)
*config +@@ -72,11 +88,6 @@ func readConfig(log *log.Logger, useconf
bool, useconffile string, normaliseconf panic(err) }
  	}
@@ -50,7 +62,7 @@ index 813e950..08d35cc 100644
  	var dat map[string]interface{}
  	if err := hjson.Unmarshal(conf, &dat); err != nil {
  		panic(err)
-@@ -112,6 +123,7 @@ func readConfig(log *log.Logger, useconf *bool,
useconffile *string, normaliseconf *bool) *config +@@ -136,6 +147,7 @@
func readConfig(log *log.Logger, useconf bool, useconffile string,
normaliseconf if err = mapstructure.Decode(dat, &cfg); err != nil {
panic(err) }
@@ -58,15 +70,15 @@ index 813e950..08d35cc 100644
  	return cfg
  }
  
-@@ -185,6 +197,7 @@ func main() {
- 	genconf       bool
- 	useconf       bool
+@@ -192,6 +204,7 @@ type yggArgs struct {
+ 	getaddr       bool
+ 	getsnet       bool
  	useconffile   string
-+	extraconffile string
- 	normaliseconf bool
- 	confjson      bool
- 	autoconf      bool
-@@ -164,6 +176,7 @@ func main() {
++        extraconffile string
+ 	logto         string
+ 	loglevel      string
+ }
+@@ -200,6 +213,7 @@ func getArgs() yggArgs {
  	genconf := flag.Bool("genconf", false, "print a new config to
stdout") useconf := flag.Bool("useconf", false, "read HJSON/JSON config
from stdin") useconffile := flag.String("useconffile", "", "read
HJSON/JSON config from specified file path") @@ -74,15 +86,15 @@ index
813e950..08d35cc 100644 normaliseconf := flag.Bool("normaliseconf",
false, "use in combination with either -useconf or -useconffile,
outputs your configuration normalised") confjson := flag.Bool("json",
false, "print configuration from -genconf or -normaliseconf as JSON
instead of HJSON") autoconf := flag.Bool("autoconf", false, "automatic
mode (dynamic IP, peer with IPv6 neighbors)") -@@ -212,6 +225,7 @@ func
main() { +@@ -213,6 +227,7 @@ func getArgs() yggArgs { genconf:
*genconf, useconf:       *useconf, useconffile:   *useconffile,
-+		extraconffile: *extraconffile,
++                extraconffile: *extraconffile,
  		normaliseconf: *normaliseconf,
  		confjson:      *confjson,
  		autoconf:      *autoconf,
-@@ -187,7 +200,7 @@ func main() {
+@@ -265,7 +280,7 @@ func run(args yggArgs, ctx context.Context, done
chan struct{}) { cfg = defaults.GenerateConfig()
  	case args.useconffile != "" || args.useconf:
  		// Read the configuration from either stdin or from
the filesystem @@ -91,3 +103,6 @@ index 813e950..08d35cc 100644
  		// If the -normaliseconf option was specified then
remarshal the above // configuration and print it back to stdout. This
lets the user update // their configuration file with newly mapped
names (like above) or to +-- 
+2.33.1
+
-- 
2.33.1

Message #8 received at 51594 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: raingloom <raingloom <at> riseup.net>
Cc: 51594 <at> debbugs.gnu.org
Subject: Re: bug#51594: [PATCH] gnu: yggdrasil: Update to 0.4.1.
Date: Wed, 17 Nov 2021 18:22:06 +0100

Hi,

raingloom <raingloom <at> riseup.net> skribis:

> * gnu/packages/networking.scm (yggdrasil): Update to 0.4.1.
> * gnu/packages/patches/yggdrasil-extra-config.patch: Update for new
>   version. ---
>  gnu/packages/networking.scm                   |  4 +-
>  .../patches/yggdrasil-extra-config.patch      | 47 ++++++++++++-------
>  2 files changed, 33 insertions(+), 18 deletions(-)

This patch got mangled on its way.  Could you resend it as an
attachment?

Thanks,
Ludo’.

Message #11 received at 51594 <at> debbugs.gnu.org (full text, mbox):

From: raingloom <raingloom <at> riseup.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 51594 <at> debbugs.gnu.org
Subject: Re: bug#51594: [PATCH] gnu: yggdrasil: Update to 0.4.1.
Date: Wed, 24 Nov 2021 00:54:56 +0100

[Message part 1 (text/plain, inline)]

On Wed, 17 Nov 2021 18:22:06 +0100
Ludovic Courtès <ludo <at> gnu.org> wrote:

> Hi,
> 
> raingloom <raingloom <at> riseup.net> skribis:
> 
> > * gnu/packages/networking.scm (yggdrasil): Update to 0.4.1.
> > * gnu/packages/patches/yggdrasil-extra-config.patch: Update for new
> >   version. ---
> >  gnu/packages/networking.scm                   |  4 +-
> >  .../patches/yggdrasil-extra-config.patch      | 47
> > ++++++++++++------- 2 files changed, 33 insertions(+), 18
> > deletions(-)  
> 
> This patch got mangled on its way.  Could you resend it as an
> attachment?
> 
> Thanks,
> Ludo’.

Heck, I'm pretty sure I sent it as an attachment? Maybe I forgot to
re-add them to the email when I modified the patches?
Well, here is attempt 3.

[0001-gnu-Add-go-github-com-vividcortex-ewma.patch (text/x-patch, attachment)]

[0002-gnu-Add-go-github-com-rivo-uniseg.patch (text/x-patch, attachment)]

[0003-gnu-Add-go-github-com-mattn-go-runewidth.patch (text/x-patch, attachment)]

[0004-gnu-go-github-com-cheggaaa-pb-Update-to-3.0.8.patch (text/x-patch, attachment)]

[0005-gnu-Rename-go-github-com-cheggaaa-pb-to-go-github-co.patch (text/x-patch, attachment)]

[0006-gnu-Add-go-github-com-arceliar-ironwood.patch (text/x-patch, attachment)]

[0007-gnu-yggdrasil-Update-to-0.4.0.patch (text/x-patch, attachment)]

[0008-gnu-yggdrasil-Update-to-0.4.1.patch (text/x-patch, attachment)]

Message #16 received at 51594-done <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> debian.org>
To: raingloom <raingloom <at> riseup.net>, 51594-done <at> debbugs.gnu.org
Subject: Re: [bug#51594] [PATCH] gnu: yggdrasil: Update to 0.4.1.
Date: Fri, 01 Sep 2023 14:18:38 -0700

[Message part 1 (text/plain, inline)]

On 2021-11-03, raingloom wrote:
> * gnu/packages/networking.scm (yggdrasil): Update to 0.4.1.

Looks like this was updated in commit
d9956e938343c7637647ad10b977fdb0f3b8b138, and is currently at version
0.4.3, and the other packages mentioned in this patch series appear to
have been merged.

Marking as done.

live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.