From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id ECMXHw1xHWe6FQAA62LTzQ:P1 (envelope-from ) for ; Sat, 26 Oct 2024 22:45:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id ECMXHw1xHWe6FQAA62LTzQ (envelope-from ) for ; Sun, 27 Oct 2024 00:45:33 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=duQUv54g; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=Sv7sjirN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729982733; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cWQFYZlJPPhQJcOG4kfLM00gy8K7sOEexw7/v7P3OrA=; b=enA8X0lsmWdbJ3zUb7+DSOBmNcd3odXDq4ILam/wG3AJnYerT9pymDJqv50TtAQYL/ETs4 JoGklLIDrO4n7jEInZWCKjzdXPTpWyvkvEhpx8X1bvbYKcUAJBWE5aoiYmdS9qk71J1e6g aPMWqk+V5z2gPm3U3ZX5GDkFuXRMdl1PH0Aj/mhjsya/mr4s+VJ+GTQWtHXbLNkY8oaIdl iMgGdkhnf9kwq3tVxxwTjd7wZRfUwibr0sOMw2sFxOd7yP/hFQOB3o1Kiqx+/zcmw7I66U P9lI2w1aLfSGHgavodcWeVn/JvANk6ASldtTh63C+t2/fCXq+cIsTOJiH/pLlQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=duQUv54g; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=Sv7sjirN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729982733; a=rsa-sha256; cv=none; b=OGwD5ZwI6/t9U0gM+TPUqxCjPkbSd6XsJde+bUo0uc+IWYHEBg9ADm5BCmpvfXtwAuF3D5 pG+hPb76TPLARohww/h6A3UkZxoGsJVvTK6y5mCM+euBW51dvTO16BmnpmEnUFKcMwQiJb vvT5KQk8ObAKdhy5w5WpkImcQMwXPxY3QUyjg1E2N/KhJ9XAyFtv9D9IlItya4mZhxrhXt Cnls/8YBL8kPqJjeU/Mdy2XRlRV+lry8mMZ7kThScX63IDgCsdsnU68aPanz/8qzZH4Q5I TvJVAua4y7ZvmWGoMBz9s6gRWOs/ghK0cC2WQbNJks8zHjQ3x0i99tqiroIwIA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2747144FB7 for ; Sun, 27 Oct 2024 00:45:33 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4pWM-0000z5-2k; Sat, 26 Oct 2024 18:44:34 -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 1t4pWI-0000ww-LQ for guix-patches@gnu.org; Sat, 26 Oct 2024 18:44:30 -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 1t4pWI-0007Ro-Cp for guix-patches@gnu.org; Sat, 26 Oct 2024 18:44:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=cWQFYZlJPPhQJcOG4kfLM00gy8K7sOEexw7/v7P3OrA=; b=duQUv54gBbPgP2tWC17PDeONN5UG2mbcPA6wSPXxXFZB21PwwooMjIhol6rjbkf+fTUn+XZzFwxMdEv/KiJCCwyRE5T70Kb4NQe/3sDLmydBAEYmu8unetp/B1b+OAR3LKNgucMivlprjD2s75YuwYynF1vKkBzyFcStpsKRcs36e3PH5/ZnRKXR8rp4ihiUaiQ3B7U3Twu//nrDXxfOS4go5ufTQ5L9a4tP/kIqSe48oT2EA2DRbLvRAq6PgIsfusx4gH/Y6azY1JE1DGemkR5TLix+RKVawoF1mz28Hfyg3kYfy6nbDptATDs1t8ZSkudw1erJyQL2+AnsMNhsEA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4pWq-0006qc-8z for guix-patches@gnu.org; Sat, 26 Oct 2024 18:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74035] [PATCH 13/24] gnu: squashfs-tools: Update to 4.6.1. [security fixes] Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 22:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74035@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74035-submit@debbugs.gnu.org id=B74035.172998265826081 (code B ref 74035); Sat, 26 Oct 2024 22:45:04 +0000 Received: (at 74035) by debbugs.gnu.org; 26 Oct 2024 22:44:18 +0000 Received: from localhost ([127.0.0.1]:43051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pW5-0006mT-Cu for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:44:17 -0400 Received: from 2.mo583.mail-out.ovh.net ([178.33.109.111]:52027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pVw-0006lR-Qn for 74035@debbugs.gnu.org; Sat, 26 Oct 2024 18:44:09 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.17.89]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XbZSP5CtFz1RtQ for <74035@debbugs.gnu.org>; Sat, 26 Oct 2024 22:43:33 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-z9lq8 (unknown [10.110.96.108]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 81BC71FD27; Sat, 26 Oct 2024 22:43:33 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-z9lq8 with ESMTPSA id 5eHJGJVwHWff9gMAuZL+2g (envelope-from ); Sat, 26 Oct 2024 22:43:33 +0000 X-OVh-ClientIp: 86.246.19.221 Date: Sun, 27 Oct 2024 00:42:34 +0200 Message-ID: <20241026224300.30694-13-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241026224300.30694-1-ngraves@ngraves.fr> References: <20241026224300.30694-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8112390304805675746 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejhedgudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejgedtfeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=cWQFYZlJPPhQJcOG4kfLM00gy8K7sOEexw7/v7P3OrA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729982613; v=1; b=Sv7sjirNfpquNGRM2cdErPaz2LOu1gliyk46msVigdY1RjkxW9ou5aHgYLsFPdP9f3YGM+2o QuoWT33OcSpgU1gcKiWtss4z0z3YX36mg0fpeNdtjOZPv57Uf0SQesTWNX9WOAu8I25E2gYb/0+ 86FWIP+PsNHdTao74i3J5GQrKyXAgKcbAEVnPiQLkMY663KDrXj0iWCwdHgmKWnQ81mMq64Aw13 CNZ/WLOTioLXvXyRNLaVzEU6ux7UEzvfonsHPfU74VgxX0yF8lpNfA6+Ye7nb1dXQXCyqanzYuT rp53ykGoAcLzIkO/ROcMMPUPepvlAc6ITRY8VVRvfvYdQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 0.52 X-Spam-Score: 0.52 X-Migadu-Queue-Id: 2747144FB7 X-TUID: SP6evy/r7OdB This fixes CVE-2021-40153 and CVE-2021-41072. * gnu/packages/compression.scm (squashfs-tools): Update to 4.6.1. [arguments]: Improve style. <#:make-flags>: Add INSTALL_MANPAGES_DIR value. <#:phases>: Remove phase 'install-documentation. Add phase 'patch-generated-source-shebangs. [native-inputs]: Add coreutils-minimal, help2man, which. [inputs]: Rewrite. --- gnu/packages/compression.scm | 52 ++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index a32b15a64a..b3eca16191 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1023,7 +1023,7 @@ (define-public lz4 (define-public squashfs-tools (package (name "squashfs-tools") - (version "4.5") + (version "4.6.1") (source (origin (method git-fetch) @@ -1032,34 +1032,34 @@ (define-public squashfs-tools (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "18d4nwa22vgb8j2badngjngw63f0lj501cvlh3920wqy2mqxwav6")))) + (base32 "14nisidxx2d2qivyv7xfcg59qkj4fjiniir7nvymazdsng63gcr1")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no check target - #:make-flags - (list (string-append "CC=" ,(cc-for-target)) - "XZ_SUPPORT=1" - "LZO_SUPPORT=1" - "LZ4_SUPPORT=1" - "ZSTD_SUPPORT=1" - (string-append "INSTALL_DIR=" (assoc-ref %outputs "out") "/bin")) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (chdir "squashfs-tools"))) - (add-after 'install 'install-documentation - ;; Install what very little usage documentation is provided. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name))) - (install-file "../USAGE" doc))))))) + (list + #:tests? #f ; no check target + #:make-flags + #~(list + (string-append "CC=" #$(cc-for-target)) + "XZ_SUPPORT=1" + "LZO_SUPPORT=1" + "LZ4_SUPPORT=1" + "ZSTD_SUPPORT=1" + (string-append "INSTALL_DIR=" #$output "/bin") + (string-append "INSTALL_MANPAGES_DIR=" #$output "/share/man/man1")) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (chdir "squashfs-tools"))) + (add-after 'patch-source-shebangs 'patch-generated-source-shebangs + (lambda _ + (substitute* (find-files "generate-manpages" "\\.sh") + (("print \"#!/bin/sh") + (string-append "print \"#!" (which "sh"))))))))) + (native-inputs + (list coreutils-minimal help2man which)) (inputs - `(("lz4" ,lz4) - ("lzo" ,lzo) - ("xz" ,xz) - ("zlib" ,zlib) - ("zstd:lib" ,zstd "lib"))) + (list lz4 lzo xz zlib `(,zstd "lib"))) (home-page "https://github.com/plougher/squashfs-tools") (synopsis "Tools to create and extract squashfs file systems") (description -- 2.46.0