From patchwork Tue Nov 5 23:13:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69887 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 1D69727BBE2; Tue, 5 Nov 2024 23:15:47 +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=-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 B366A27BBEA for ; Tue, 5 Nov 2024 23:15:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8SlQ-0002WR-QQ; Tue, 05 Nov 2024 18:15:08 -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 1t8SlN-0002UZ-N9 for guix-patches@gnu.org; Tue, 05 Nov 2024 18:15:05 -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 1t8SlN-0001dT-Dt for guix-patches@gnu.org; Tue, 05 Nov 2024 18:15:05 -0500 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=QMmVHgLpd7CMz5m8eRrdwxGH6zduX9s6dq/vVY6EVEQUJSqrS4QDaGA3VfzFP49D2yV4RcTwiQ+S+gaY+mQI8IkQfZA0Mqi+NNFpCRDuhe+wjew0uuOWV6Xil/zTw0Tee2yI8hxK9QI5izmdncyc7wjjinIIZnKFDJ8BQM29tq+TgM0fUvDt8/2xuyK+E7oUcshUF/QvembufIdg8PCB1GcCj8NcdmcZBkq6e9f/UOYgdj1Ti+Upj3LRCpSFfOucoKBQjdW6ex0jHvWJVV+V9UnpemRZHbaAtfoCIKQU/sNzsXJMAb98Ap4/CjLKF9xBK84wdxcrlXzZ51fVtHWb/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8SlN-0004DS-A7 for guix-patches@gnu.org; Tue, 05 Nov 2024 18:15:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74035] [PATCH v4 8/8] 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: Tue, 05 Nov 2024 23:15:05 +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.173084846316004 (code B ref 74035); Tue, 05 Nov 2024 23:15:05 +0000 Received: (at 74035) by debbugs.gnu.org; 5 Nov 2024 23:14:23 +0000 Received: from localhost ([127.0.0.1]:38381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8Skh-00049z-Ay for submit@debbugs.gnu.org; Tue, 05 Nov 2024 18:14:23 -0500 Received: from 16.mo583.mail-out.ovh.net ([87.98.174.144]:52383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8Skf-00049o-FP for 74035@debbugs.gnu.org; Tue, 05 Nov 2024 18:14:22 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.148.175]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XjkgJ2svFz1TP3 for <74035@debbugs.gnu.org>; Tue, 5 Nov 2024 23:14:20 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-kkz47 (unknown [10.110.164.78]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id ED0BD1FDF0; Tue, 5 Nov 2024 23:14:19 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-5b5ff79f4f-kkz47 with ESMTPSA id TtXRLsumKmdjPgIA8j75dQ (envelope-from ); Tue, 05 Nov 2024 23:14:19 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002ee51fbde-25b7-46fb-a5ee-a1aa30e4353d, 7DA11F85E05AC71F4B07BAB71687C1137F5318AF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Wed, 6 Nov 2024 00:13:58 +0100 Message-ID: <20241105231405.21806-8-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241105231405.21806-1-ngraves@ngraves.fr> References: <20241105231405.21806-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12018981509621801698 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrtddugddtlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejgedtfeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ESl+kZ+ZXHMYLkX1kb3CXN6RS7I6+Z/oSRoSul3YtTs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1730848460; v=1; b=OQeEfeLQPkpulB92ez7GLMaIHRtS5/Yi3QfePG0SdiQTNQ7LQ0+xhAuUBKbOTWuOrwmXY0GD vaJ9P7l0vpWU6Q3c/ndQmNUUObKE2gDQ2onuGP3dvmWspN1Mx9c7oA1CEqqs5tQvzEmmZ0pKWWc /NqhR8FUvByklU5xAxQDIIMiIR9xRo141Yp7DJkIjIPtH1QSSmfbYoZ77NEaNGaW/D9fPyxY5/d MdUy3JZCjM1gQBZH/d/j3u9sZqAjEETO6LOehXNvCGULZPLKIZevNktsVp93F9/I5CDoFB2VjTF 8xWo+PLqoCyfYVeIANIeUpAQZBSKr/LAlAq1HFL99eD/g== 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