From patchwork Fri Oct 25 07:38:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69438 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 C38FD27BBE2; Fri, 25 Oct 2024 08:41:51 +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=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 6C57F27BBE9 for ; Fri, 25 Oct 2024 08:41:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4Ewt-0002fF-RE; Fri, 25 Oct 2024 03:41:32 -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 1t4Ews-0002eu-Ky for guix-patches@gnu.org; Fri, 25 Oct 2024 03:41:30 -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 1t4Ews-0005tr-CR for guix-patches@gnu.org; Fri, 25 Oct 2024 03:41:30 -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:Date:From:To:Subject; bh=iU9gLWQETkZWkvxyA679pFVA12y9iIqVtjQPbzPPW0k=; b=PCQMGPzck/4K13YIPkZrgk6ppuq7HKN/7y/CoWVZsZ6M92h0jTGNmVun0v3+qkJsDr9N9K7mOzS1w8YEEPy956EUbzwQovahuyMBrykV3jQHUkkbhP+ce4zWYwQcrYwUn+aRVXqIYpTrSVMA0DQB4API1XvvrFZJglsLMM6IJMy1CdK9qSKZ+HvS0crXN5IQYTgAhUPd+J2sC3KwcBx6uRT3welicYl3XDI2oEIQ89oXsQbD/42YM9KhOeNrPYzZwE48rETJNrAMIIxttWMdXyi6H9AxHLa5QC8NFcCQs0H8ad9BJQfPHrddi3tm83ky3+kNgB0SFk0inXg3UX3a2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4ExN-0004v2-U1 for guix-patches@gnu.org; Fri, 25 Oct 2024 03:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74003] [PATCH] gnu: kdiskmark: Update to 3.1.4. [security fixes] Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2024 07:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74003 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74003@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172984208818804 (code B ref -1); Fri, 25 Oct 2024 07:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2024 07:41:28 +0000 Received: from localhost ([127.0.0.1]:37121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Ewp-0004tC-QQ for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:56946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Ewm-0004t1-Py for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:26 -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 1t4Eu8-0001cf-PU for guix-patches@gnu.org; Fri, 25 Oct 2024 03:38:40 -0400 Received: from 11.mo550.mail-out.ovh.net ([188.165.48.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4Eu5-0005UX-4M for guix-patches@gnu.org; Fri, 25 Oct 2024 03:38:40 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.176.25]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XZZQc53cDz1WxL for ; Fri, 25 Oct 2024 07:38:32 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-787lv (unknown [10.111.182.119]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 3EC201FEA4; Fri, 25 Oct 2024 07:38:32 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-5b5ff79f4f-787lv with ESMTPSA id 4RjYNPdKG2cpygwAnMRugg (envelope-from ); Fri, 25 Oct 2024 07:38:32 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006c76929b2-a8ad-4a3d-9ef5-2a68a33bfe29, 5EE14B5C4448DA89B06CB3C74449DFBF0D417FAC) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Fri, 25 Oct 2024 09:38:25 +0200 Message-ID: <20241025073830.7776-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 5402067755866186466 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejuddguddvudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleeuhefgveefvefhffdtteegudegveevheetieelueeujefhgeffteetfffhhfdvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=iU9gLWQETkZWkvxyA679pFVA12y9iIqVtjQPbzPPW0k=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729841912; v=1; b=alJ0QNAXuTqpHARU4/z5NkHdHsUQ+rs78baZQS3YRQPu/LeZyLZsbAyC8GgSBgZS+4Q+I/8Q TKyAocyNDdHp37qQU4pbqqi9obO3dbexf73KXXD7qIdehtW8O3uet4m/ouwDOHK3pJc/lQ3AyhX 1TJzJwt4pMg2Bf3R/ve+43//ewfFH6BKrsXyYN4EKK2ebneyfvb6IwY8urXBKZQ2vvBscU+xKc9 bhTxtnfYhZlwQwYZCG5fYfgiEFkCL6dOvFV/DBD1ORzkcxGfr30u+RM50NkY1Gghs1wNHbvYu0T EVX+I5d9a1HwR0QHWDZRHxKeT2G+kn56UKmkcHxy/ve2A== Received-SPF: pass client-ip=188.165.48.29; envelope-from=ngraves@ngraves.fr; helo=11.mo550.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , 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-2022-40673. * gnu/packages/benchmark.scm (kdiskmark): Update to 3.1.4. [arguments]<#:configure-flags>: Adapt for polkit-qt. <#:phases>: Add phase 'inject-single-application-source. [inputs]: Add polkit-qt, single-application-qt5. --- gnu/packages/benchmark.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9be03cff08..326bbc99b4 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Greg Hogan ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2022 Tomasz Jeneralczyk +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ (define-module (gnu packages benchmark) #:use-module (gnu packages perl) #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-science) @@ -559,7 +561,7 @@ (define-public clpeak (define-public kdiskmark (package (name "kdiskmark") - (version "2.3.0") + (version "3.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -568,13 +570,14 @@ (define-public kdiskmark (file-name (git-file-name name version)) (sha256 (base32 - "1l4sw05yx70pcnaa64arjc414mgvyz05pn3gz9nc9hga8v2d3rzn")))) + "1x8vd6swmf0i7f6m6wl2154n6plx8jkmcqfq6zxbdy255f1da74c")))) (build-system cmake-build-system) (arguments (list #:configure-flags ;; Drop runtime dependency on KDE's KFAuth. - #~(list "-DPERFORM_PAGECACHE_CLEARING_USING_KF5AUTH=no") + #~(list "-DPERFORM_PAGECACHE_CLEARING_USING_KF5AUTH=no" + (string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output)) #:tests? #f ;no test suite #:phases #~(modify-phases %standard-phases @@ -582,9 +585,15 @@ (define-public kdiskmark (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/benchmark.cpp" (("\"fio\"") - (format #f "~s" (search-input-file inputs "bin/fio"))))))))) + (format #f "~s" (search-input-file inputs "bin/fio")))))) + (add-after 'unpack 'inject-single-application-source + (lambda _ + (rmdir "src/singleapplication") + (symlink #$(package-source + (this-package-input "single-application-qt5")) + "src/singleapplication")))))) (native-inputs (list extra-cmake-modules qttools-5)) - (inputs (list fio qtbase-5)) + (inputs (list fio polkit-qt qtbase-5 single-application-qt5)) (home-page "https://github.com/JonMagon/KDiskMark") (synopsis "Simple disk benchmark tool") (description "KDiskMark is an HDD and SSD benchmark tool. KDiskMark