diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2024-10-25 09:38:25 +0200 |
|---|---|---|
| committer | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-10-26 10:10:12 +0800 |
| commit | 5c5c9fa39d713a63c30bcee9602bd69ec94d699f (patch) | |
| tree | c264b9a841c7fafe33cb6218fe4e7f11af358177 | |
| parent | de9a96dc80f4452cc7aba42b8d2f61f3ff483b4d (diff) | |
gnu: kdiskmark: Update to 3.1.4. [security fixes]
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.
| -rw-r--r-- | gnu/packages/benchmark.scm | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9be03cff089..326bbc99b40 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | ;;; Copyright © 2020 Greg Hogan <code@greghogan.com> | 12 | ;;; Copyright © 2020 Greg Hogan <code@greghogan.com> |
| 13 | ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> | 13 | ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> |
| 14 | ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl> | 14 | ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl> |
| 15 | ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> | ||
| 15 | ;;; | 16 | ;;; |
| 16 | ;;; This file is part of GNU Guix. | 17 | ;;; This file is part of GNU Guix. |
| 17 | ;;; | 18 | ;;; |
| @@ -60,6 +61,7 @@ | |||
| 60 | #:use-module (gnu packages perl) | 61 | #:use-module (gnu packages perl) |
| 61 | #:use-module (gnu packages php) | 62 | #:use-module (gnu packages php) |
| 62 | #:use-module (gnu packages pkg-config) | 63 | #:use-module (gnu packages pkg-config) |
| 64 | #:use-module (gnu packages polkit) | ||
| 63 | #:use-module (gnu packages python) | 65 | #:use-module (gnu packages python) |
| 64 | #:use-module (gnu packages python-build) | 66 | #:use-module (gnu packages python-build) |
| 65 | #:use-module (gnu packages python-science) | 67 | #:use-module (gnu packages python-science) |
| @@ -559,7 +561,7 @@ and options. With careful benchmarking, different hardware can be compared.") | |||
| 559 | (define-public kdiskmark | 561 | (define-public kdiskmark |
| 560 | (package | 562 | (package |
| 561 | (name "kdiskmark") | 563 | (name "kdiskmark") |
| 562 | (version "2.3.0") | 564 | (version "3.1.4") |
| 563 | (source (origin | 565 | (source (origin |
| 564 | (method git-fetch) | 566 | (method git-fetch) |
| 565 | (uri (git-reference | 567 | (uri (git-reference |
| @@ -568,13 +570,14 @@ and options. With careful benchmarking, different hardware can be compared.") | |||
| 568 | (file-name (git-file-name name version)) | 570 | (file-name (git-file-name name version)) |
| 569 | (sha256 | 571 | (sha256 |
| 570 | (base32 | 572 | (base32 |
| 571 | "1l4sw05yx70pcnaa64arjc414mgvyz05pn3gz9nc9hga8v2d3rzn")))) | 573 | "1x8vd6swmf0i7f6m6wl2154n6plx8jkmcqfq6zxbdy255f1da74c")))) |
| 572 | (build-system cmake-build-system) | 574 | (build-system cmake-build-system) |
| 573 | (arguments | 575 | (arguments |
| 574 | (list | 576 | (list |
| 575 | #:configure-flags | 577 | #:configure-flags |
| 576 | ;; Drop runtime dependency on KDE's KFAuth. | 578 | ;; Drop runtime dependency on KDE's KFAuth. |
| 577 | #~(list "-DPERFORM_PAGECACHE_CLEARING_USING_KF5AUTH=no") | 579 | #~(list "-DPERFORM_PAGECACHE_CLEARING_USING_KF5AUTH=no" |
| 580 | (string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output)) | ||
| 578 | #:tests? #f ;no test suite | 581 | #:tests? #f ;no test suite |
| 579 | #:phases | 582 | #:phases |
| 580 | #~(modify-phases %standard-phases | 583 | #~(modify-phases %standard-phases |
| @@ -582,9 +585,15 @@ and options. With careful benchmarking, different hardware can be compared.") | |||
| 582 | (lambda* (#:key inputs #:allow-other-keys) | 585 | (lambda* (#:key inputs #:allow-other-keys) |
| 583 | (substitute* "src/benchmark.cpp" | 586 | (substitute* "src/benchmark.cpp" |
| 584 | (("\"fio\"") | 587 | (("\"fio\"") |
| 585 | (format #f "~s" (search-input-file inputs "bin/fio"))))))))) | 588 | (format #f "~s" (search-input-file inputs "bin/fio")))))) |
| 589 | (add-after 'unpack 'inject-single-application-source | ||
| 590 | (lambda _ | ||
| 591 | (rmdir "src/singleapplication") | ||
| 592 | (symlink #$(package-source | ||
| 593 | (this-package-input "single-application-qt5")) | ||
| 594 | "src/singleapplication")))))) | ||
| 586 | (native-inputs (list extra-cmake-modules qttools-5)) | 595 | (native-inputs (list extra-cmake-modules qttools-5)) |
| 587 | (inputs (list fio qtbase-5)) | 596 | (inputs (list fio polkit-qt qtbase-5 single-application-qt5)) |
| 588 | (home-page "https://github.com/JonMagon/KDiskMark") | 597 | (home-page "https://github.com/JonMagon/KDiskMark") |
| 589 | (synopsis "Simple disk benchmark tool") | 598 | (synopsis "Simple disk benchmark tool") |
| 590 | (description "KDiskMark is an HDD and SSD benchmark tool. KDiskMark | 599 | (description "KDiskMark is an HDD and SSD benchmark tool. KDiskMark |
