From patchwork Sun Jan 31 17:11:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 26791 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D1BA327BC1D; Sun, 31 Jan 2021 17:13:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,LOTS_OF_MONEY,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 53CF627BC1E for ; Sun, 31 Jan 2021 17:13:18 +0000 (GMT) Received: from localhost ([::1]:51714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6GHl-0007tM-BE for patchwork@mira.cbaines.net; Sun, 31 Jan 2021 12:13:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6GHW-0007sS-Ow for guix-patches@gnu.org; Sun, 31 Jan 2021 12:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46331) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6GHW-0008S1-Fa for guix-patches@gnu.org; Sun, 31 Jan 2021 12:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6GHW-0000ay-AW for guix-patches@gnu.org; Sun, 31 Jan 2021 12:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45875] [PATCH] Update gnunet to version 0.14.0 Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Jan 2021 17:13:02 +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: Hartmut Goebel , 45875@debbugs.gnu.org Received: via spool by 45875-submit@debbugs.gnu.org id=B45875.16121131362233 (code B ref 45875); Sun, 31 Jan 2021 17:13:02 +0000 Received: (at 45875) by debbugs.gnu.org; 31 Jan 2021 17:12:16 +0000 Received: from localhost ([127.0.0.1]:57877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6GGh-0000Zs-Bm for submit@debbugs.gnu.org; Sun, 31 Jan 2021 12:12:16 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:55984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6GGd-0000Zh-FZ for 45875@debbugs.gnu.org; Sun, 31 Jan 2021 12:12:10 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id PVC5240050mfAB406VC5Yv; Sun, 31 Jan 2021 18:12:05 +0100 Message-ID: <7188d04d086a73dc2d59282a098eb1f0f24ef8ef.camel@telenet.be> From: Maxime Devos Date: Sun, 31 Jan 2021 18:11:59 +0100 In-Reply-To: <97ff1087-5a6a-3ebe-1e56-7504a727293c@goebel-consult.de> 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> User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1612113125; bh=1pEW09Ra9UqUBztbYrkTQB+aHaTiD4Rl1CYaT0bsGG8=; h=Subject:From:To:Date:In-Reply-To:References; b=A6/19Fp/aFZssyEjdIXMNpN1PxvsaBEOXxUfsQqMNvFjuSHHV7RgQaqKNxa2qJ7ZS y0tBhN+MnV8HG6FK/+aCwTWoqAGNhfjJl8ntdCPDXRpIE71Npgyr4fKjFwKZmgaiQM Z/DbaDzFtera5yygSxI1NJtqqqe8tz+DSpG3LRNfIldm+8/nuDJUOnIwA56+GEuPhc uh1WmqHZkpWgZcrrWJ666lgmoygthMKVlqCBGmJYT7hFdoLsULpww192HUl5tKQtAP DcJ/63Z8p4BUa5tNiOh2FvWTl5S7uuih5/9wQCQOA2YVtqMc4vxv6+zEoKoi4q8Sw6 EWuxAjbvTW8aQ== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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 ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 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/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 -- 2.30.0