| Message ID | 20220217080334.12044-1-tanguy@bioneland.org |
|---|---|
| State | New |
| Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5400E27BBEA; Thu, 17 Feb 2022 08:54:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 034BE27BBE9 for <patchwork@mira.cbaines.net>; Thu, 17 Feb 2022 08:54:12 +0000 (GMT) Received: from localhost ([::1]:46470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1nKcYE-0007mc-Tf for patchwork@mira.cbaines.net; Thu, 17 Feb 2022 03:54:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nKbmg-000264-UG for guix-patches@gnu.org; Thu, 17 Feb 2022 03:05:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nKbmg-0006g2-2k for guix-patches@gnu.org; Thu, 17 Feb 2022 03:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nKbmf-0007wN-TS for guix-patches@gnu.org; Thu, 17 Feb 2022 03:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54036] [PATCH] gnu: gnunet: Update to 0.15.3. Resent-From: Tanguy Le Carrour <tanguy@bioneland.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Feb 2022 08:05:01 +0000 Resent-Message-ID: <handler.54036.B.164508506230469@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54036 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54036@debbugs.gnu.org Cc: Tanguy Le Carrour <tanguy@bioneland.org> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164508506230469 (code B ref -1); Thu, 17 Feb 2022 08:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Feb 2022 08:04:22 +0000 Received: from localhost ([127.0.0.1]:50021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1nKbm1-0007vN-Na for submit@debbugs.gnu.org; Thu, 17 Feb 2022 03:04:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:55666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <tanguy@bioneland.org>) id 1nKbm0-0007vG-LH for submit@debbugs.gnu.org; Thu, 17 Feb 2022 03:04:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <tanguy@bioneland.org>) id 1nKbln-0001yc-Cv for guix-patches@gnu.org; Thu, 17 Feb 2022 03:04:15 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:58015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <tanguy@bioneland.org>) id 1nKblk-0006bw-L2 for guix-patches@gnu.org; Thu, 17 Feb 2022 03:04:06 -0500 Received: (Authenticated sender: tanguy@bioneland.org) by mail.gandi.net (Postfix) with ESMTPSA id 12A66200005; Thu, 17 Feb 2022 08:03:59 +0000 (UTC) From: Tanguy Le Carrour <tanguy@bioneland.org> Date: Thu, 17 Feb 2022 09:03:34 +0100 Message-Id: <20220217080334.12044-1-tanguy@bioneland.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=217.70.178.232; envelope-from=tanguy@bioneland.org; helo=relay12.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
| Series |
[bug#54036] gnu: gnunet: Update to 0.15.3.
|
|
Commit Message
Tanguy Le Carrour
Feb. 17, 2022, 8:03 a.m. UTC
Hi Guix, The lint command reports problems that I don't know how and if I have to fix: ``` […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane' […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2' […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo' […]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/ to https://www.gnunet.org/en/ ``` Any help welcome! Tanguy * gnu/packages/gnunet.scm (gnunet): Update to 0.15.3. [arguments] Disable failing tests. --- gnu/packages/gnunet.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
Comments
tags 54036 moreinfo thanks Hi Tanguy, Tanguy Le Carrour <tanguy@bioneland.org> writes: > Hi Guix, > > The lint command reports problems that I don't know how and if I have to fix: > > ``` > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane' > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2' > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo' > […]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/ to https://www.gnunet.org/en/ > ``` Running './pre-inst-env guix style gnunet' should take care of the first 3. For the last one, I'd use the new suggested URL. > Any help welcome! > > Tanguy > > * gnu/packages/gnunet.scm (gnunet): Update to 0.15.3. > [arguments] Disable failing tests. > --- > gnu/packages/gnunet.scm | 21 +++++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm > index 1c09c9047b..34c6efddcb 100644 > --- a/gnu/packages/gnunet.scm > +++ b/gnu/packages/gnunet.scm > @@ -254,7 +254,7 @@ (define-public gnurl > (define-public gnunet > (package > (name "gnunet") > - (version "0.13.1") > + (version "0.15.3") > (source > (origin > (method url-fetch) > @@ -262,7 +262,7 @@ (define-public gnunet > ".tar.gz")) > (sha256 > (base32 > - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3")))) > + "1iafi1rzx62lf26awmwk17ih3y7kyhr7mrqc4am8w1qyyjl6j9nn")))) > (build-system gnu-build-system) > (inputs > `(("bluez" ,bluez) > @@ -301,6 +301,8 @@ (define-public gnunet > (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") > (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") > (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) > + (substitute* "src/cadet/Makefile" > + (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") "")) > (substitute* "src/testbed/Makefile" > (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") > (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") > @@ -308,13 +310,24 @@ (define-public gnunet > (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "") > (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") > (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) > + (substitute* "src/testing/Makefile" > + (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "") > + (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "") > + (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") "")) > (substitute* "src/topology/Makefile" > (("^check_PROGRAMS.*") "\n") > (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) > (substitute* "src/namestore/Makefile" > - (("\\$\\(am__append_2\\)") "")) > + (("\\$\\(am__append_2\\)") "") > + ((" test_namestore_lookup\\.sh ") " ")) > + (substitute* "src/fs/Makefile" > + (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") "")) > (substitute* "src/gns/Makefile" > - (("\\$\\(am__append_4\\)") "")) > + (("\\$\\(am__append_4\\)") "") > + (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh")) > + (substitute* "src/revocation/Makefile" > + (("^check_SCRIPTS.*") "") > + ((" test_local_revocation.py\n") "")) > (substitute* "contrib/Makefile" > (("^check_PROGRAMS.*") "\n")) > ;; 'test' from coreutils doesn't behave as the test expects. These needs to be commented to show that we understand why they fail and why it's OK/expected in our build environment. If we don't understand why we need to investigate more/seek support from the GNUnet authors so that they can help us figure it out or fix real problems on their end. Thank you, Maxim
Hi Maxim, Thanks for taking some time to review! Quoting Maxim Cournoyer (2022-02-21 22:23:28) > tags 54036 moreinfo "moreinfo" indeed! ^_^' > Tanguy Le Carrour <tanguy@bioneland.org> writes: > > The lint command reports problems that I don't know how and if I have to fix: > > > > ``` > > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane' > > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2' > > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo' > > […]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/ to https://www.gnunet.org/en/ > > ``` > > Running './pre-inst-env guix style gnunet' should take care of the first 3. It didn't scream `style` to me, but OK. I'll do that. > For the last one, I'd use the new suggested URL. Oh, this one was an easy one I was supposed to fix myself! Sorry for the noise! > > * gnu/packages/gnunet.scm (gnunet): Update to 0.15.3. > > [arguments] Disable failing tests. > > --- > > gnu/packages/gnunet.scm | 21 +++++++++++++++++---- > > 1 file changed, 17 insertions(+), 4 deletions(-) > > > > diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm > > index 1c09c9047b..34c6efddcb 100644 > > --- a/gnu/packages/gnunet.scm > > +++ b/gnu/packages/gnunet.scm > > @@ -254,7 +254,7 @@ (define-public gnurl > > (define-public gnunet > > (package > > (name "gnunet") > > - (version "0.13.1") > > + (version "0.15.3") > > (source > > (origin > > (method url-fetch) > > @@ -262,7 +262,7 @@ (define-public gnunet > > ".tar.gz")) > > (sha256 > > (base32 > > - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3")))) > > + "1iafi1rzx62lf26awmwk17ih3y7kyhr7mrqc4am8w1qyyjl6j9nn")))) > > (build-system gnu-build-system) > > (inputs > > `(("bluez" ,bluez) > > @@ -301,6 +301,8 @@ (define-public gnunet > > (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") > > (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") > > (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) > > + (substitute* "src/cadet/Makefile" > > + (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") "")) > > (substitute* "src/testbed/Makefile" > > (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") > > (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") > > @@ -308,13 +310,24 @@ (define-public gnunet > > (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "") > > (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") > > (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) > > + (substitute* "src/testing/Makefile" > > + (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "") > > + (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "") > > + (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") "")) > > (substitute* "src/topology/Makefile" > > (("^check_PROGRAMS.*") "\n") > > (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) > > (substitute* "src/namestore/Makefile" > > - (("\\$\\(am__append_2\\)") "")) > > + (("\\$\\(am__append_2\\)") "") > > + ((" test_namestore_lookup\\.sh ") " ")) > > + (substitute* "src/fs/Makefile" > > + (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") "")) > > (substitute* "src/gns/Makefile" > > - (("\\$\\(am__append_4\\)") "")) > > + (("\\$\\(am__append_4\\)") "") > > + (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh")) > > + (substitute* "src/revocation/Makefile" > > + (("^check_SCRIPTS.*") "") > > + ((" test_local_revocation.py\n") "")) > > (substitute* "contrib/Makefile" > > (("^check_PROGRAMS.*") "\n")) > > ;; 'test' from coreutils doesn't behave as the test expects. > > These needs to be commented to show that we understand why they fail and > why it's OK/expected in our build environment. If we don't understand > why we need to investigate more/seek support from the GNUnet authors so > that they can help us figure it out or fix real problems on their end. Actually, I had a ticket [1] open for the upgrade to 0.12.2 a year ago. [1]: https://bugs.gnunet.org/view.php?id=6114 I'll have to update it and mention it in our package definition. Actually, I should try to enable the previously disabled tests see if they now pass, but… running GNUnet's tests is sooooo long!!! I'll keep you posted when I send the new patch! Regards,
Hi Tanguy, Tanguy LE CARROUR <tanguy@bioneland.org> writes: > Hi Maxim, > > Thanks for taking some time to review! > > > Quoting Maxim Cournoyer (2022-02-21 22:23:28) >> tags 54036 moreinfo > > "moreinfo" indeed! ^_^' > > >> Tanguy Le Carrour <tanguy@bioneland.org> writes: >> > The lint command reports problems that I don't know how and if I have to fix: >> > >> > ``` >> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane' >> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2' >> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo' >> > […]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/ to https://www.gnunet.org/en/ >> > ``` >> >> Running './pre-inst-env guix style gnunet' should take care of the first 3. > > It didn't scream `style` to me, but OK. I'll do that. You'll find out that it doesn't rewrite the inputs as I'd hope, but you could do so by hand (see: https://guix.gnu.org/en/blog/2021/the-big-change/), which would take care of the lint warnings. [...] >> > @@ -301,6 +301,8 @@ (define-public gnunet >> > (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") >> > (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") >> > (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) >> > + (substitute* "src/cadet/Makefile" >> > + (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") "")) >> > (substitute* "src/testbed/Makefile" >> > (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") >> > (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") >> > @@ -308,13 +310,24 @@ (define-public gnunet >> > (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "") >> > (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") >> > (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) >> > + (substitute* "src/testing/Makefile" >> > + (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "") >> > + (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "") >> > + (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") "")) >> > (substitute* "src/topology/Makefile" >> > (("^check_PROGRAMS.*") "\n") >> > (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) >> > (substitute* "src/namestore/Makefile" >> > - (("\\$\\(am__append_2\\)") "")) >> > + (("\\$\\(am__append_2\\)") "") >> > + ((" test_namestore_lookup\\.sh ") " ")) >> > + (substitute* "src/fs/Makefile" >> > + (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") "")) >> > (substitute* "src/gns/Makefile" >> > - (("\\$\\(am__append_4\\)") "")) >> > + (("\\$\\(am__append_4\\)") "") >> > + (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh")) >> > + (substitute* "src/revocation/Makefile" >> > + (("^check_SCRIPTS.*") "") >> > + ((" test_local_revocation.py\n") "")) >> > (substitute* "contrib/Makefile" >> > (("^check_PROGRAMS.*") "\n")) >> > ;; 'test' from coreutils doesn't behave as the test expects. >> >> These needs to be commented to show that we understand why they fail and >> why it's OK/expected in our build environment. If we don't understand >> why we need to investigate more/seek support from the GNUnet authors so >> that they can help us figure it out or fix real problems on their end. > > Actually, I had a ticket [1] open for the upgrade to 0.12.2 a year ago. > > [1]: https://bugs.gnunet.org/view.php?id=6114 > > I'll have to update it and mention it in our package definition. > > Actually, I should try to enable the previously disabled tests see if > they now pass, but… running GNUnet's tests is sooooo long!!! > > I'll keep you posted when I send the new patch! *If* the reason these tests fail is because they rely on network, it'd be best if upstream (the GNUnet team) could provide an easy way to opt out of network-relying tests; we could open a ticket with them for that. Thanks, Maxim
Hi Maxim,
A **lot** has changed since I submitted this patch: version 0.16.0 is out!
So I decided to remove the `substitute` for all the failing tests and give it
a try, and… a lot of them seem to have been fixed!
But, even though I have no failing tests in the log, the check phase fails
with the following error message:
```
error: in phase 'check': uncaught exception:
%exception #<&invoke-error program: "make" arguments: ("check") exit-status: 2 term-signal: #f stop-signal: #f>
phase `check' failed after 4846.7 seconds
command "make" "check" failed with status 2
```
I don't know on which side is the problem, Guix or GNUnet?
My only guess is that `make` is supposed to return 0, but it
actually returns 2, which could mean "some tests have been skipped."
But it's just a random guess.
Any idea what could be wrong?!
I'm anyway submitting the latest version of my patch.
The last failing test that is disabled, `test_transport_api_https`, I
can probably fix.
The good news is, if I `guix package --without-tests=gnunet gnunet` I
get a for-what-I-can-tell working GNUnet! \o/
Best regards,
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 1c09c9047b..34c6efddcb 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -254,7 +254,7 @@ (define-public gnurl (define-public gnunet (package (name "gnunet") - (version "0.13.1") + (version "0.15.3") (source (origin (method url-fetch) @@ -262,7 +262,7 @@ (define-public gnunet ".tar.gz")) (sha256 (base32 - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3")))) + "1iafi1rzx62lf26awmwk17ih3y7kyhr7mrqc4am8w1qyyjl6j9nn")))) (build-system gnu-build-system) (inputs `(("bluez" ,bluez) @@ -301,6 +301,8 @@ (define-public gnunet (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) + (substitute* "src/cadet/Makefile" + (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") "")) (substitute* "src/testbed/Makefile" (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") @@ -308,13 +310,24 @@ (define-public gnunet (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "") (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) + (substitute* "src/testing/Makefile" + (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") "")) (substitute* "src/topology/Makefile" (("^check_PROGRAMS.*") "\n") (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) (substitute* "src/namestore/Makefile" - (("\\$\\(am__append_2\\)") "")) + (("\\$\\(am__append_2\\)") "") + ((" test_namestore_lookup\\.sh ") " ")) + (substitute* "src/fs/Makefile" + (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") "")) (substitute* "src/gns/Makefile" - (("\\$\\(am__append_4\\)") "")) + (("\\$\\(am__append_4\\)") "") + (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh")) + (substitute* "src/revocation/Makefile" + (("^check_SCRIPTS.*") "") + ((" test_local_revocation.py\n") "")) (substitute* "contrib/Makefile" (("^check_PROGRAMS.*") "\n")) ;; 'test' from coreutils doesn't behave as the test expects.