Subject: bug#71082: closed (Re: [bug#71082] [PATCH] gnu: blktrace: Update to 1.3.0.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 11 Jun 2024 22:09:02 +0000

Your bug report

#71082: [PATCH] gnu: blktrace: Update to 1.3.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
71082: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71082
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#71082] [PATCH] gnu: blktrace: Update to 1.3.0.
From: Ludovic Courtès <[email-masked]>
To: "Artyom V. Poptsov" <[email-masked]>
Cc: Tobias Geerinckx-Rice <[email-masked]>, [email-masked], Wilko Meyer <[email-masked]>, Leo Famulari <[email-masked]>
Date: Wed, 12 Jun 2024 00:08:32 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

"Artyom V. Poptsov" <[email-masked]> skribis:

> * gnu/packages/linux.scm (blktrace): Update to 1.3.0.
>   [arguments]: Use gexps.
>
> Change-Id: I4e107c8d1f99d5eb44d7f0fd67925cefac36eba9

Applied, thanks!

Subject: [PATCH] gnu: blktrace: Update to 1.3.0.
From: "Artyom V. Poptsov" <[email-masked]>
To: [email-masked]
Cc: "Artyom V. Poptsov" <[email-masked]>
Date: Mon, 20 May 2024 22:30:08 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/linux.scm (blktrace): Update to 1.3.0.
  [arguments]: Use gexps.

Change-Id: I4e107c8d1f99d5eb44d7f0fd67925cefac36eba9
---
 gnu/packages/linux.scm | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a9b78a7986..2a85e4b7c8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -63,7 +63,7 @@
 ;;; Copyright © 2021 Solene Rapenne <[email-masked]>
 ;;; Copyright © 2021, 2022 Petr Hodina <[email-masked]>
 ;;; Copyright © 2021 Ryan Sundberg <[email-masked]>
-;;; Copyright © 2022 Artyom V. Poptsov <[email-masked]>
+;;; Copyright © 2022-2024 Artyom V. Poptsov <[email-masked]>
 ;;; Copyright © 2022 Rene Saavedra <[email-masked]>
 ;;; Copyright © 2022 muradm <[email-masked]>
 ;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <[email-masked]>
@@ -5921,12 +5921,12 @@ (define-public libaio
     (license license:lgpl2.1+)))
 
 (define-public blktrace
-  ;; Take a newer commit to get the fix for CVE-2018-10689.
-  (let ((commit "db4f6340e04716285ea56fe26d76381c3adabe58")
+  ;; Take a newer commit to get the latest patches.
+  (let ((commit "b9ea6e507e8849f01d06aa48c0c59c5cee4820be")
         (revision "1"))
     (package
       (name "blktrace")
-      (version (git-version "1.2.0" revision commit))
+      (version (git-version "1.3.0" revision commit))
       (home-page
         "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git")
       (source (origin
@@ -5935,24 +5935,23 @@ (define-public blktrace
                       (url home-page)
                       (commit commit)))
                 (sha256
-                 (base32 "0ah7xn4qnx09k6bm39p69av7d0c8cl6863drv6a1nf914sq1kpgp"))
+                 (base32 "0a4830mlqckbhchar1xcn2w4f24bzb75bigdig5wpm2axl0zc8cq"))
                 (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       (arguments
-       `(#:make-flags
-         (list ,(string-append "CC=" (cc-for-target))
-               (string-append "prefix=" %output))
-         #:tests? #f                    ; no tests
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'configure)          ; no configure script
-           (add-after 'unpack 'fix-gnuplot-path
-             (lambda* (#:key inputs #:allow-other-keys)
-               (let ((gnuplot (assoc-ref inputs "gnuplot")))
-                 (substitute* "btt/bno_plot.py"
-                   (("gnuplot %s")
-                    (string-append gnuplot "/bin/gnuplot %s")))
-                 #t))))))
+       (list #:make-flags
+             #~(list (string-append "CC=" #$(cc-for-target))
+                     (string-append "prefix=" #$output))
+             #:tests? #f                    ; no tests
+             #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure)          ; no configure script
+                 (add-after 'unpack 'fix-gnuplot-path
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((gnuplot (assoc-ref inputs "gnuplot")))
+                       (substitute* "btt/bno_plot.py"
+                         (("gnuplot %s")
+                          (string-append gnuplot "/bin/gnuplot %s")))))))))
       (inputs
        `(("libaio" ,libaio)
          ("gnuplot" ,gnuplot)

base-commit: 7881d6085146fefda17ed9eefa133b5b5c97af87
-- 
2.41.0