From patchwork Sat Mar 21 12:08:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 20816 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 743CD27BBEA; Sat, 21 Mar 2020 12:09:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C75CF27BBE4 for ; Sat, 21 Mar 2020 12:09:11 +0000 (GMT) Received: from localhost ([::1]:36120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFcwB-0007mc-CW for patchwork@mira.cbaines.net; Sat, 21 Mar 2020 08:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39011) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFcw5-0007mE-39 for guix-patches@gnu.org; Sat, 21 Mar 2020 08:09:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFcw2-0007f8-RT for guix-patches@gnu.org; Sat, 21 Mar 2020 08:09:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFcw2-0007f2-OL for guix-patches@gnu.org; Sat, 21 Mar 2020 08:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jFcw2-0004Vz-Ja for guix-patches@gnu.org; Sat, 21 Mar 2020 08:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40163] [PATCH] gnu: blktrace: Update to db4f634. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Mar 2020 12:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40163 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40163@debbugs.gnu.org, 40083@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org, 40083@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158479253017325 (code B ref -1); Sat, 21 Mar 2020 12:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2020 12:08:50 +0000 Received: from localhost ([127.0.0.1]:46072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFcvo-0004VJ-Ab for submit@debbugs.gnu.org; Sat, 21 Mar 2020 08:08:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:46511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFcvj-0004Us-1B for submit@debbugs.gnu.org; Sat, 21 Mar 2020 08:08:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38929) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFcvh-0007kh-R3 for guix-patches@gnu.org; Sat, 21 Mar 2020 08:08:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFcvd-0007YJ-Vx for guix-patches@gnu.org; Sat, 21 Mar 2020 08:08:41 -0400 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]:37584) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFcvd-0007Y4-QG for guix-patches@gnu.org; Sat, 21 Mar 2020 08:08:37 -0400 Received: by mail-io1-xd29.google.com with SMTP id q9so9062320iod.4 for ; Sat, 21 Mar 2020 05:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=ioqIQuGZd91vLtnsGiv415dVE2OIwj6cLhYY8s3A+Xw=; b=QXHzTAifEAR8qvM8riYNZAk1ODpfTh9KqBZl5xtx1xAwrkeS+D3Il2qsntG1azIwTY AOusYdw4TmJs9lPZ1h8Zzec/+pfBo1onOaRCYiuHcR/eC1maiS9UuTyeXTHMkFEswyVz M6DD0AMZ/v67NT16F4/qcLOZ+HsL4agj5ax28hhwfEDv+cp//L5i1g5l/Om8h0fKX7l5 vYpLf7F7UfpCO6e1g3Om/883UrGxaQDOVkaMtuJ/g9kUJWEaL+42Pei4olCn6L9Bwi4e mJQwADT0duop+TXzfKpNY2abfT50FVmwew6v0blQwAWI4QyiXhhYYeP1ywqxghiyNefS 3iHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=ioqIQuGZd91vLtnsGiv415dVE2OIwj6cLhYY8s3A+Xw=; b=Fd08fL3K9idzOa+UWvBZlu/o3gl6iwAtsFm4uUaa2+uKVr+fEgCkVCQBsL69inZzYc 7A5LUxit3+YXjkMdzeqmAaf8mhtZBJMtDP3b6q5W8UOOwBdh6HWlvmPThE2y611rOx8l a52RZ9cyoygYi6eBaD/cnZhAAQ2qNzjiZiIdP7UWG8MoTUi2v+dHBDEc4522UhrHFrbq s1Ryd9mxOVnNbddZT5wOiJOSgvlJ6rNRs1Lk3lsX61NVAK5jgs67emBtRuL+lSRJX9L5 HSk0JbDZXygorYW0hioiDpylLIjswItUhoRbEIpjjjOERIKC3Yd6QQOhJ9dXVJG59/l1 XFuQ== X-Gm-Message-State: ANhLgQ3ZAMsbwrkG2Fwu29jsCRKbTdITC51bmN6sBezM6X54+0wH811E uzMk44xJ1/Y9EMLt8bmpgqxCgif+IqEbR3tnI0MQcA== X-Google-Smtp-Source: ADFU+vuev1s+wDeIhVidXej4dFSaXbTjeCumjyUjuY5wUc4QXpbxYxslueZUbQMBMZFvSRjwRKqDd1ZY72Qnryx9RVA= X-Received: by 2002:a6b:bb45:: with SMTP id l66mr11629392iof.73.1584792516500; Sat, 21 Mar 2020 05:08:36 -0700 (PDT) MIME-Version: 1.0 From: Vincent Legoll Date: Sat, 21 Mar 2020 13:08:25 +0100 Message-ID: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Wow, that was fast ! The cleanup series got applied instantly, in retrospect, I should have done it before submitting blktrace for inclusion in guix, it would have caused less churn... I incremented revision, is that the right thing to do ? From d07ad04673f45cbfe8c01721de12667ba65ed9e6 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 21 Mar 2020 12:58:33 +0100 Subject: [PATCH] gnu: blktrace: Update to db4f634. * gnu/packages/linux.scm (blktrace): Update to db4f634. [revision]: Increment variable. [patches]: Remove variable. * gnu/packages/patches/blktrace-use-rmtree.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 9 +++--- .../patches/blktrace-use-rmtree.patch | 32 ------------------- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/blktrace-use-rmtree.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2f096c51c..0f1a694044 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -768,7 +768,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/blktrace-use-rmtree.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12da3c8f63..a1973c1e60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4014,8 +4014,8 @@ applications.") (define-public blktrace ;; Take a newer commit to get the fix for CVE-2018-10689. - (let ((commit "f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc") - (revision "0")) + (let ((commit "db4f6340e04716285ea56fe26d76381c3adabe58") + (revision "1")) (package (name "blktrace") (version (git-version "1.2.0" revision commit)) @@ -4027,9 +4027,8 @@ applications.") (url home-page) (commit commit))) (sha256 - (base32 "1ihdfimg7mfcgdm6l09xfqx5kdyv42x743dxp3z3w65q5vd7xy89")) - (file-name (git-file-name name version)) - (patches (search-patches "blktrace-use-rmtree.patch")))) + (base32 "0ah7xn4qnx09k6bm39p69av7d0c8cl6863drv6a1nf914sq1kpgp")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:make-flags diff --git a/gnu/packages/patches/blktrace-use-rmtree.patch b/gnu/packages/patches/blktrace-use-rmtree.patch deleted file mode 100644 index bb0a10da72..0000000000 --- a/gnu/packages/patches/blktrace-use-rmtree.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6d1ce4a3a1a561644695a50c00cbd28494728061 Mon Sep 17 00:00:00 2001 -From: Vincent Legoll -Date: Mon, 16 Mar 2020 11:43:19 +0100 -Subject: [PATCH 02/10] bno_plot.py: Use shutil.rmtree() instead of - os.system('/bin/rm') - ---- - btt/bno_plot.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/btt/bno_plot.py b/btt/bno_plot.py -index f05cfdc..36fc524 100644 ---- a/btt/bno_plot.py -+++ b/btt/bno_plot.py -@@ -40,7 +40,7 @@ To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. - - from __future__ import absolute_import - from __future__ import print_function --import getopt, glob, os, sys, tempfile -+import getopt, glob, os, sys, tempfile, shutil - - verbose = 0 - cmds = """ -@@ -125,4 +125,4 @@ if __name__ == '__main__': - sys.exit(1) - - os.waitpid(pid, 0) -- os.system('/bin/rm -rf ' + tmpdir) -+ shutil.rmtree(tmpdir) --- -2.20.1 - -- 2.25.1