From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iPbdAnqFomDerQAAgWs5BA (envelope-from ) for ; Mon, 17 May 2021 17:02:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iEArOnmFomB9aAAA1q6Kng (envelope-from ) for ; Mon, 17 May 2021 15:02:17 +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 7900021694 for ; Mon, 17 May 2021 17:02:17 +0200 (CEST) Received: from localhost ([::1]:42842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liel6-0007GI-FS for larch@yhetil.org; Mon, 17 May 2021 11:02:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liebD-00049d-BE for guix-patches@gnu.org; Mon, 17 May 2021 10:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1liebC-0005MJ-AY for guix-patches@gnu.org; Mon, 17 May 2021 10:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1liebC-00088l-9Y for guix-patches@gnu.org; Mon, 17 May 2021 10:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#45875] [PATCH v2 2/3] gnu: gnunet: Update to 0.14.1-77fd866. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 May 2021 14:52: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: 45875@debbugs.gnu.org Cc: Hartmut Goebel , Maxime Devos Received: via spool by 45875-submit@debbugs.gnu.org id=B45875.162126310531249 (code B ref 45875); Mon, 17 May 2021 14:52:02 +0000 Received: (at 45875) by debbugs.gnu.org; 17 May 2021 14:51:45 +0000 Received: from localhost ([127.0.0.1]:53406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lieal-00087j-P8 for submit@debbugs.gnu.org; Mon, 17 May 2021 10:51:45 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:61024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lieag-00087F-Sl for 45875@debbugs.gnu.org; Mon, 17 May 2021 10:51:34 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4FkMXD6Mb4zQk1j; Mon, 17 May 2021 16:51:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1621263082; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=2V872xytJ3L61wMJz5nZCPnOTqtF+Q62oT9PDFojMSE=; b=JweBK5VX292jsd57X043Av/3TcOcDq5hzgouDJv5boebRnLf65Ku4OELy029X8/J8xzzwJ z1HLy8yLk0K6zBws8DYSopcLkRtu4c6HTI/SlrzvGzsz8a8k2kCEnu5y36WxYTHBsiav/m Fx3+K4hUbdDGXli1aXQoUEmns3tBE2fAcSRuZLt2ihGFZP1R2TXwQK7mYSlX/ui9T3UF78 C89I9j28o/zrh77LULA9Vlo2m2ZKZF4rWV+SyoRdT+3kDlaja+fjLS/eOY2CkDJRuwiZM/ 71WicpdiGDI5IjLpy6bv07MTdZKXH/WYyPorlGgCOimpPVdetsxXEiWrsRB2hg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id RZ83lIZHzUUY; Mon, 17 May 2021 16:51:21 +0200 (CEST) From: Brendan Tildesley Date: Tue, 18 May 2021 00:51:04 +1000 Message-Id: <20210517145104.21455-2-mail@brendan.scot> In-Reply-To: <20210517145104.21455-1-mail@brendan.scot> References: <20210517091142.25872-3-mail@brendan.scot> <20210517145104.21455-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -6.24 / 15.00 / 15.00 X-Rspamd-Queue-Id: A29661888 X-Rspamd-UID: d24a3c 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=1621263737; 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:dkim-signature; bh=2V872xytJ3L61wMJz5nZCPnOTqtF+Q62oT9PDFojMSE=; b=hFERza+sP0MhdbPOYtp/v6qU9efmtI8jjZxKQvAMdLWf+jI83+/uFZNmX5KiqvLFaq2rts Ab22WdibRiC9rW2AUpyvlxCDsMy+Vmi/eHr7qMZVnTvhPQhrFsbC/APuO6T0Vy7U5f04SU pO1VblEuUD1LjvbAIt2s7VtVMrUgaDZKXvWgBrUK0gHuzflyZFH8+aVOi3x1sLO0w55w5y g0Hxt4TR5bpRQyuB7YdOTziW6PfbxAaBLZhOsITGlWyZp6cfFRk7tAcgqYSDqxjgx/delJ pRqMokeBcom+kqCDiu/APblEiVWxy1tZfszutKXSUlkB+oZUvFcRiz5mi4tB+A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621263737; a=rsa-sha256; cv=none; b=UWVVpqk3xkG3S2lo8n4EdENJBuldCgikrwUxCYPbJrlojY40h06japOAxYB4E8rb6fqWan 2Gx8nEbijw+G+jK0O9NKrLFnfzUlHzEYPD7xStFWz5zLctdM1gTszYF7MtkdAgOGHdaeIC DikXQ8FFBVy6jfhT0DL6wFOZVGPaGGvdU4Dqihfm/2RhtV4YHwd11ZdVdQq+1Ddx8w0wuZ Qek/XCzHg8GPagXYopMkvk1fdfV2KuiwybKoBv79eh1eHC9o49fEku+Ozf5qJ4u7qeYI4a RkK5oauRa+j4LPIYGiV5XS+ROlmQ9P5S06cUeaD5nXGOkj3QDtuZpjfN3gRsrw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=JweBK5VX; dmarc=none; 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: 1.06 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=JweBK5VX; dmarc=none; 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: 7900021694 X-Spam-Score: 1.06 X-Migadu-Scanner: scn0.migadu.com X-TUID: vN5ORlfwd7T/ * gnu/packages/gnunet.scm: (build-common): New variable. (gnunet): Update to 0.14.1. [origin]: Use git reference to pull latest git due to bug fixes. [native-inputs]: Add autoconf et al. for building from git. Add Taler submodule (build-common). [arguments]: Fix permissions on .po files. Add phase 'add-build-common-submodule to symlink Taler submodule. Enable every test that works. I worked with upstream to fix some test failures, hence the use of this commit instead of the release. --- gnu/packages/gnunet.scm | 89 +++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d0a9955005..0cb9c046ec 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -11,6 +11,8 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,6 +60,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) + #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) #:use-module (gnu packages video) @@ -253,18 +256,34 @@ supports HTTP, HTTPS and GnuTLS.") (ftp-directory . "/gnunet"))) (home-page "https://gnunet.org/en/gnurl.html"))) +(define build-common + (let ((commit "1915a74bbb4cd2ae9bc541a382dfebc37064a2fd")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.taler.net/build-common.git") + (commit commit))) + (file-name (git-file-name "build-common" commit)) + (sha256 + (base32 + "18a44qf8hdq5hqb9ygi45k0zxlhy5d764kan0cz72ir7p0lxcj2h"))))) + (define-public gnunet + ;; Upstream fixed a few test failures for us \o/! + (let ((commit "3b3faa6bce254289dafed73e98352e2a76f1b94b")) (package (name "gnunet") - (version "0.13.1") + (version (string-append "0.14.1" "-" (string-take commit 7))) (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gnunet/gnunet-" version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.gnunet.org/gnunet.git") + (commit commit))) + (file-name (string-append name "-" version)) (sha256 (base32 - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3")))) + "0738wfpmsf4cy9xk63198ihp09ji7bvr6qvjrd0fi45xfgk8wvbz")))) (build-system gnu-build-system) (inputs `(("bluez" ,bluez) @@ -289,7 +308,15 @@ supports HTTP, HTTPS and GnuTLS.") ("zbar" ,zbar) ("zlib" ,zlib))) (native-inputs - `(("curl" ,curl) + ;; For building from git + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gettext" ,gettext-minimal) + ("texinfo" ,texinfo) ; makeinfo + + ("build-common" ,build-common) + ("curl" ,curl) ;; test_plugin_rest_namestore.sh ("pkg-config" ,pkg-config) ("python" ,python) ("xxd" ,xxd) @@ -298,38 +325,38 @@ supports HTTP, HTTPS and GnuTLS.") '(#:parallel-tests? #f ; Parallel tests aren't supported. #:phases (modify-phases %standard-phases + (add-after 'unpack 'fixup-pofile-writability + (lambda _ + ;; bootstrap expects this to be writable + (chmod "po/POTFILES.in" #o700) + ;; Also not writable for some reason. + (for-each + (lambda (file) (chmod file #o700)) + (find-files "po/" "po$")) + #t)) + (add-before 'bootstrap 'add-build-common-submodule + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((build-common (assoc-ref (or native-inputs inputs) "build-common"))) + ;; When building from git, include the contrib/build-common + ;; submodule. + (when build-common + (delete-file-recursively "contrib/build-common") + (symlink build-common "contrib/build-common") + ;; bootstrap expects this to be writable + ;; or non-existent, which isn't the case. + (delete-file "contrib/Makefile.inc"))) + #t)) (add-after 'configure 'remove-failing-tests ;; These tests fail in Guix's building environment. (lambda _ (substitute* "src/transport/Makefile" - (("\\$\\(am__EXEEXT_15\\)") "") ; test_transport_api_https - (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") - (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") - (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) - (substitute* "src/testbed/Makefile" - (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_test\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) - (substitute* "src/topology/Makefile" - (("^check_PROGRAMS.*") "\n") - (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) - (substitute* "src/namestore/Makefile" - (("\\$\\(am__append_2\\)") "")) - (substitute* "src/gns/Makefile" - (("\\$\\(am__append_4\\)") "")) - (substitute* "contrib/Makefile" - (("^check_PROGRAMS.*") "\n")) - ;; 'test' from coreutils doesn't behave as the test expects. + (("\\$\\(am__EXEEXT_15\\)") "")) ; test_transport_api_https + (substitute* "src/setu/Makefile" + (("test_setu_api ") "")) (substitute* '("src/gns/gnunet-gns-proxy-setup-ca.in" "src/transport/gnunet-transport-certificate-creation.in") (("gnutls-certtool") "certtool")) #t)) - (add-before 'check 'set-env-var-for-tests - (lambda _ - (setenv "LANG" "en_US.UTF-8"))) ;; Swap 'check and 'install phases and add installed binaries to $PATH. (add-before 'check 'set-path-for-check (lambda* (#:key outputs #:allow-other-keys) @@ -349,7 +376,7 @@ that sense aims to replace the current internet protocol stack. Along with an application for secure publication of files, it has grown to include all kinds of basic applications for the foundation of a GNU internet.") (license license:agpl3+) - (home-page "https://gnunet.org/"))) + (home-page "https://gnunet.org/")))) (define-public guile-gnunet ;GSoC 2015! (let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602") -- 2.31.1