15/17: gnu: yggdrasil: Update to 0.5.2.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 98da3707b68f5b0c50997bf56662778e4aef039a
Author: Artyom V. Poptsov <poptsov.artyom@gmail.com>
AuthorDate: Tue Nov 7 23:40:53 2023 +0300

    gnu: yggdrasil: Update to 0.5.2.
    
    * gnu/packages/networking.scm (yggdrasil): Update to 0.5.2.
      [propagated-inputs]: Rewrite inputs to replace "go-golang-org-x-sys" with
      "go-golang-org-x-sys-0.8".  Use "go-golang-org-x-sys-0.8".  Add
      "go-github-com-bits-and-blooms-bitset",
      "go-github-com-bits-and-blooms-bloom", "go-github-com-quic-go-quic-go", 
and
      "go-github-com-hjson-hjson-go".
    * gnu/packages/patches/yggdrasil-extra-config.patch: Update.
    
    Change-Id: I3c411524e589f0af52eaa90230810148f6ad4e31
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/networking.scm                       |  62 +++++-----
 gnu/packages/patches/yggdrasil-extra-config.patch | 134 +++++++---------------
 2 files changed, 78 insertions(+), 118 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 994ce6a96a..6b415076e8 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -60,6 +60,7 @@
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4407,7 +4408,7 @@ QUIC protocol.")
 (define-public yggdrasil
   (package
     (name "yggdrasil")
-    (version "0.4.7")
+    (version "0.5.2")
     (source
      (origin
        (method git-fetch)
@@ -4418,8 +4419,8 @@ QUIC protocol.")
          (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "01mllfrsr55lnfivxwa57cfrjas6w4shsvx9k81pw8jixc124myk"))
-       (patches (search-patches "yggdrasil-extra-config.patch"))))
+        (base32 "0ahgb94s30sq1wwyc8h53mjj3j43ifr0aanj8262rsm6rqk04kzq"))
+      (patches (search-patches "yggdrasil-extra-config.patch"))))
     (build-system go-build-system)
     (arguments
      (list #:import-path "github.com/yggdrasil-network/yggdrasil-go"
@@ -4445,32 +4446,37 @@ QUIC protocol.")
                       (list 
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil"
                             
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl"
                             
"github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys"))))))))
-    ;; https://github.com/kardianos/minwinsvc is windows only
     (propagated-inputs
-     (list ;;("go-golang-zx2c4-com-wireguard-windows"
-           ;; ,go-golang-zx2c4-com-wireguard-windows)
-           go-golang-zx2c4-com-wireguard
-           go-golang-org-x-text
-           go-golang-org-x-sys
-           go-golang-org-x-net
-           go-golang-org-x-crypto
-           go-golang-org-x-tools
-           go-netns
-           go-netlink
-           go-github-com-olekukonko-tablewriter
-           go-github-com-mitchellh-mapstructure
-           go-github-com-mattn-go-runewidth
-           go-github-com-mattn-go-isatty
-           go-github-com-mattn-go-colorable
-           go-github-com-kardianos-minwinsvc
-           go-github-com-hjson-hjson-go
-           go-github-com-hashicorp-go-syslog
-           go-github-com-gologme-log
-           go-github-com-fatih-color
-           go-github-com-cheggaaa-pb-v3
-           go-github-com-vividcortex-ewma
-           go-github-com-arceliar-phony
-           go-github-com-arceliar-ironwood))
+     (let ((p (package-input-rewriting
+               `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8))
+               #:deep? #true)))
+       (cons go-golang-org-x-sys-0.8
+             (map p
+                  (list go-golang-zx2c4-com-wireguard
+                        go-golang-org-x-text
+                        go-golang-org-x-net
+                        go-golang-org-x-crypto
+                        go-golang-org-x-tools
+                        go-netns
+                        go-netlink
+                        go-github-com-bits-and-blooms-bitset
+                        go-github-com-bits-and-blooms-bloom
+                        go-github-com-quic-go-quic-go
+                        go-github-com-hjson-hjson-go
+                        go-github-com-olekukonko-tablewriter
+                        go-github-com-mitchellh-mapstructure
+                        go-github-com-mattn-go-runewidth
+                        go-github-com-mattn-go-isatty
+                        go-github-com-mattn-go-colorable
+                        go-github-com-kardianos-minwinsvc
+                        go-github-com-hjson-hjson-go
+                        go-github-com-hashicorp-go-syslog
+                        go-github-com-gologme-log
+                        go-github-com-fatih-color
+                        go-github-com-cheggaaa-pb-v3
+                        go-github-com-vividcortex-ewma
+                        go-github-com-arceliar-phony
+                        go-github-com-arceliar-ironwood)))))
     (home-page "https://yggdrasil-network.github.io/blog.html";)
     (synopsis
      "Experiment in scalable routing as an encrypted IPv6 overlay network")
diff --git a/gnu/packages/patches/yggdrasil-extra-config.patch 
b/gnu/packages/patches/yggdrasil-extra-config.patch
index 7934e2b50f..44c58a8fbd 100644
--- a/gnu/packages/patches/yggdrasil-extra-config.patch
+++ b/gnu/packages/patches/yggdrasil-extra-config.patch
@@ -1,108 +1,62 @@
-From 779f980451d20079b34812f7006f2d7230738ad0 Mon Sep 17 00:00:00 2001
-From: csepp <raingloom@riseup.net>
-Date: Wed, 3 Nov 2021 21:14:54 +0100
+From 5aeabc1a8a8c5ecea3f5d0b7bcfa0aa0767ac92d Mon Sep 17 00:00:00 2001
+Message-ID: 
<5aeabc1a8a8c5ecea3f5d0b7bcfa0aa0767ac92d.1699726745.git.avityazev@posteo.org>
+From: Aleksandr Vityazev <avityazev@posteo.org>
+Date: Sat, 11 Nov 2023 19:50:46 +0300
 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(-)
+ cmd/yggdrasil/main.go | 12 ++++++++++++
+ src/config/config.go  |  2 +-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go
-index 58b8230..b9df98a 100644
+index a225755..3f53dda 100644
 --- a/cmd/yggdrasil/main.go
 +++ b/cmd/yggdrasil/main.go
-@@ -43,11 +43,12 @@ type node struct {
-       admin     *admin.AdminSocket
- }
- 
--func readConfig(log *log.Logger, useconf bool, useconffile string, 
normaliseconf bool) *config.NodeConfig {
-+func readConfig(log *log.Logger, useconf bool, useconffile string, 
extraconffile string, normaliseconf bool) *config.NodeConfig {
-       // Use a configuration file. If -useconf, the configuration will be read
-       // from stdin. If -useconffile, the configuration will be read from the
-       // filesystem.
-       var conf []byte
-+      var extraconf []byte
-       var err error
-       if useconffile != "" {
-               // Read the file from the filesystem
-@@ -59,6 +60,21 @@ func readConfig(log *log.Logger, useconf bool, useconffile 
string, normaliseconf
-       if err != nil {
-               panic(err)
-       }
-+      if extraconffile != "" {
-+              extraconf, err = os.ReadFile(extraconffile);
-+      }
-+      if err != nil {
-+              panic(err)
-+      }
-+      // Generate a new configuration - this gives us a set of sane defaults -
-+      // then parse the configuration we loaded above on top of it. The effect
-+      // of this is that any configuration item that is missing from the 
provided
-+      // configuration will use a sane default.
-+      cfg := defaults.GenerateConfig()
-+      var confs [2][]byte
-+      confs[0]=conf
-+      confs[1]=extraconf
-+      for _, conf := range confs { if len(conf)>0 {
-       // 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
-@@ -72,11 +88,6 @@ func readConfig(log *log.Logger, useconf bool, useconffile 
string, normaliseconf
-                       panic(err)
-               }
-       }
--      // Generate a new configuration - this gives us a set of sane defaults -
--      // then parse the configuration we loaded above on top of it. The effect
--      // of this is that any configuration item that is missing from the 
provided
--      // configuration will use a sane default.
--      cfg := defaults.GenerateConfig()
-       var dat map[string]interface{}
-       if err := hjson.Unmarshal(conf, &dat); err != nil {
-               panic(err)
-@@ -136,6 +147,7 @@ func readConfig(log *log.Logger, useconf bool, useconffile 
string, normaliseconf
-       if err = mapstructure.Decode(dat, &cfg); err != nil {
-               panic(err)
-       }
-+      }}
-       return cfg
- }
- 
-@@ -192,6 +204,7 @@ type yggArgs struct {
-       getaddr       bool
-       getsnet       bool
-       useconffile   string
-+        extraconffile string
-       logto         string
-       loglevel      string
- }
-@@ -200,6 +213,7 @@ func getArgs() yggArgs {
+@@ -42,6 +42,7 @@ func main() {
        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")
 +      extraconffile := flag.String("extraconffile", "", "extra (usually 
private) HJSON/JSON config from specified file path")
        normaliseconf := flag.Bool("normaliseconf", false, "use in combination 
with either -useconf or -useconffile, outputs your configuration normalised")
+       exportkey := flag.Bool("exportkey", false, "use in combination with 
either -useconf or -useconffile, outputs your private key in PEM format")
        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)")
-@@ -213,6 +227,7 @@ func getArgs() yggArgs {
-               genconf:       *genconf,
-               useconf:       *useconf,
-               useconffile:   *useconffile,
-+                extraconffile: *extraconffile,
-               normaliseconf: *normaliseconf,
-               confjson:      *confjson,
-               autoconf:      *autoconf,
-@@ -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
--              cfg = readConfig(logger, args.useconf, args.useconffile, 
args.normaliseconf)
-+              cfg = readConfig(logger, args.useconf, args.useconffile, 
args.extraconffile, args.normaliseconf)
-               // 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
+@@ -137,6 +138,17 @@ func main() {
+               return
+       }
+ 
++      if *extraconffile !="" {
++              f, err := os.Open(*extraconffile)
++              if err != nil {
++                      panic(err)
++              }
++              if _, err := cfg.ReadFrom(f); err != nil {
++                      panic(err)
++              }
++              _ = f.Close()
++      }
++
+       privateKey := ed25519.PrivateKey(cfg.PrivateKey)
+       publicKey := privateKey.Public().(ed25519.PublicKey)
+ 
+diff --git a/src/config/config.go b/src/config/config.go
+index e899a35..76b9ec8 100644
+--- a/src/config/config.go
++++ b/src/config/config.go
+@@ -112,7 +112,7 @@ func (cfg *NodeConfig) ReadFrom(r io.Reader) (int64, 
error) {
+       // then parse the configuration we loaded above on top of it. The effect
+       // of this is that any configuration item that is missing from the 
provided
+       // configuration will use a sane default.
+-      *cfg = *GenerateConfig()
++      // *cfg = *GenerateConfig()
+       if err := cfg.UnmarshalHJSON(conf); err != nil {
+               return n, err
+       }
+
+base-commit: b759683b76985665b5218346abab35f08d9f4d38
 -- 
-2.33.1
+2.41.0