From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id iDi6G0WvjmQlewAASxT56A (envelope-from ) for ; Sun, 18 Jun 2023 09:16:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yNyPG0WvjmTwNwEA9RJhRA (envelope-from ) for ; Sun, 18 Jun 2023 09:16:21 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 35A081285C for ; Sun, 18 Jun 2023 09:16:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAmdx-0006pi-U3; Sun, 18 Jun 2023 03:16:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAmdm-0006fZ-AT for guix-patches@gnu.org; Sun, 18 Jun 2023 03:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAmdl-0004RU-Tl for guix-patches@gnu.org; Sun, 18 Jun 2023 03:16:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAmdl-0002hT-Ns for guix-patches@gnu.org; Sun, 18 Jun 2023 03:16:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64145] [PATCH] gnu: yggdrasil: Update to 0.4.7. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 07:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64145@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168707255110348 (code B ref -1); Sun, 18 Jun 2023 07:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jun 2023 07:15:51 +0000 Received: from localhost ([127.0.0.1]:53033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAmda-0002gq-Hx for submit@debbugs.gnu.org; Sun, 18 Jun 2023 03:15:51 -0400 Received: from lists.gnu.org ([209.51.188.17]:42330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAmdX-0002ga-5f for submit@debbugs.gnu.org; Sun, 18 Jun 2023 03:15:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAmdE-0006N6-2H for guix-patches@gnu.org; Sun, 18 Jun 2023 03:15:38 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAmdB-0004NZ-Qe for guix-patches@gnu.org; Sun, 18 Jun 2023 03:15:27 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2b46773e427so13557831fa.3 for ; Sun, 18 Jun 2023 00:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687072523; x=1689664523; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=OdDjQzNYo+nounyY0JFvbgc/PU7dfQy3sF0mPNSeulk=; b=Dtw8CDYeaWSX+d58XBQzfgviN56fyNBk1a/37Vc5jDjzWUqn5oQyscUL0eSwED/9cV 6N7Ic3wat/Z53p43TSXoCJpXmSTpiGBOrJMBZtc33YVDKRrhUna7nORJVsrW0Sjgy+oh S2O+y04/SsACT/VwxXoxdvy05qpjb+00PrGtP0gTDYck8GIoVh15lFAIqD8ebr6zS9RI 2bV97F2sDLGfSbiiq2etfscXPfWtW323/5NPOiFttu7i8EkQCkFaTsdKby8g+OqGItR8 GijC6ZRX/6aqq92Lk/gF5gMiQ+sJToch+x3iV2NrNxbJ2/+AhG5YFHFfts7WBbCI1fyn AyaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687072523; x=1689664523; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OdDjQzNYo+nounyY0JFvbgc/PU7dfQy3sF0mPNSeulk=; b=G+T33/1O0hNGy/aHxPmG5OtIeG40Aa/n99FeCvYYMmM9vBc8whZ2KY27Yw3ISjOVqr 8bGLcJ9DEy3Bwwxz8Tj5n/yjNMbQFZ5Vr5ZkzUgGS+RXiHCD5V9ieLMQvw0bQsSXgUtD g9AlASvK8bZaGRF0hljS/wUea8vUtcdKjjL4JS27GqXV0dtfyl+PT/PkIHGITfRXcCus MlIs6RafNFzQIzGr2dOClAIEg5kxEBRRRfN32vWZl07SJz0UhW/P5SybJ6L/swOnqr+g E3qAi8sSGNWiD9Dh0RdSsliv71U6ygOYXfQL2MR/Q6Nz+vtrfS3L2U8AG3ZgcE+6wdF5 6VJA== X-Gm-Message-State: AC+VfDyxvimVKuPvgDXoPM2rP6vM20IIlfsUqnIjOD30UCFtN0E8xAUX oEWBoFSK8bNpKsWJBOV7PreyBNWHUqo= X-Google-Smtp-Source: ACHHUZ55X4DDlbQOJ77iCrG9/h/WNbtriRfxPkoWqbj9sQkcy0yj9r/CglqPP5pKZpKIV+bE6GWCgQ== X-Received: by 2002:a2e:9854:0:b0:2b4:756b:8e71 with SMTP id e20-20020a2e9854000000b002b4756b8e71mr205436ljj.44.1687072522960; Sun, 18 Jun 2023 00:15:22 -0700 (PDT) Received: from elephant ([95.79.17.27]) by smtp.gmail.com with ESMTPSA id v2-20020a2e7a02000000b002a9eba29c39sm4505815ljc.91.2023.06.18.00.15.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 00:15:22 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sun, 18 Jun 2023 10:15:18 +0300 Message-ID: <877cs1p7g9.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x22f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687072581; a=rsa-sha256; cv=none; b=n7q1aV9JbtuGqDG5BEW1VWKfbJlpBYqPnPs9DrQPCel8Kg7tyFjn+57EJsESJRKOnX3Y4L VItCz3fFl3dx0YEFsXPQuQbOfBjggmWXiAiTOBbNdPY0AHXMyuoZN8SOjcdmB8+olG8i2/ 7SrrYDdOhr2j1s8IHm9+Kzi2kfWIRhmX8/Qcn4qF3NeayPcQoP0q1f7B9SNPTZg4FkOLUg QLzJoOjO0s+6ks3AhzdNl73WV3lxOHdqkzu1PmrGN9ORgef0OpR1jCySvfy7ZO75VRosr/ Rdt3cqLc/tf7M0PSxivfKcLbh7I8Vl1QQREUUJHbIK19NCGT3joxrnDh8kqjUw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Dtw8CDYe; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687072581; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=OdDjQzNYo+nounyY0JFvbgc/PU7dfQy3sF0mPNSeulk=; b=L/VGuXGWe1kkTw6NMiCOKPiLfdnV8kMQuw0VFTLcKr2H6k/CgxsZNv9eeQX7E4oU8mT3mQ spIGUQgnteLQ70P3oPubYnJEgYEaTHAufk/eINpFsmbXDX8Y6i+YDAvDzDXVFqPptO39HG TKRsbt7GiKV3j70YSbQX/wGBVJtY98aYyHl31G6+7j28wjTFjRubwQgfOk3OcOmcWghPDf newi6TJsYJz6zCjWVVgPt9Nc2Sv/HnFNTjbw2Y3N9/sC1H3A8uvSfzPmpMQCm1epn3xNQx DeKThUTpgVe2bnD6dNUqCVRcFVNPLJLiJ9G8Pqd/HysSnqyMVeaCkf+n45c4Jg== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Dtw8CDYe; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -5.04 X-Spam-Score: -5.04 X-Migadu-Queue-Id: 35A081285C X-TUID: rSAA9wQe+46Y --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, this patch series updates "yggdrasil" package to 0.4.7. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-go-github-com-arceliar-ironwood-Update-to-0.0.0-.patch Content-Transfer-Encoding: quoted-printable From=2018dce04a73f64ff3e495be13b7a15a659aa98432 Mon Sep 17 00:00:00 2001 Message-Id: <18dce04a73f64ff3e495be13b7a15a659aa98432.1687072499.git.poptso= v.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Sun, 18 Jun 2023 10:03:59 +0300 Subject: [PATCH 1/2] gnu: go-github-com-arceliar-ironwood: Update to 0.0.0-20221115123222-ec61cea2f439. * gnu/packages/golang.scm (go-github-com-arceliar-ironwood): Update to 0.0.0-20221115123222-ec61cea2f439. =2D-- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d51c023808..ced75a7894 100644 =2D-- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11610,7 +11610,7 @@ (define-public go-github-com-containerd-console (define-public go-github-com-arceliar-ironwood (package (name "go-github-com-arceliar-ironwood") =2D (version "0.0.0-20210912013146-c2bc55bb349c") + (version "0.0.0-20221115123222-ec61cea2f439") (source (origin (method git-fetch) @@ -11620,7 +11620,7 @@ (define-public go-github-com-arceliar-ironwood (file-name (git-file-name name version)) (sha256 (base32 =2D "1dfkqnkfxwlwcsk8g9r1pv84lfzgn8r1vam13zlmk81cgan2r6fx")))) + "0jdfhsr1yci0a4fpf2pmh9n4d7iryjx12y3549gv9nfjf91rs225")))) (build-system go-build-system) (arguments '(#:import-path "github.com/Arceliar/ironwood" base-commit: 5c66be3c17e279e4589320c69deb5dba0fd034e2 =2D-=20 2.34.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-gnu-yggdrasil-Update-to-0.4.7.patch Content-Transfer-Encoding: quoted-printable From=2042a23d45d574bb7babdba54b544ca21340bb891f Mon Sep 17 00:00:00 2001 Message-Id: <42a23d45d574bb7babdba54b544ca21340bb891f.1687072499.git.poptso= v.artyom@gmail.com> In-Reply-To: <18dce04a73f64ff3e495be13b7a15a659aa98432.1687072499.git.popts= ov.artyom@gmail.com> References: <18dce04a73f64ff3e495be13b7a15a659aa98432.1687072499.git.poptso= v.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Sun, 18 Jun 2023 10:07:32 +0300 Subject: [PATCH 2/2] gnu: yggdrasil: Update to 0.4.7. * gnu/packages/networking.scm (yggdrasil): Update to 0.4.7. [arguments]: Use G-expressions. Set the package build name and version. Use go-1.20. [propagated-inputs]: Add "go-golang-org-x-tools", "go-github-com-olekukonko-tablewriter" and "go-github-com-mattn-go-colorable". * gnu/packages/patches/yggdrasil-extra-config.patch: Don't use deprecated "ioutil". =2D-- gnu/packages/networking.scm | 49 +++++++++++-------- .../patches/yggdrasil-extra-config.patch | 2 +- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b0cdcdf6a3..c3d041f109 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4392,7 +4392,7 @@ (define-public nbd (define-public yggdrasil (package (name "yggdrasil") =2D (version "0.4.3") + (version "0.4.7") (source (origin (method git-fetch) @@ -4403,27 +4403,33 @@ (define-public yggdrasil (recursive? #t))) (file-name (git-file-name name version)) (sha256 =2D (base32 "0jp6998a45xi8pbi8p84chvpm1mhhcvcxm1avi1c1gjjp4jqm3vl")) + (base32 "01mllfrsr55lnfivxwa57cfrjas6w4shsvx9k81pw8jixc124myk")) (patches (search-patches "yggdrasil-extra-config.patch")))) (build-system go-build-system) (arguments =2D '(#:import-path "github.com/yggdrasil-network/yggdrasil-go" =2D ;; TODO: figure out how tests are run =2D #:tests? #f =2D #:install-source? #f =2D #:phases =2D (modify-phases %standard-phases =2D (replace 'build =2D (lambda* (#:key import-path build-flags #:allow-other-keys) =2D (for-each =2D (lambda (directory) =2D ((assoc-ref %standard-phases 'build) =2D #:build-flags build-flags =2D #:import-path directory)) =2D (list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggd= rasil" =2D "github.com/yggdrasil-network/yggdrasil-go/cmd/yggd= rasilctl" =2D "github.com/yggdrasil-network/yggdrasil-go/cmd/genk= eys")) =2D #t))))) + (list #:import-path "github.com/yggdrasil-network/yggdrasil-go" + ;; TODO: figure out how tests are run + #:tests? #f + #:install-source? #f + #:go go-1.20 + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda* (#:key import-path build-flags #:allow-other-key= s) + (let* ((pkgsrc "github.com/yggdrasil-network/yggdrasil-= go/src/version") + (ldflags (format #f + "-X ~a.buildName=3Dyggdrasil -X= ~a.buildVersion=3D~a" + pkgsrc + pkgsrc + #$version))) + (for-each + (lambda (directory) + ((assoc-ref %standard-phases 'build) + #:build-flags `("-ldflags" ,ldflags) + #:import-path directory)) + (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" @@ -4433,8 +4439,10 @@ (define-public yggdrasil 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 @@ -4446,7 +4454,8 @@ (define-public yggdrasil go-github-com-cheggaaa-pb-v3 go-github-com-vividcortex-ewma go-github-com-arceliar-phony =2D go-github-com-arceliar-ironwood)) + go-github-com-arceliar-ironwood + go-github-com-mattn-go-colorable)) (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/packag= es/patches/yggdrasil-extra-config.patch index bd4bea7b9f..7934e2b50f 100644 =2D-- a/gnu/packages/patches/yggdrasil-extra-config.patch +++ b/gnu/packages/patches/yggdrasil-extra-config.patch @@ -33,7 +33,7 @@ index 58b8230..b9df98a 100644 panic(err) } + if extraconffile !=3D "" { =2D+ extraconf, err =3D ioutil.ReadFile(extraconffile); ++ extraconf, err =3D os.ReadFile(extraconffile); + } + if err !=3D nil { + panic(err) =2D-=20 2.34.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thanks, =2D avp =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmSOrwYZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL8mdB/4ssA22xQphaT8Mtw5WfTvW hBthJ+twXqkm3r8JP+Qb9mkG1nO+CbSA1qRo0sHGdQI65wpSPm7o8hD/6MNGk72P 2PbOFgqN/AxbbeLKxcR7JllziFUVtGz02/qck54zhSgZP9HmLB8zr/nId/btSh7I VWCAACSBex/VyBbczIKL4BuNgnbXGAOM5Rv8zbO2hmG9Tdt8DK08jxtejUL7XmTI XlcpH1uiBXhBzy1VMLiy8ZJtPWyt4SZLNDU7Exp9Z16wwCAzF1KZ7o4ivtwW4fT9 zZlSegc9BOTrW4INauwEfJXZOTwx5zsqtkhujTD/j7gBnrut4tRae1FOzT+Oft1+ =GCwl -----END PGP SIGNATURE----- --==-=-=--