From: "Ludovic Courtès" <ludo@gnu.org>
To: Maxime Devos <maximedevos@telenet.be>
Cc: Hartmut Goebel <hartmut@goebel-consult.de>, 45875@debbugs.gnu.org
Subject: [bug#45875] [PATCH] Update gnunet to version 0.14.0
Date: Mon, 22 Mar 2021 18:11:40 +0100 [thread overview]
Message-ID: <87a6qvw1tf.fsf_-_@gnu.org> (raw)
In-Reply-To: <7188d04d086a73dc2d59282a098eb1f0f24ef8ef.camel@telenet.be> (Maxime Devos's message of "Sun, 31 Jan 2021 18:11:59 +0100")
Hi!
Hartmut, could you take a look?
Thanks,
Ludo’.
Maxime Devos <maximedevos@telenet.be> skribis:
> An updated and much simpler patch is attached,
> which adds the missing test_proxy.sh. However,
> it is currently failing (something about CONVERSATION,
> IDENTITY and type errors?). I haven't investigated
> closely yet, as I'm currently focusing on other things,
> so I'm posting the (failing) patch and build log.
>
>
> From b4555addd58c9c2d0026a55313791761dc920976 Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos@telenet.be>
> Date: Sun, 31 Jan 2021 10:44:43 +0100
> Subject: [PATCH] index on master: 085708344c services: shepherd: allow custom
> 'shepherd' package
>
> ---
> gnu/packages/gnunet.scm | 11 ++--
> .../patches/gnunet-add-test-proxy.patch | 66 +++++++++++++++++++
> 2 files changed, 73 insertions(+), 4 deletions(-)
> create mode 100644 gnu/packages/patches/gnunet-add-test-proxy.patch
>
> diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
> index 80e4aba29b..35c8fc67af 100644
> --- a/gnu/packages/gnunet.scm
> +++ b/gnu/packages/gnunet.scm
> @@ -11,6 +11,7 @@
> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
> +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -256,15 +257,17 @@ supports HTTP, HTTPS and GnuTLS.")
> (define-public gnunet
> (package
> (name "gnunet")
> - (version "0.13.1")
> + (version "0.14.0")
> (source
> (origin
> (method url-fetch)
> (uri (string-append "mirror://gnu/gnunet/gnunet-" version
> ".tar.gz"))
> + (patches
> + (search-patches "gnunet-add-test-proxy.patch"))
> (sha256
> (base32
> - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"))))
> + "1as5mxg94vby10wxgxbsr8cxzh35lyinlp1cr8sx7l9fscxn1vys"))))
> (build-system gnu-build-system)
> (inputs
> `(("bluez" ,bluez)
> @@ -386,14 +389,14 @@ services.")
> (define-public gnunet-gtk
> (package (inherit gnunet)
> (name "gnunet-gtk")
> - (version "0.13.1")
> + (version "0.14.0")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-"
> version ".tar.gz"))
> (sha256
> (base32
> - "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j"))))
> + "18rc7mb45y17d5nrlpf2p4ixp7ir67gcgjf4hlj4r95ic5zi54wa"))))
> (arguments
> `(#:configure-flags
> (list "--with-libunique"
> diff --git a/gnu/packages/patches/gnunet-add-test-proxy.patch b/gnu/packages/patches/gnunet-add-test-proxy.patch
> new file mode 100644
> index 0000000000..9d15875ec2
> --- /dev/null
> +++ b/gnu/packages/patches/gnunet-add-test-proxy.patch
> @@ -0,0 +1,66 @@
> +This file was missing from the 0.14.0 tarball.
> +
> +Upstream bug URL:
> +https://bugs.gnunet.org/view.php?id=6690
> +
> +diff --git a/src/gns/test_proxy.sh b/src/gns/test_proxy.sh
> +new file mode 100755
> +index 000000000..7c17cd4c5
> +--- /dev/null
> ++++ b/src/gns/test_proxy.sh
> +@@ -0,0 +1,55 @@
> ++#!/bin/bash
> ++# This file is in the public domain.
> ++TEST_DOMAIN="www.test"
> ++
> ++# Delete old files before starting test
> ++rm -rf /tmp/gnunet/test-gnunet-gns-testing/
> ++gnunet-arm -s -c test_gns_proxy.conf
> ++gnunet-gns-proxy-setup-ca -c test_gns_proxy.conf
> ++
> ++openssl genrsa -des3 -passout pass:xxxx -out server.pass.key 2048
> ++openssl rsa -passin pass:xxxx -in server.pass.key -out local.key
> ++rm server.pass.key
> ++openssl req -new -key local.key -out server.csr \
> ++ -subj "/C=DE/O=GNUnet/OU=GNS/CN=test.local"
> ++openssl x509 -req -days 1 -in server.csr -signkey local.key -out local.crt
> ++openssl x509 -in local.crt -out local.der -outform DER
> ++HEXCERT=`xxd -p local.der | tr -d '\n'`
> ++#echo "This is the certificate the server does not use: $HEXCERT"
> ++OLDBOXVALUE="6 8443 52 3 0 0 $HEXCERT"
> ++
> ++
> ++openssl req -new -key local.key -out server.csr \
> ++ -subj "/C=DE/O=GNUnet/OU=GNS/CN=test.local"
> ++openssl x509 -req -days 1 -in server.csr -signkey local.key -out local.crt
> ++openssl x509 -in local.crt -out local.der -outform DER
> ++HEXCERT=`xxd -p local.der | tr -d '\n'`
> ++#echo "This is the certificate the server does use: $HEXCERT"
> ++BOXVALUE="6 8443 52 3 0 0 $HEXCERT"
> ++
> ++cat local.crt > /tmp/server_cacert.pem
> ++cat local.key >> /tmp/server_cacert.pem
> ++
> ++gnunet-identity -C test -c test_gns_proxy.conf
> ++gnunet-namestore -p -z test -a -n www -t A -V 127.0.0.1 -e never -c test_gns_proxy.conf
> ++gnunet-namestore -p -z test -a -n www -t LEHO -V "test.local" -e never -c test_gns_proxy.conf
> ++gnunet-namestore -p -z test -a -n www -t BOX -V "$OLDBOXVALUE" -e never -c test_gns_proxy.conf
> ++gnunet-namestore -p -z test -a -n www -t BOX -V "$BOXVALUE" -e never -c test_gns_proxy.conf
> ++
> ++gnunet-arm -i gns-proxy -c test_gns_proxy.conf
> ++
> ++#gnurl --socks5-hostname 127.0.0.1:7777 https://www.test -v --cacert /tmp/proxy_cacert.pem
> ++./test_gns_proxy -A /tmp/proxy_cacert.pem -S /tmp/server_cacert.pem -p 8443 -c test_gns_proxy.conf
> ++
> ++RES=$?
> ++
> ++rm /tmp/proxy_cacert.pem
> ++rm /tmp/server_cacert.pem
> ++
> ++gnunet-arm -e test_gns_proxy.conf
> ++
> ++if test $RES != 0
> ++then
> ++ echo "Failed"
> ++ exit 1
> ++fi
next prev parent reply other threads:[~2021-03-22 17:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87h72isi5p.fsf.ref@aol.com>
2021-01-14 22:21 ` [bug#45875] [PATCH] Update gnunet to version 0.14.0 Maxime Devos
2021-01-23 15:43 ` Maxime Devos
2021-01-30 11:49 ` Hartmut Goebel
2021-01-30 12:15 ` Maxime Devos
2021-01-30 12:39 ` Hartmut Goebel
2021-01-30 13:25 ` Maxime Devos
2021-01-30 13:46 ` Hartmut Goebel
2021-01-31 17:11 ` Maxime Devos
2021-03-22 17:11 ` Ludovic Courtès [this message]
2022-02-26 16:49 ` [bug#45875] gnunet 0.16.0 released Hartmut Goebel
2021-05-17 9:11 ` [bug#45875] [PATCH 0/3] gnu: gnunet: Update to 0.14.1-77fd866 Brendan Tildesley
2021-05-17 9:11 ` [bug#45875] [PATCH 1/3] gnu: zbar: Update to 0.23.90 Brendan Tildesley
2021-05-17 9:11 ` [bug#45875] [PATCH 2/3] gnu: gnunet: Update to 0.14.1-77fd866 Brendan Tildesley
2021-05-17 14:51 ` [bug#45875] [PATCH v2 " Brendan Tildesley
2021-05-17 14:51 ` Brendan Tildesley
2021-05-19 3:04 ` [bug#45875] [PATCH v3 2/3] gnu: gnunet: Update to 0.14.1-1915a74 Brendan Tildesley
2021-05-19 3:12 ` [bug#45875] [PATCH v4 2/3] gnu: gnunet: Update to 0.14.1-00c2115 Brendan Tildesley
2021-05-17 9:11 ` [bug#45875] [PATCH 3/3] gnu: gnunet-gtk: Update to 0.14.0 Brendan Tildesley
2021-05-20 19:16 ` [bug#45875] [PATCH 0/3] gnu: gnunet: Update to 0.14.1-77fd866 Maxime Devos
2021-05-21 0:14 ` Brendan Tildesley
2021-05-21 6:23 ` Maxime Devos
2021-05-23 8:39 ` Brendan Tildesley
2022-04-02 2:52 ` [bug#45875] [PATCH] Updating gnunet to version 0.14.0 Brendan Tildesley
2022-08-11 19:18 ` [bug#45875] [PATCH] Update " Hendursaga via Guix-patches via
2023-02-22 16:18 ` bug#45875: " Guillaume Le Vaillant
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a6qvw1tf.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=45875@debbugs.gnu.org \
--cc=hartmut@goebel-consult.de \
--cc=maximedevos@telenet.be \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).