From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QdGjBvHRWGDwVAAA0tVLHw (envelope-from ) for ; Mon, 22 Mar 2021 17:20:49 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wFH2AfHRWGDiIgAA1q6Kng (envelope-from ) for ; Mon, 22 Mar 2021 17:20:49 +0000 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 540FB1F058 for ; Mon, 22 Mar 2021 18:20:48 +0100 (CET) Received: from localhost ([::1]:35878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOOER-00014X-DU for larch@yhetil.org; Mon, 22 Mar 2021 13:20:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOO5y-0003qf-Br for guix-patches@gnu.org; Mon, 22 Mar 2021 13:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOO5y-0006Mo-2M for guix-patches@gnu.org; Mon, 22 Mar 2021 13:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOO5x-00060T-U2 for guix-patches@gnu.org; Mon, 22 Mar 2021 13:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#45875] [PATCH] Update gnunet to version 0.14.0 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Mar 2021 17:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45875 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: Hartmut Goebel , 45875@debbugs.gnu.org Received: via spool by 45875-submit@debbugs.gnu.org id=B45875.161643311623078 (code B ref 45875); Mon, 22 Mar 2021 17:12:01 +0000 Received: (at 45875) by debbugs.gnu.org; 22 Mar 2021 17:11:56 +0000 Received: from localhost ([127.0.0.1]:58431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOO5m-000602-MN for submit@debbugs.gnu.org; Mon, 22 Mar 2021 13:11:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOO5l-0005zo-Bv for 45875@debbugs.gnu.org; Mon, 22 Mar 2021 13:11:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34767) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOO5e-0006Cq-Uo; Mon, 22 Mar 2021 13:11:43 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43078 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lOO5d-0006h4-Jn; Mon, 22 Mar 2021 13:11:42 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <2b7dcca48ca14f0e13acab6897174df4bea345d0.camel@telenet.be> <7733e34c889c91695305635177a98c15bb1a492e.camel@telenet.be> <87mtwqve3e.fsf@lenashee.goebel-consult.de> <7849b8c7fdd2e8a5aa5cc7a28b55dbc1796bb83d.camel@telenet.be> <97ff1087-5a6a-3ebe-1e56-7504a727293c@goebel-consult.de> <7188d04d086a73dc2d59282a098eb1f0f24ef8ef.camel@telenet.be> Date: Mon, 22 Mar 2021 18:11:40 +0100 In-Reply-To: <7188d04d086a73dc2d59282a098eb1f0f24ef8ef.camel@telenet.be> (Maxime Devos's message of "Sun, 31 Jan 2021 18:11:59 +0100") Message-ID: <87a6qvw1tf.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616433648; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=XaWFhf8JsEiPkkuLfCs8wVA272PWURvNiIX1SK1b4KY=; b=bIZQFOLMWkAHW8I44vqHIsqpHbNsywQRSoefV/doSJ9zbwPgr32gXwN+DIqUV932R6Rsgq lohoT435LYU61Y7WTt3mmjCVhtxBIjC5Iw7EnUq87maSvVBPoBng4W/jKIUfVvhvGGJUEQ JZRPbiT9zMqsRo+EEroHO8jXbV5vAS5stPFUAqaRgfp0seXllS0bUfFZUpTtyPQ+p2rq15 ihjys5KYAOX7ih8/TCToC2mDSt/rwdGF5INP1fX4YCcW1XnYyvwVmYU5CDVMoDF7kxJWLX NaA7jIzK/+2u6PllRjPsYAYpvZ1Pn9654Xce1xB5GYqPgpoSCtEsmMEas20KuQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616433648; a=rsa-sha256; cv=none; b=Zo1EkvEgGwSSpaqhxM8V1HRj8ridGSmYFE33Z/8CZm7wsYq2sfMTO5aughX1UcBBFjMCRE Tthuut068dklxP0tnG5pTEBnv5OFUrRd36bhSrE7UCVVIpmqSyud2JRpAr24VUQ6MDuyPR JLLuLoxYieHKY8oj6OnNv963DPr4Ir4gm46/h439Ylbt5yxRLfOqnwRhyoLVLKN0ba8aQW 9i92cUne1/aeij1NxLAIDsdGJEfB58lN3+/uch7xJmMKcmSUzNgCmFiT3AeKQDTq/rFNeE f9eVIEcDbIideiIQUaSsX+HnNU6uq/1w6552CcCOLpN+5NDwApq2VKOwBtRBEw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 540FB1F058 X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: IDZww1iMpM1a Hi! Hartmut, could you take a look? Thanks, Ludo=E2=80=99. Maxime Devos 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 > Date: Sun, 31 Jan 2021 10:44:43 +0100 > Subject: [PATCH] index on master: 085708344c services: shepherd: allow cu= stom > '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 =C2=A9 2019 Brett Gilio > ;;; Copyright =C2=A9 2020 Tanguy Le Carrour > ;;; Copyright =C2=A9 2020 Michael Rohleder > +;;; Copyright =C2=A9 2021 Maxime Devos > ;;; > ;;; 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/packa= ges/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=3D6690 > + > +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=3D"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=3DDE/O=3DGNUnet/OU=3DGNS/CN=3Dtest.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=3D`xxd -p local.der | tr -d '\n'` > ++#echo "This is the certificate the server does not use: $HEXCERT" > ++OLDBOXVALUE=3D"6 8443 52 3 0 0 $HEXCERT" > ++ > ++ > ++openssl req -new -key local.key -out server.csr \ > ++ -subj "/C=3DDE/O=3DGNUnet/OU=3DGNS/CN=3Dtest.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=3D`xxd -p local.der | tr -d '\n'` > ++#echo "This is the certificate the server does use: $HEXCERT" > ++BOXVALUE=3D"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 tes= t_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 /t= mp/proxy_cacert.pem > ++./test_gns_proxy -A /tmp/proxy_cacert.pem -S /tmp/server_cacert.pem -p = 8443 -c test_gns_proxy.conf > ++ > ++RES=3D$? > ++ > ++rm /tmp/proxy_cacert.pem > ++rm /tmp/server_cacert.pem > ++ > ++gnunet-arm -e test_gns_proxy.conf > ++ > ++if test $RES !=3D 0 > ++then > ++ echo "Failed" > ++ exit 1 > ++fi