From patchwork Tue Sep 6 15:49:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42254 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 8F59D27BBEA; Tue, 6 Sep 2022 16:50:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 29F1927BBE9 for ; Tue, 6 Sep 2022 16:50:17 +0100 (BST) Received: from localhost ([::1]:39472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVaq8-0002o7-CL for patchwork@mira.cbaines.net; Tue, 06 Sep 2022 11:50:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVapu-0002nc-U1 for guix-patches@gnu.org; Tue, 06 Sep 2022 11:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVapu-0001Aj-Lu for guix-patches@gnu.org; Tue, 06 Sep 2022 11:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oVapu-0007LQ-Hd for guix-patches@gnu.org; Tue, 06 Sep 2022 11:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57628] [PATCH 1/2] gnu: gnunet-scheme: Update to 0.3. References: In-Reply-To: Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Sep 2022 15:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57628 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57628@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 57628-submit@debbugs.gnu.org id=B57628.166247936028158 (code B ref 57628); Tue, 06 Sep 2022 15:50:02 +0000 Received: (at 57628) by debbugs.gnu.org; 6 Sep 2022 15:49:20 +0000 Received: from localhost ([127.0.0.1]:52419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVapD-0007K4-Un for submit@debbugs.gnu.org; Tue, 06 Sep 2022 11:49:20 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVap9-0007Jl-O8 for 57628@debbugs.gnu.org; Tue, 06 Sep 2022 11:49:19 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by andre.telenet-ops.be with bizsmtp id GfpD2800S20ykKC01fpEaT; Tue, 06 Sep 2022 17:49:14 +0200 From: Maxime Devos Date: Tue, 6 Sep 2022 17:49:10 +0200 Message-Id: <20220906154911.488-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662479354; bh=n4NyN0QIWOlc13CyLcml3dfXSU7Tu9IazhoZN0dqs7A=; h=From:To:Cc:Subject:Date; b=CAWTADVEjbgkO1xUU98iWIOicnUGoztc2EbWIdVdykmySEytSpXCdCt2sutfBjrov jrRHL16l9dzXDuhtXuq1ro/YdKAt90jX5dwJHZv+5qLZuJlTOF5PBe46BXA5ETYo8Z 2zyMrEzELki65y831DO87MIQ+C18VKmCGtNLnKk6/P71YIRL8niQtD0CPOllsEXqTo wAktm+nBUWMD9hyCGdhch0uMhJeTjTut5begVxQq1sTh5kpHTcHTkcsvEYOVjz6KWy zrl0M7+VwW+yr6BMxRtAFfoGsBeVLePlpKvfQmyrULkF6oXlJtC4d09Wg5xKpYw/bQ faxG9rVM1gunA== 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 The old snippet doesn't apply anymore, so a different work-around was committed to gnunet-scheme. * gnu/packages/gnunet.scm (gnunet-scheme): Update to 0.3. [description]: Update description for new features. --- gnu/packages/gnunet.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) base-commit: a44e08337d15b3f254a35d0311663c2bbd501852 diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index a0f902e534..cd97decd6f 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -349,28 +349,19 @@ (define-public guile-gnunet ;GSoC 2015! (define-public gnunet-scheme (package (name "gnunet-scheme") - (version "0.2") + (version "0.3") (source (origin (method git-fetch) (uri (git-reference (url "https://git.gnunet.org/git/gnunet-scheme.git") - (commit (string-append "v" version)))) + ;; Go three commits beyond the v0.3 tag, as these three + ;; commits work-around + ;; . + (commit "f5dc44e66373c29f1c84ea89d8080939a8dfbfd2"))) (file-name (git-file-name name version)) (sha256 (base32 - "0a11n58m346vs2khns2hfnxv8lbscf8aaqzhmq0d7nwdpn808nrp")) - (modules '((guix build utils))) - ;; XXX: Work-around - ;; , - ;; this can be removed once Guile > 3.0.7 is released. - (snippet '(substitute* '("gnu/gnunet/config/parser.scm" - "tests/config-parser.scm") - (("#\\{\\$\\{\\}\\}#") "#{${;};}#") - (("#\\{\\$\\{:-\\}\\}#") "#{${;:-};}#") - (("#\\{\\$\\{\\}\\}# #\\{\\$\\{:-\\}\\}#") - "#{$\\x7b;\\x7d;}# #{$\\x7b;:-\\x7d;}#") - (("'#\\{\\$\\{\\}\\}# '#\\{\\$\\{:-\\}\\}#") - "'#{$\\x7b;\\x7d;}# '#{$\\x7b;:-\\x7d;}#"))))) + "0kvqbqijfyp3fhsqjyzwd7b3cm5khwv557wq196mv6rx47aaivgd")))) (build-system gnu-build-system) (inputs (list guile-3.0)) ;for pkg-config (propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds @@ -390,11 +381,19 @@ (define-public gnunet-scheme guile-quickcheck)) ;for tests (synopsis "Guile implementation of GNUnet client libraries") (description - "This package provides Guile modules for connecting to the NSE (network -size estimation) and DHT (distributed hash table) services of GNUnet. It also -has infrastructure for writing new GNUnet services and connecting to them and -can be used from multi-threaded environments. It is not to be confused with -@code{guile-gnunet} -- @code{guile-gnunet} supports a different set of services.") + "This package provides Guile modules for connecting to various +GNUnet services. It also has infrastructure for writing new GNUnet services and +connecting to them and can be used from multi-threaded environments. It is not +to be confused with @code{guile-gnunet} -- @code{guile-gnunet} supports a different +set of services. + +The following services are supported: + +@itemize +@item NSE (network size estimation) +@item DHT (distributed hash table) +@item CADET (secure end-to-end communication between arbitrary peers) +@end itemize") ;; Most code is licensed as AGPL and a few modules are licensed as LGPL ;; or GPL. Documentation is licensed as GFDL. (license (list license:agpl3+ license:gpl3+ license:fdl1.3+ license:lgpl3+)) From patchwork Tue Sep 6 15:49:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42253 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 C8F8C27BBE9; Tue, 6 Sep 2022 16:50:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 099C527BBEA for ; Tue, 6 Sep 2022 16:50:16 +0100 (BST) Received: from localhost ([::1]:39474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVaq7-0002o9-7t for patchwork@mira.cbaines.net; Tue, 06 Sep 2022 11:50:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVapv-0002nk-Rr for guix-patches@gnu.org; Tue, 06 Sep 2022 11:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVapv-0001Dr-It for guix-patches@gnu.org; Tue, 06 Sep 2022 11:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oVapv-0007La-61 for guix-patches@gnu.org; Tue, 06 Sep 2022 11:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57628] [PATCH 2/2] gnu: gnunet-scheme: Make scheme-gnunet.pdf reproducible. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Sep 2022 15:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57628 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57628@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 57628-submit@debbugs.gnu.org id=B57628.166247936028164 (code B ref 57628); Tue, 06 Sep 2022 15:50:03 +0000 Received: (at 57628) by debbugs.gnu.org; 6 Sep 2022 15:49:20 +0000 Received: from localhost ([127.0.0.1]:52421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVapE-0007K7-C1 for submit@debbugs.gnu.org; Tue, 06 Sep 2022 11:49:20 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVap9-0007Jm-No for 57628@debbugs.gnu.org; Tue, 06 Sep 2022 11:49:19 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by andre.telenet-ops.be with bizsmtp id GfpD2800S20ykKC01fpEaZ; Tue, 06 Sep 2022 17:49:14 +0200 From: Maxime Devos Date: Tue, 6 Sep 2022 17:49:11 +0200 Message-Id: <20220906154911.488-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220906154911.488-1-maximedevos@telenet.be> References: <20220906154911.488-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662479354; bh=iLqIq5qeyWPg6mmt1DFj3YkgZmSLyGNUdkxBEZVeP3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kr1GJpCQj3qQSz5c8x2qQBu6lUm29itWXir6a2jQCZwXQ1NDgJ2Ao9m5pfZ2vgU6V 7S7jI5ibzOtNGEj25rF2j7Vx6x41CQOgSUgrpCfPmdH3Sat/fT47TrVxeQ9mvcSlHz C3EZuJ7ukDqiGwR/4mmJLIQ9S1VBgsUowIGBCyN4u9/Ke0xmUnuikvjCoa731rrZ5V TqfDpQFc7WjMfvWtTCuwFt5KgIR3xC/C5QCWFMlKMkx30kupN1HPq6SvbwfPCXS5b/ 1gY8jdyCQs/AsCps4xoBCoFTZVXNWvyLjmdW8TFQ5d8XXVens/jqwONHaH2eCJdIYU EYFZfeGudZJpA== 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 (gnunet-scheme)[arguments]<#:phases>{reproducible-timestamp}: New phase. --- gnu/packages/gnunet.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index cd97decd6f..1288d8d18c 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -33,6 +33,7 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages file) #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) @@ -363,6 +364,15 @@ (define-public gnunet-scheme (base32 "0kvqbqijfyp3fhsqjyzwd7b3cm5khwv557wq196mv6rx47aaivgd")))) (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; For reproducibility, do not insert real timestamps in the PDF. + (add-after 'unpack 'reproducible-timestamp + (lambda _ + (substitute* "Makefile.am" + (("\\$\\(TEXMACS_CONVERT\\)") + "faketime -m -f '1970-01-01 00:00:00' $(TEXMACS_CONVERT)"))))))) (inputs (list guile-3.0)) ;for pkg-config (propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds guile-fibers-1.1)) @@ -373,6 +383,7 @@ (define-public gnunet-scheme guile-gcrypt guile-pfds guile-fibers-1.1 + libfaketime automake autoconf pkg-config