From patchwork Mon Dec 18 18:09:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 57698 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 7397027BBE9; Mon, 18 Dec 2023 18:10:45 +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 7A29D27BBE2 for ; Mon, 18 Dec 2023 18:10:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFI49-0005KQ-9S; Mon, 18 Dec 2023 13:10:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFI47-0005K6-5g for guix-patches@gnu.org; Mon, 18 Dec 2023 13:10:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFI40-0000lw-Aq for guix-patches@gnu.org; Mon, 18 Dec 2023 13:10:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFI42-0001ZU-AC for guix-patches@gnu.org; Mon, 18 Dec 2023 13:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67881] [PATCH] gnu: i2pd: Update to 2.50.0. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 18:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67881 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67881@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17029229855989 (code B ref -1); Mon, 18 Dec 2023 18:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2023 18:09:45 +0000 Received: from localhost ([127.0.0.1]:33549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFI3k-0001YW-NX for submit@debbugs.gnu.org; Mon, 18 Dec 2023 13:09:45 -0500 Received: from lists.gnu.org ([2001:470:142::17]:44738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFI3i-0001Y7-Iy for submit@debbugs.gnu.org; Mon, 18 Dec 2023 13:09:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFI3Z-0005ET-QQ for guix-patches@gnu.org; Mon, 18 Dec 2023 13:09:33 -0500 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFI3X-0000kl-Tl for guix-patches@gnu.org; Mon, 18 Dec 2023 13:09:33 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 02E0920E03 for ; Mon, 18 Dec 2023 19:09:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 63DF080095; Mon, 18 Dec 2023 19:09:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 4sUvzR00gfty; Mon, 18 Dec 2023 19:09:17 +0100 (CET) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B600C80067; Mon, 18 Dec 2023 19:09:17 +0100 (CET) From: Bruno Victal Date: Mon, 18 Dec 2023 18:09:09 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.107.241; envelope-from=mirai@makinata.eu; helo=smtpmciv5.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Note: WITH_PCH flag was dropped with [1]. [1]: i2pd commit: a272a2cb7eedd2dc29c7a16d2b8c090658caf19d * gnu/packages/i2p.scm (i2pd): Update to 2.50.0. [native-inputs]: Add pkg-config, check. [arguments]: Use G-Expressions. <#:configure-flags>: Drop obsolete and defaulted flags. Enable testing with cmake. <#:phases>: Drop obsolete 'check replacement. Copyright-paperwork-exempt: Yes --- Tested with: 1. In a terminal: ./pre-inst-env guix shell -C -N --no-cwd i2pd -- i2pd 2. Navigate to webconsole at . gnu/packages/i2p.scm | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) base-commit: 29c94dd522833b2603a651c14a5b06120bcf1829 diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index 2e8c1d085d..b4f0c8d639 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -21,9 +21,12 @@ (define-module (gnu packages i2p) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -32,7 +35,7 @@ (define-module (gnu packages i2p) (define-public i2pd (package (name "i2pd") - (version "2.44.0") + (version "2.50.0") (source (origin (method git-fetch) @@ -41,41 +44,18 @@ (define-public i2pd (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fwaalfxqdahgvx5rfkvdmf6gl10w328a18ddhyn5kvpmp9x7fgl")))) + (base32 "1vr251mgffawi3rj51dzlnv3fs1ssz6gl17qbsyhfr5fcd7s0hc5")))) (build-system cmake-build-system) + (native-inputs (list check pkg-config)) (inputs (list boost miniupnpc openssl zlib)) (arguments - '(#:configure-flags - (let ((source (assoc-ref %build-inputs "source"))) - (list (string-append "-S" source "/build") - "-DWITH_PCH=OFF" - "-DWITH_STATIC=OFF" - "-DWITH_UPNP=ON" - "-DWITH_LIBRARY=ON" - "-DBUILD_SHARED_LIBS=ON" - "-DWITH_BINARY=ON")) - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key - tests? - (make-flags '()) - (parallel-tests? #t) - #:allow-other-keys) - (let ((source (assoc-ref %build-inputs "source"))) - (when tests? - (copy-recursively (string-append source "/tests") - "./tests") - (with-directory-excursion "tests" - (substitute* "Makefile" - (("../libi2pd") (string-append source "/libi2pd"))) - (apply invoke "make" "all" - `(,@(if parallel-tests? - `("-j" ,(number->string - (parallel-job-count))) - '()) - ,@make-flags)))))))))) + (list + #:configure-flags + #~(list (string-append "-S" #$source "/build") + "-DWITH_UPNP=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTING=ON"))) (home-page "https://i2pd.website/") (synopsis "Router for an end-to-end encrypted and anonymous internet") (description "i2pd is a client for the anonymous I2P network, upon which