* [bug#74003] [PATCH] gnu: kdiskmark: Update to 3.1.4. [security fixes]
@ 2024-10-25 7:38 Nicolas Graves via Guix-patches via
2024-10-26 2:25 ` Zheng Junjie
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-25 7:38 UTC (permalink / raw)
To: 74003; +Cc: Nicolas Graves
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 <code@greghogan.com>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; 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
--
2.46.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#74003] [PATCH] gnu: kdiskmark: Update to 3.1.4. [security fixes]
2024-10-25 7:38 [bug#74003] [PATCH] gnu: kdiskmark: Update to 3.1.4. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-26 2:25 ` Zheng Junjie
0 siblings, 0 replies; 2+ messages in thread
From: Zheng Junjie @ 2024-10-26 2:25 UTC (permalink / raw)
To: 74003; +Cc: 74003-done, Nicolas Graves
[-- Attachment #1: Type: text/plain, Size: 3433 bytes --]
Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:
> 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 <code@greghogan.com>
> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
> ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
> +;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
> ;;;
> ;;; 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
push, close.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-26 2:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-25 7:38 [bug#74003] [PATCH] gnu: kdiskmark: Update to 3.1.4. [security fixes] Nicolas Graves via Guix-patches via
2024-10-26 2:25 ` Zheng Junjie
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.