From patchwork Sat Oct 26 22:42:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69506 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 9EB5827BBEA; Sat, 26 Oct 2024 23:44:56 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 130C027BBE2 for ; Sat, 26 Oct 2024 23:44:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4pWY-00016A-2q; Sat, 26 Oct 2024 18:44:46 -0400 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 1t4pWO-00011J-51 for guix-patches@gnu.org; Sat, 26 Oct 2024 18:44:36 -0400 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 1t4pWN-0007TF-MZ for guix-patches@gnu.org; Sat, 26 Oct 2024 18:44:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ESl+kZ+ZXHMYLkX1kb3CXN6RS7I6+Z/oSRoSul3YtTs=; b=bNVOyTsv8eKMi6t9o90qKm3JTCA9EydfqslLDDT2Nz1xZBTDAgY0claW8Z7tO1t0LwVqmvi0ZNtZREtShOcjLKemPzjbboNDVTaiFom7TIkep+QZA8ToF2UNKZCW7w+HU3vqoLnd//+lFqralj/bVvhsbqIYqrJSebaOq0YMkDlAtzlr8KwLIA+rFV6Q0KfaTyu+Fw7kAEfRU1hMeu+PVTcKzTp/BSLLphEkg2356Yep3S/HIqNj9fR047QH/uAmXacz81RrW/TXVAQTQc/dnEp5SdG3ifEORrbj8rtTYu4ElvThw2gUkZcLsyQAgIaBZw/l3nXJmzJOqvCTqI8SCQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4pWv-0006rq-H5 for guix-patches@gnu.org; Sat, 26 Oct 2024 18:45:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74035] [PATCH 23/24] gnu: rnp: Update to 0.17.1. [security fixes] Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 22:45:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74035@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74035-submit@debbugs.gnu.org id=B74035.172998270326299 (code B ref 74035); Sat, 26 Oct 2024 22:45:09 +0000 Received: (at 74035) by debbugs.gnu.org; 26 Oct 2024 22:45:03 +0000 Received: from localhost ([127.0.0.1]:43089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pWo-0006pu-1C for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:45:02 -0400 Received: from 19.mo581.mail-out.ovh.net ([178.33.251.118]:44071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pWP-0006oG-Oe for 74035@debbugs.gnu.org; Sat, 26 Oct 2024 18:44:39 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.9.204]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XbZSy53llz1Hr9 for <74035@debbugs.gnu.org>; Sat, 26 Oct 2024 22:44:02 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-shhdw (unknown [10.110.178.140]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8DCED1FDF1; Sat, 26 Oct 2024 22:44:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-shhdw with ESMTPSA id kVaIG7JwHWdTNgEA9m+g4Q (envelope-from ); Sat, 26 Oct 2024 22:44:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G00490fb0991-3d9c-48b0-9922-bb6e750c6cd5, E6BF9B87AE7FBE7894246B3B643E76DCC103CD4C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Sun, 27 Oct 2024 00:42:44 +0200 Message-ID: <20241026224300.30694-23-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241026224300.30694-1-ngraves@ngraves.fr> References: <20241026224300.30694-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 8120553079084409570 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejhedgudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgepheenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejgedtfeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=ESl+kZ+ZXHMYLkX1kb3CXN6RS7I6+Z/oSRoSul3YtTs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729982642; v=1; b=Eg3xbg+hZVTxwUjnahg45i/hdGUW3TO7Se2cAT0vasO3fqn2JJI9qHbbTFaCMJ1Ze3uWsaLR qBNAxupXegf+etn/1LtMduTYc+VFEUjvJ9oNfVAQpXUOPUfB3FhuRr66h2KyePyTz8kj2XBpnAX vk7BrThB6NZ2IXTAPPgv1qlG3TMgaAX1Jz8+2B7m81ZMhrrh2y0hk8xCZ0ADlwJBLh8LUlUF76N SLjdOfnTjHGd6+1KxxR4vpN0Xu75iWzBpzuetFZXt7vmZUyOIzv9kVPYyo7BiaL3c1sunes4QGR XK1LJkR/kCXUnYjQY4Nj9RYetqhWgnTN39yOGzL7DszSQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 This fixes CVE-2023-29479 and CVE-2023-29480. * gnu/packages/openpgp.scm (rnp): Update to 0.17.1. [arguments]: Improve style using gexps. <#:phases>: Add phase 'inject-sexpp-source. [inputs]: Add sexpp. --- gnu/packages/openpgp.scm | 52 +++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/openpgp.scm b/gnu/packages/openpgp.scm index 356908ab1f..baf786c5ee 100644 --- a/gnu/packages/openpgp.scm +++ b/gnu/packages/openpgp.scm @@ -23,6 +23,7 @@ (define-module (gnu packages openpgp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages check) @@ -98,10 +99,10 @@ (define-public dkgpg (license license:gpl2+))) (define-public rnp - (let ((day-of-release "2022-09-22")) + (let ((day-of-release "2024-05-14")) (package (name "rnp") - (version "0.16.2") + (version "0.17.1") (source (origin (method git-fetch) (uri (git-reference @@ -110,33 +111,40 @@ (define-public rnp (file-name (git-file-name name version)) (sha256 (base32 - "13z5kxm48a72w4m2crwgdjdng4a4pwxsd72r2z3a4pcakfp2swi8")))) + "052872b6a88vkcc58alxcm532y6dra5qqd997jga41v72h3pnj4d")))) (build-system cmake-build-system) - (arguments `(#:configure-flags - '("-DBUILD_SHARED_LIBS=on" - "-DBUILD_TESTING=on" - "-DDOWNLOAD_GTEST=off" - "-DDOWNLOAD_RUBYRNP=off") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "src/tests/support.cpp" - (("\"cp\"") (search-input-file inputs "/bin/cp"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Some OpenPGP certificates used by the tests expire. - ;; To work around that, set the time to roughly the - ;; release date. - (invoke "faketime" ,day-of-release "make" "test"))))))) + (arguments + (list + #:configure-flags + ''("-DBUILD_SHARED_LIBS=on" + "-DBUILD_TESTING=on" + "-DDOWNLOAD_GTEST=off" + "-DDOWNLOAD_RUBYRNP=off") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + (substitute* "src/tests/support.cpp" + (("\"cp\"") (search-input-file inputs "/bin/cp"))))) + (add-after 'unpack 'inject-sexpp-source + (lambda _ + (rmdir "src/libsexpp") + (symlink #$(package-source (this-package-input "sexpp")) + "src/libsexpp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Some OpenPGP certificates used by the tests expire. + ;; To work around that, set the time to roughly the + ;; release date. + (invoke "faketime" #$day-of-release "make" "test"))))))) (native-inputs (list gnupg ; for tests googletest ; for tests libfaketime ; for tests pkg-config python)) - (inputs (list botan bzip2 json-c zlib)) + (inputs (list botan bzip2 json-c sexpp zlib)) (synopsis "RFC4880-compliant OpenPGP library written in C++") (description