From patchwork Wed May 19 03:12:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 29411 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 1A3C427BC81; Wed, 19 May 2021 04:14:10 +0100 (BST) 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, 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 75E4127BC78 for ; Wed, 19 May 2021 04:14:09 +0100 (BST) Received: from localhost ([::1]:49322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljCeu-0005Mu-L0 for patchwork@mira.cbaines.net; Tue, 18 May 2021 23:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljCeo-0005Md-GG for guix-patches@gnu.org; Tue, 18 May 2021 23:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljCeo-0002md-8T for guix-patches@gnu.org; Tue, 18 May 2021 23:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ljCeo-0005rS-3d for guix-patches@gnu.org; Tue, 18 May 2021 23:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#45875] [PATCH v4 2/3] gnu: gnunet: Update to 0.14.1-00c2115. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 May 2021 03:14: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.162139400522482 (code B ref 45875); Wed, 19 May 2021 03:14:02 +0000 Received: (at 45875) by debbugs.gnu.org; 19 May 2021 03:13:25 +0000 Received: from localhost ([127.0.0.1]:57714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljCe3-0005qP-Nn for submit@debbugs.gnu.org; Tue, 18 May 2021 23:13:25 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:18942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljCdx-0005q5-Vb for 45875@debbugs.gnu.org; Tue, 18 May 2021 23:13:14 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (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-101.mailbox.org (Postfix) with ESMTPS id 4FlHxW6NfrzQk23; Wed, 19 May 2021 05:13:03 +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=1621393981; 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=35s+1hl7okLhCIMQKN/tikn5O4Uw8UzrFC3j0lSUAQE=; b=Sd4Pob13yf34CKCxXItrUOLDjN/UhWsdNjyiirRR1fDfeWRJ5uFsrxSrTUBAENfqyccEN+ KdZMLHiQmPX2zHuC+giyZ/vbY21aMwx+Mk+ZXb7SBAL5MdecGa2xspDCBnkSJhNNhPK4zi Iej3Y8AmnSDKNwGbZcDfPwxrQrbFgJbhRhLsEfc/VOV71QX909nllc7zt4Cfzl+x+2wgWS UY2XvB4jlJMehwbMZnMFgHpaYUT7pyNO2lsdGg82YO+qo3Q0ZQw7gpdNzKjQTzRZpjED2R OhrVTjeSU7FlhpLZyd8XdDIATkAflXHXDOqsDZJN1e2qfYawPhE99k4fKnbYtg== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id iimpjwPNWUov; Wed, 19 May 2021 05:12:59 +0200 (CEST) From: Brendan Tildesley Date: Wed, 19 May 2021 13:12:41 +1000 Message-Id: <20210519031241.23225-1-mail@brendan.scot> In-Reply-To: <20210517091142.25872-3-mail@brendan.scot> References: <20210517091142.25872-3-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -5.69 / 15.00 / 15.00 X-Rspamd-Queue-Id: B924F17DF X-Rspamd-UID: 3dc09c 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 * gnu/packages/gnunet.scm: (build-common): New variable. (gnunet): Update to 0.14.1-00c2115. [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. --- I lied... I forgot to ammend the commit message. Now it's really for real. gnu/packages/gnunet.scm | 90 +++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d0a9955005..a0bdbe7377 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 "00c21152e81c10dff640ec932127e74ea8bc25ac")) (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")))) + "0fjmdm5m5jf6g1xc7ivicp862pymks2sgxvyla02dd3xgy4lv3ls")))) (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,39 @@ 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 + ;; Test may be broken: https://bugs.gnunet.org/view.php?id=6114 + (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 +377,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")