From patchwork Fri Feb 19 17:46:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 27144 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 DDE7D27BC49; Fri, 19 Feb 2021 17:53:55 +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,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 ESMTPS id 5E04527BC48 for ; Fri, 19 Feb 2021 17:53:55 +0000 (GMT) Received: from localhost ([::1]:42050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD9yU-0001p9-E9 for patchwork@mira.cbaines.net; Fri, 19 Feb 2021 12:53:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD9so-0003HY-M3 for guix-patches@gnu.org; Fri, 19 Feb 2021 12:48:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lD9so-00006d-B3 for guix-patches@gnu.org; Fri, 19 Feb 2021 12:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lD9so-0001lC-8T for guix-patches@gnu.org; Fri, 19 Feb 2021 12:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46640] [PATCH] gnu: lrzip: Update to 0.640. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Feb 2021 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46640@debbugs.gnu.org Cc: Vincent Legoll X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16137568266703 (code B ref -1); Fri, 19 Feb 2021 17:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Feb 2021 17:47:06 +0000 Received: from localhost ([127.0.0.1]:50323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lD9ru-0001k3-5y for submit@debbugs.gnu.org; Fri, 19 Feb 2021 12:47:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:53460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lD9rr-0001ju-8M for submit@debbugs.gnu.org; Fri, 19 Feb 2021 12:47:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD9rq-0001bs-To for guix-patches@gnu.org; Fri, 19 Feb 2021 12:47:02 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:42751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lD9ro-0008Ji-FU for guix-patches@gnu.org; Fri, 19 Feb 2021 12:47:02 -0500 Received: by mail-wr1-x430.google.com with SMTP id r21so9637766wrr.9 for ; Fri, 19 Feb 2021 09:46:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P/sDMWLp1jJqIn8qLmHrg9hmE4vYiA1nUMz2+hgOYU8=; b=A1kjzQA9KFs0oe0Nx+QQqT35v66P/w6i5ORMqDqGEoL2FDf2KZB5g03yB8RGW7Ad1S zFLsbW4llfohGZS+VZi/OSzybN5Wof+YZVItgKQxF5bKlS17f38VFMCfx59ozF4+GZSH qHp7MOcU8Ok4Q3z/r5blA4Ldjajupu6usNADpxrajRmZHKLjEW3UsH/MKr0aBGdtXURz y5P8YCeUsMaJITd3bG65N3N+q1S1hqqrurtAoeV//9Jn1mYP6277h7/JfNgpBwi2vcvx Vish4g6PGrstAkofRtGnEX+rJc4ZYcpILOesqRLJdiGA2k5yOyu5CwjBinvxd8RVCnqi zYdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P/sDMWLp1jJqIn8qLmHrg9hmE4vYiA1nUMz2+hgOYU8=; b=T+N+MYu6iK8dSE+GOB38A7EGZe8qdBPe+NoJy0zJHWHfMWE1vk6ECinYK2EpbEDP9N EH3wFogikSmug2FnYOcDCt1fi6iSbuCkmJd6Ua2Lb9hLeQGHTxLpHL2c1JJ2GuzO6DfH svoybSK4ieKsBMKVCcjvFzYTJ5PZLs7VadCgONyUfZD6qv/a1IkHoavQz1yLICF6c/Px c6Uegjfd5Ckcyu6ItzFIjXrEX1CY3RzNiHuqGKFE/0CppDSJ29vnz80hLJbqM2E0qnN9 DwwK3AUOKwQNl/AMqIlSsp9zJwgszQ99a3WPblYbv2u8MqOsdL3PrZofqVN6Z+SxTxP7 qhPQ== X-Gm-Message-State: AOAM5303rHsARjIQh3O4KL1DNYEU5Ic9hkQQyOJ8oowGQD+1eruAxLL9 BZsLoofoeAy36Ll5wrxZLXAnkwuH5fc= X-Google-Smtp-Source: ABdhPJybDmt9TBdvxGOKHpFHJpm2onTqfOLrYXDXDOEITpq3sihKUnii1UDd936nrMUXdP2uHruvHQ== X-Received: by 2002:a5d:452e:: with SMTP id j14mr2294716wra.244.1613756818136; Fri, 19 Feb 2021 09:46:58 -0800 (PST) Received: from localhost.localdomain ([88.163.74.64]) by smtp.gmail.com with ESMTPSA id k128sm7786082wmf.42.2021.02.19.09.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 09:46:57 -0800 (PST) From: Vincent Legoll Date: Fri, 19 Feb 2021 18:46:46 +0100 Message-Id: <20210219174646.12152-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=vincent.legoll@gmail.com; helo=mail-wr1-x430.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/lrzip-CVE-2017-8842.patch: Remove file... * gnu/local.mk (dist_patch_DATA): ...from here. * gnu/packages/compression.scm (lrzip): Update to 0.640. [source]: Replace ".bz2" by ".xz", remove patch. [inputs]: Add lz4. --- gnu/local.mk | 1 - gnu/packages/compression.scm | 8 +++---- .../patches/lrzip-CVE-2017-8842.patch | 23 ------------------- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/lrzip-CVE-2017-8842.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0dd5fc2a29..8b0aac3bcd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1328,7 +1328,6 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lrcalc-includes.patch \ - %D%/packages/patches/lrzip-CVE-2017-8842.patch \ %D%/packages/patches/lsh-fix-x11-forwarding.patch \ %D%/packages/patches/lsof-fatal-test-failures.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 89107141ec..38ea6d924b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1109,16 +1109,15 @@ human-readable output.") (define-public lrzip (package (name "lrzip") - (version "0.631") + (version "0.640") (source (origin (method url-fetch) (uri (string-append - "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.bz2")) + "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.xz")) (sha256 (base32 - "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d")) - (patches (search-patches "lrzip-CVE-2017-8842.patch")))) + "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9")))) (build-system gnu-build-system) (native-inputs `(;; nasm is only required when building for 32-bit x86 platforms @@ -1129,6 +1128,7 @@ human-readable output.") ("perl" ,perl))) (inputs `(("bzip2" ,bzip2) + ("lz4" ,lz4) ("lzo" ,lzo) ("zlib" ,zlib))) (home-page "http://ck.kolivas.org/apps/lrzip/") diff --git a/gnu/packages/patches/lrzip-CVE-2017-8842.patch b/gnu/packages/patches/lrzip-CVE-2017-8842.patch deleted file mode 100644 index 89b4f2f5d9..0000000000 --- a/gnu/packages/patches/lrzip-CVE-2017-8842.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 38386bd482c0a8102a79958cb3eddcb97a167ca3 Mon Sep 17 00:00:00 2001 -From: Con Kolivas -Date: Fri, 9 Mar 2018 17:39:40 +1100 -Subject: [PATCH] CVE-2017-8842 Fix divide-by-zero in bufRead::get - ---- - libzpaq/libzpaq.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libzpaq/libzpaq.h b/libzpaq/libzpaq.h -index 93387da..cbe211d 100644 ---- a/libzpaq/libzpaq.h -+++ b/libzpaq/libzpaq.h -@@ -465,7 +465,8 @@ struct bufRead: public libzpaq::Reader { - - int get() { - if (progress && !(*s_len % 128)) { -- int pct = (total_len - *s_len) * 100 / total_len; -+ int pct = (total_len > 0) ? -+ (total_len - *s_len) * 100 / total_len : 100; - - if (pct / 10 != *last_pct / 10) { - int i;