From patchwork Mon May 20 19:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27785 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 670E027BBEA; Mon, 20 May 2024 20:31:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 545E827BBE2 for ; Mon, 20 May 2024 20:31:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s98j8-0005B7-4F; Mon, 20 May 2024 15:31:18 -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 1s98iv-00058R-BQ for guix-patches@gnu.org; Mon, 20 May 2024 15:31:09 -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 1s98ir-0005zC-25 for guix-patches@gnu.org; Mon, 20 May 2024 15:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s98is-0000QV-Pp; Mon, 20 May 2024 15:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71082] [PATCH] gnu: blktrace: Update to 1.3.0. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Mon, 20 May 2024 19:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71082 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71082@debbugs.gnu.org Cc: "Artyom V. Poptsov" , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by submit@debbugs.gnu.org id=B.17162334371630 (code B ref -1); Mon, 20 May 2024 19:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2024 19:30:37 +0000 Received: from localhost ([127.0.0.1]:44345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s98iS-0000QE-I9 for submit@debbugs.gnu.org; Mon, 20 May 2024 15:30:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:43536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s98iQ-0000Q0-Mp for submit@debbugs.gnu.org; Mon, 20 May 2024 15:30:36 -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 1s98iI-00056R-13 for guix-patches@gnu.org; Mon, 20 May 2024 15:30:27 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s98iF-0005sy-C4 for guix-patches@gnu.org; Mon, 20 May 2024 15:30:25 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-51f1bf83f06so5665465e87.1 for ; Mon, 20 May 2024 12:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716233421; x=1716838221; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+/W6znqU3DOdM/MjPNZH8JEvHszAVF7pBWHAYPKHtb8=; b=EZx4BgsLYjF/xzpfEVRQstANuLaKlU5P/P2agXXWbN4VkPKo3iN8vEb7TjCPP7glZ1 fyhmZVsk/jK/vKb0N9PoeNFro6DNw9fHCY0VYwj0x2Qn80d1ikI7HV06QGH9G7ItKQE7 1hg/1sh5tLJBZnSkV2H02Dpya9EVjimtZqWOZC51cAkqnrIIIz+4cnnjmjOu2g3KKleO 5pdQaZSSVOqqwRbwXkh8ByklHtsAZN4eGnueR3tXkZ41Xw5TJSBtaKu1e5z6EJKeqvPM iWoO2989n3/RyNemUnBMzm7YigR9jLyYiBwLXeMly7YFTFv2TpuRfYfsuWQXqghmN8GR FJbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716233421; x=1716838221; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+/W6znqU3DOdM/MjPNZH8JEvHszAVF7pBWHAYPKHtb8=; b=CEtl9eyEwbKv0o3wjToF3l74kbdU+TnN6TkzY9qlrE3MgvgIXxVsoJ+jFT9v1LnByg ynoEzpAc6E7NBD7EMaCrHTesvxCm4xFg2IINv21+cK0zRYqvfGJQ6vyER+wMR14whkt5 USkDu88bRtWboD6Gp/DenipXL+fIGLLoZMYAHtW53lfrxY9r68ybJ2mZkgmyYkaVwtcc 48sOs3J9Gw7D+fCaGHSKNkdw2M9eFf3NKCC2lesWllFs4xiipaXkwXmb4HxcuNIXNx+o hf35NShSQc0yfRZNBYBTmXISASgiXfz0Jr0xTyMjiIvL0eCRiCNuoE7t49bdEkBn2+oi yCMA== X-Gm-Message-State: AOJu0Yzp+wFt94ve1KezegzrrV2jqY8VTewf3rGiK4nmO0ugwJ/K3j0F P/5KGrtm6JO76+6fBwvfFncjAsZ/QaK1xUUp2AEAOCSFUYLNmg0DZ/H30A== X-Google-Smtp-Source: AGHT+IFD9URNEkuFj2wItev27e6MND9r6CB4p7oD1yV9FawdtBiICpnxyjEFEN/3sIuA60eXJC4QAg== X-Received: by 2002:a05:6512:4db:b0:524:3177:8e46 with SMTP id 2adb3069b0e04-52431778f46mr2653284e87.28.1716233420344; Mon, 20 May 2024 12:30:20 -0700 (PDT) Received: from elephant.. ([95.79.11.228]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f39d7ca0sm4423186e87.304.2024.05.20.12.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 12:30:19 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 20 May 2024 22:30:08 +0300 Message-ID: <8fba2ff868c2376fd2ee7693573594e0157363c6.1716233408.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x133.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , 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 * 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(-) base-commit: 7881d6085146fefda17ed9eefa133b5b5c97af87 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 ;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 Ryan Sundberg -;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2022-2024 Artyom V. Poptsov ;;; Copyright © 2022 Rene Saavedra ;;; Copyright © 2022 muradm ;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli @@ -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)