From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yLYwHmu3KGfV5wAAqHPOHw:P1 (envelope-from ) for ; Mon, 04 Nov 2024 12:00:43 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id yLYwHmu3KGfV5wAAqHPOHw (envelope-from ) for ; Mon, 04 Nov 2024 13:00:43 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=rTI9Ss6X; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730721643; a=rsa-sha256; cv=none; b=uHiQs+MF2zSaKpPI3+fyAQVCF/BaMCpZ4b9MsuXxmhG8hFF6co2nNYTOk0jD0zJLlDPJDQ lI1CYuJsg9JLzzOEmi5MrDrZ636Q3zqZtCC+3o7nK13rl8wu/hvxr+iguxWko6eZI6YUDr IHceCLLj84uDkg3jmpoNLs4LH0X0b4xKxayixwJ5WeTWe5IPYsGHZSHLOdxUFYfq8RjRxx hVxQ9B6eglfivgLWM0RK190CdSwb+fEINp+eonIUimYiWNL6P+FOlcYZnedfpFh+nGQJUQ oEGiJSHd3No7Tef5af/x1Q+qCAihU9rwYELH0RiHSu5qIJn6BzNl/JHuFfZwGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=rTI9Ss6X; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730721643; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=/cDM3J2fmVHB8kHQc/5c6K9EbBHipuvQ5VP64n4sW1I=; b=qG9YGgKEw4ynNcVq3yV8nFJRNnhjyCjalDwqQz8+UiIQPD36er6fsHrdAA9L2+dj1voZHX v1KrHfX7EMreg51oWYsMDnF15830W+LpkPOiwv3X9W8tKa9IiNEmWAY8c6KGrHP1GwVISI jBH2Pn/jBuWxr8e76zwRHg24wmjSFC7DwrJhBuaVFdF1FlGnsV7V8gxyE5cZ1cYrPB+jP8 Z9SNqJubvkm9MeDGOTIk1v65lid60RVKGgLKlBcloCjKb/jmIfzsbcitCTGUQQLW51GG4Q +RMHGk2wSYtEwUCK+XIr+1kQDSz+t3oThc0m3GRXJ653Zdn+4mneLnnMqXQE3g== 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 413981AAA4 for ; Mon, 04 Nov 2024 13:00:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7vkh-0006V5-IY; Mon, 04 Nov 2024 07:00:13 -0500 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 1t7vka-0006Tz-Cy for guix-patches@gnu.org; Mon, 04 Nov 2024 07:00:04 -0500 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 1t7vkZ-0003mh-On for guix-patches@gnu.org; Mon, 04 Nov 2024 07:00:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=/cDM3J2fmVHB8kHQc/5c6K9EbBHipuvQ5VP64n4sW1I=; b=rTI9Ss6Xe5K5uLjYIyvZIihqAe5w7LQ5KHj06pIDxIB50Dgp/RN87ulXHVTGj/E8v+3MIzAWv+aH0k7MKdPTzGNjMyHX7hQ6fA8dQET8e3tqqYszMgbL3xPvcy2iH1wMZyjYhCwDwB8BHVNBATRoTsVInips8f03CiYexHiDi8Umxu342hjqoTkIeH6UKUB6RtUHx2NHa8c/P0ei/GCPFu9iGrixc2Hn7Z3d2NbKbEb0sJoAQxgal+5UExGeNpCXWJ30EjqS2AU+XU52KHMtWhvhwrrVduOWhub9iHVOuC0sZz9CKVibxkoZMcJ1hq+YqDHTx+JasTHtkZXDQynynQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t7vkZ-0008Hb-Io for guix-patches@gnu.org; Mon, 04 Nov 2024 07:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74035] [PATCH v2 14/26] gnu: squashfs-tools: Update to 4.6.1. [security fixes] Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2024 12:00:03 +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: ngraves@ngraves.fr X-Debbugs-Original-To: Nicolas Graves via Guix-patches via X-Debbugs-Original-Cc: Nicolas Graves , 74035@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173072157831782 (code B ref -1); Mon, 04 Nov 2024 12:00:03 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2024 11:59:38 +0000 Received: from localhost ([127.0.0.1]:39392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7vk9-0008GX-Ru for submit@debbugs.gnu.org; Mon, 04 Nov 2024 06:59:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:51730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7vk6-0008GK-VT for submit@debbugs.gnu.org; Mon, 04 Nov 2024 06:59:35 -0500 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 1t7vk6-0006Ka-IS for guix-patches@gnu.org; Mon, 04 Nov 2024 06:59:34 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1t7vk3-0003hb-Su for guix-patches@gnu.org; Mon, 04 Nov 2024 06:59:33 -0500 Received: from m (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowABHTMQZtyhnmqGEDQ--.19629S2; Mon, 04 Nov 2024 19:59:25 +0800 (CST) From: Zheng Junjie In-Reply-To: <20241103160239.6772-14-ngraves@ngraves.fr> (Nicolas Graves via Guix-patches via's message of "Sun, 3 Nov 2024 17:02:09 +0100") References: <20241103160239.6772-1-ngraves@ngraves.fr> <20241103160239.6772-14-ngraves@ngraves.fr> Date: Mon, 04 Nov 2024 19:59:20 +0800 Message-ID: <87h68nqkfb.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowABHTMQZtyhnmqGEDQ--.19629S2 X-Coremail-Antispam: 1UD129KBjvJXoWxZr1Dtw13Wr1rtw1rKFWrGrg_yoW5Cw15p3 ZI9w4SkrW0yr15JwsaqF4fWry3Gr1rAF1jy3s7ZrW0kws0yFy0qFWxK393J3yUJw1fGa43 WFs2qw1UGFW5WFDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvlb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I262IY c4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2 WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkE bVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF 1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x IIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvj DU0xZFpf9x07jMJPiUUUUU= X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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+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-Spam-Score: -7.40 X-Spam-Score: -7.40 X-Migadu-Queue-Id: 413981AAA4 X-Migadu-Scanner: mx10.migadu.com X-TUID: oeiTp6AHDtCS --=-=-= Content-Type: text/plain Nicolas Graves via Guix-patches via writes: > 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 97696ff0ef..7627717db6 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 apply --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmcotxgACgkQO1qpk+Gi 3/ArjQ/+Kg/1k8r6wzvHeXmw9htFFnp3/spc2yNQJi5BbkDjEh1suzhkRq5qPW+k jHas0ys3xi7GYTCeKuMEOdsnDJQkn5WR9jnnF5yhBnKOfxvo03Wbq+7XugU9AL8n S/2aD2I4AbJdPnW9VLOfJyDlCcraljlHP5PbWOVjSNRfeu73RETIIiMD0tcxuCmX eSOWecnfek140NAl9Lc1BTuZ4mkiD/uiSl6cnnRm6vEGd7uy6N9FX+KWc/0ivldi 5TXzbtJzPpYKuLeG2MR1FdKr6zdxD+kmI2PRIZ9vgKvspb4SN7V8DVTpCj8zGAad OqL7d5dbVmwdbvxcns0gau6LrwTCIIt2UAMtEzVlUxYwBhIpsGdxK/nrxRk38mOg ryfWMAMGfjJd0TGdzWAN0szqrP4LZWcVwdAwAeInpm7F/1NeD8FwuvobfdWVdwu6 7kLMpek65exY112OFEZ10pXBZpmeX9aYinroRd8/eBv/wtKCWGTOJb00lEwwI968 oDdt9A9RHEmfw658f/upsfj+brJOBR5PBcD04pt6/mHq2iT9lXk0RXmHS7vQYOXk kHOvBhp6cKPTMZQujwWMzqnqDk3xboR85pHmUXGBHH5sF3XC1rGbXAQKHBfig8y7 dch8qf82L/JEQjh6jpv74XHQGrUpNmGAzAwyki+7MxgelRk23rk= =Fa7b -----END PGP SIGNATURE----- --=-=-=--