From debbugs-submit-bounces@debbugs.gnu.org Tue May 18 23:05:39 2021 Received: (at 45875) by debbugs.gnu.org; 19 May 2021 03:05:39 +0000 Received: from localhost ([127.0.0.1]:57696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljCWX-0005eM-KC for submit@debbugs.gnu.org; Tue, 18 May 2021 23:05:39 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:18880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljCWT-0005e7-5w for 45875@debbugs.gnu.org; Tue, 18 May 2021 23:05:28 -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 4FlHmZ6w2wzQk2f; Wed, 19 May 2021 05:05:18 +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=1621393517; 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=MJSU+kWKz/vnoEaGx1UAS7kxrayV+6mYPe3jXBgstts=; b=dcTxXctXn27S0Fog9mbii3oPPGFXPRt4bJ9ZzhLDXxNF+niDTCQxSz8NVS2tenuLLEeByV S6pTVk7uVOUqc8odX4wfSy26lHSC2Kup5oYhT1p/jN2Dt9gz7AZkey9gZOGRcuZZkjvtZw 9MlXz7zG2Dsav5IUZ1GxijRP7SZgAqs3rKb6kXsaR0Ge40Ht9YxrG4fA7j6k4ASRQdSukF vcDR7w89LAbSCu1lVlOvjePXpCTNwlcu866bI7qPdLBU5z51vAeM/EF1GFa92HroU6ZyyM B0mXkEsBLra5e5cd2vczJ5oiJCryzmbVoyXwkvePbeDUoWxe1V6IAWfRvS0EHw== Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id wRU8_EM2W5Sk; Wed, 19 May 2021 05:05:14 +0200 (CEST) From: Brendan Tildesley To: 45875@debbugs.gnu.org Subject: [PATCH v3 2/3] gnu: gnunet: Update to 0.14.1-1915a74. Date: Wed, 19 May 2021 13:04:55 +1000 Message-Id: <20210519030455.22485-1-mail@brendan.scot> In-Reply-To: <20210517091142.25872-3-mail@brendan.scot> References: <20210517091142.25872-3-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: -2.11 / 15.00 / 15.00 X-Rspamd-Queue-Id: A1DA417E8 X-Rspamd-UID: 9196e3 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 45875 Cc: Hartmut Goebel , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnunet.scm: (build-common): New variable. (gnunet): Update to 0.14.1-1915a74. [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 got ahead of myself and broken commit for v2, this one is the real deal. 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") -- 2.31.1