GNU bug report logs - #71024
Update diffoscope to 268

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Vagrant Cascadian <vagrant@HIDDEN>; dated Sat, 18 May 2024 01:48:01 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.
Changed bug title to 'Update diffoscope to 268' from 'Update diffoscope to 267 (with xz bonus update)' Request was from Vagrant Cascadian <vagrant@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 24 May 2024 14:41:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 24 10:41:36 2024
Received: from localhost ([127.0.0.1]:37484 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sAW6y-0000Pl-7t
	for submit <at> debbugs.gnu.org; Fri, 24 May 2024 10:41:36 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:57510)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1sAW6u-0000Pf-9g
 for 71024 <at> debbugs.gnu.org; Fri, 24 May 2024 10:41:35 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id A41A41AE65;
 Fri, 24 May 2024 07:41:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1716561675;
 bh=geWya39AOLh2GTlow2GH4MwQhfCYtFRrF0S5Pbl69EY=;
 h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
 b=J6TBY91s7GPOpSYyRcLr9Gu51141lg50XIR7Nn65zq7iu7/u2AdIQkg8FWu3HnhIF
 e2jQQfNi8gxTCbnUi9agVpRkA7VaJ/CDRNqyyGSY9SF158E56iIXhkf/CvBULRfsOs
 krTWplyZ9wiSde6T2qkzfFFxrpatE/impFt8o5zsWJrxaPgRl92bagaNu2UtzTglwF
 pe5MDYv+Lfl5RZ9avJ8ltXeks5aV6A6wc6s4nUjPsVZHgVCIw5YA6jwbEQZhpetG7v
 wuSiiyuBUTKcEahQchaUYuhCXKKyg+MKB17moF0AZMXIDsPb37kud4ADdO9iMy1VCr
 1/YBRwxpK1vUA==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: bug#71024: Update diffoscope to 268
In-Reply-To: <874jaq676p.fsf@HIDDEN>
References: <87r0dzriwi.fsf@wireframe>
 <20240518035037.190183-1-vagrant@HIDDEN>
 <875xv7vq3w.fsf_-_@HIDDEN> <87bk4zr9db.fsf@wireframe>
 <87seybottm.fsf@wireframe> <874jaq676p.fsf@HIDDEN>
Date: Fri, 24 May 2024 07:41:12 -0700
Message-ID: <87bk4vp913.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
Cc: 71024 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/plain

On 2024-05-21, Maxim Cournoyer wrote:
> Vagrant Cascadian <vagrant@HIDDEN> writes:
>> On 2024-05-20, Vagrant Cascadian wrote:
>>> On 2024-05-20, Maxim Cournoyer wrote:
>>>> vagrant@HIDDEN writes:
>>>>> From: Vagrant Cascadian <vagrant@HIDDEN>
>>> Or fixing diffoscope to work with the older xz version in master
>>> (5.2.x?) that guix is already using, which, now that I have spelled out
>>> all of the above, seems possibly a much better idea!
>>
>> This was "fixed" in upstream diffoscope git by setting a version
>> requirement on the test, and I think this was a new test, so not exactly
>> a regression in test coverage.
>>
>>   https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/17c061e767e612540dd0227c3fd1f9cab460a78f
>>
>> So we could build diffoscope from that commit instead, or manually apply
>> the patch, or just wait till the next diffoscope version.
>
> Given the xz horror story, waiting a bit more seems a good option to me.
> Thanks for explaining it in more details; it seems upstream is working
> on a cleaned up 5.8.0 version, which isn't ready yet.

Well, version 268 was just released, which fixes the xz issue ... but
introduces a test failure for 7z... which is worked around in the
attached patch.

The other option might be to package 7zip (which seems more maintained
than p7zip)... but that seems a bit longer term.

Yet another option would be to revert the patch that broke the test with
p7zip based 7z.

But for now I propose the workaround to effectively skip this one
test. :)

live well,
  vagrant

--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline;
 filename=0001-gnu-diffoscope-Update-to-268.patch
Content-Transfer-Encoding: quoted-printable

From=2031c4b7ce41eb36aaf58913b3cc17021643e5fefe Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Fri, 24 May 2024 04:16:32 -0700
Subject: [PATCH] gnu: diffoscope: Update to 268.

* gnu/packages/diffoscope.scm (diffoscope): Update to 268.
[phases] Add 'workaround-sevenz-versioned-test.
=2D--
 gnu/packages/diffoscope.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d..f7c5f07856 100644
=2D-- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
 (define-public diffoscope
   (package
     (name "diffoscope")
=2D    (version "265")
+    (version "268")
     (source
      (origin
        (method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
=2D        (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))=
))
+        (base32 "148r4grla92g9syjcxkyflxca2ydyb3rznb7wrrdl4zgpp4qirrh"))))
     (build-system python-build-system)
     (arguments
      (list
@@ -114,6 +114,13 @@ (define (bin command)
                  (string-append "[\"" (bin command) "\","))
                 (("\\[\"(getfacl)\"," _ command)
                  (string-append "[\"" (bin command) "\",")))))
+          (add-after 'unpack 'workaround-sevenz-versioned-test
+            ;; Detects incorrect 7z version from p7zip:
+            ;; https://salsa.debian.org/reproducible-builds/diffoscope/-/i=
ssues/376
+            (lambda _
+              (substitute* "tests/comparators/test_sevenz.py"
+                ((", skip_unless_tool_is_at_least") ", skip_unless_tool_is=
_at_least, skip_unless_tool_is_at_most")
+                (("@skip_unless_tool_is_at_least") "@skip_unless_tool_is_a=
t_most(\"7z\", sevenz_version, \"63\")\n@skip_unless_tool_is_at_least"))))
           (add-after 'build 'build-man-page
             (lambda _
               (invoke "make" "-C" "doc")))

base-commit: c5e63e19ac672f9e63fc8ee98fa9a16f978ce19c
=2D-=20
2.39.2


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZlCnCAAKCRDcUY/If5cW
qsO5AQC6TagA5Okv+Ak/ZelHFXJyOV5JrJinIf9YaeuzIOwA+wD9FNQmZCZbcY7X
GLbhEgNjIvJkwQHBKdXh/h09EXWoxwk=
=0hLx
-----END PGP SIGNATURE-----
--==-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 22 May 2024 00:08:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 21 20:08:14 2024
Received: from localhost ([127.0.0.1]:51976 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s9ZWg-0008Es-DE
	for submit <at> debbugs.gnu.org; Tue, 21 May 2024 20:08:14 -0400
Received: from mail-qk1-f182.google.com ([209.85.222.182]:52411)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1s9ZWc-0008El-TY
 for 71024 <at> debbugs.gnu.org; Tue, 21 May 2024 20:08:13 -0400
Received: by mail-qk1-f182.google.com with SMTP id
 af79cd13be357-7949747a23fso43466785a.0
 for <71024 <at> debbugs.gnu.org>; Tue, 21 May 2024 17:08:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1716336419; x=1716941219; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=cYp4/sxvuy1yheAjSgpeoj+Qlw/tR4uByYpbpzX6Mb0=;
 b=W9RBjCHdJTVL938l7RSeoiRzFL/Bt9CsyG5djQHu3215ZbuUk+rELs55c1ucoV0Ky2
 5aoeWOSnRdXR/QocvRa7w2zTlm7e0/I8yRhTxRAFQE28PD2DgpJj16Lk2jxZbU3WhLVQ
 U82f+8et8ToK/N9nObJ0grBndDLHQx/5NvyX7oobQGl+XISNrn2Zg0xdjvOJqXy9JE4n
 816VwC4YnWrDiDiKGTOoyOUixYvWGQZqmPZcxfEBlQIssgPwJMjsH2BLCUZdw6IAG1yZ
 Dw5O64siIA+O5UpkseuYFN51X/pPW53LaJmwlH85a/aPz7sRBHu4upLD0o0MJWZwKxpH
 05nQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1716336419; x=1716941219;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=cYp4/sxvuy1yheAjSgpeoj+Qlw/tR4uByYpbpzX6Mb0=;
 b=dBVqB8MDhHYSDwnkI+6iiSBHutQxRMd3SAc+sePV46WZ3AJuVyBS8k1g5mLsAN7i2+
 5gI0E0Bid55JRGbhuivej32Ai2sy2f9yaEz7m1CnZ3qm9dDa92OeQQoBLmG368k+CEjS
 RZeYjQ9a7/s7Mk9ifWs5fvn53DOqRjNTpQ089TuZ6YBPB2MS1c7Ha7qmviAvAPiiWB2N
 JNtw1Q+vo8eKRQDxyaKm2OB1FApSPpUtsZfCSaOl9+9Pe2n+IqH3bICYmtBAB9Fo21T4
 yqjFkqdl/S0hSkPso/qEOZLKBgjZVxCaQGcWXsTQjJ2mAbUPt1mgvP0kNPkgK6LnvzjE
 x6Lw==
X-Gm-Message-State: AOJu0YyexC1c2q4FYCFfRcVtUweT1Kod9tt6ObhzLmF8p8spBifMCSMO
 HfFsuu1N+o707Cr7gtzwWcxofJye4eT8jEtbjxS6J6+2DOR+ksfElvdTKQ==
X-Google-Smtp-Source: AGHT+IGlrduRpbOZWO1tUQwRwwm0ExzCn787p+qBttqQ2i8fE19RQFimbl8ABE6vCHG4VHazOX8LRg==
X-Received: by 2002:a05:620a:148c:b0:792:d1d2:e07c with SMTP id
 af79cd13be357-794994c4f4amr46125685a.68.1716336419058; 
 Tue, 21 May 2024 17:06:59 -0700 (PDT)
Received: from hurd (dsl-205-233-124-234.b2b2c.ca. [205.233.124.234])
 by smtp.gmail.com with ESMTPSA id
 af79cd13be357-794883e67fesm215139785a.4.2024.05.21.17.06.57
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 21 May 2024 17:06:58 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Vagrant Cascadian <vagrant@HIDDEN>
Subject: Re: bug#71024: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <87seybottm.fsf@wireframe> (Vagrant Cascadian's message of "Tue, 
 21 May 2024 12:20:37 -0700")
References: <87r0dzriwi.fsf@wireframe>
 <20240518035037.190183-1-vagrant@HIDDEN>
 <875xv7vq3w.fsf_-_@HIDDEN> <87bk4zr9db.fsf@wireframe>
 <87seybottm.fsf@wireframe>
Date: Tue, 21 May 2024 20:06:54 -0400
Message-ID: <874jaq676p.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
Cc: 71024 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Vagrant,

Vagrant Cascadian <vagrant@HIDDEN> writes:

> On 2024-05-20, Vagrant Cascadian wrote:
>> On 2024-05-20, Maxim Cournoyer wrote:
>>> vagrant@HIDDEN writes:
>>>
>>>> From: Vagrant Cascadian <vagrant@HIDDEN>
>>>>
>>>> * gnu/packages/compression.scm (xz-5.4): New variable.
> ...
>> Or fixing diffoscope to work with the older xz version in master
>> (5.2.x?) that guix is already using, which, now that I have spelled out
>> all of the above, seems possibly a much better idea!
>
> This was "fixed" in upstream diffoscope git by setting a version
> requirement on the test, and I think this was a new test, so not exactly
> a regression in test coverage.
>
>   https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/17c061e767e612540dd0227c3fd1f9cab460a78f
>
> So we could build diffoscope from that commit instead, or manually apply
> the patch, or just wait till the next diffoscope version.

Given the xz horror story, waiting a bit more seems a good option to me.
Thanks for explaining it in more details; it seems upstream is working
on a cleaned up 5.8.0 version, which isn't ready yet.

-- 
Thanks,
Maxim
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 21 May 2024 19:20:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 21 15:20:59 2024
Received: from localhost ([127.0.0.1]:50733 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s9V2g-0002cY-VD
	for submit <at> debbugs.gnu.org; Tue, 21 May 2024 15:20:59 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:33740)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s9V2d-0002c3-48
 for 71024 <at> debbugs.gnu.org; Tue, 21 May 2024 15:20:56 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id ACA571AE58;
 Tue, 21 May 2024 12:20:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1716319240;
 bh=lc5SbetOKTIlAlD/cnDSj9ycSq/nWb8/DrjF2mkblhQ=;
 h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
 b=Puim4snLJvUJyLGLcD2gVdF1T6TfI5n1lbveyTNYL14SFzMMrIolp13AOjZT74q9h
 8MjgDr/tZei3mrlcuZYzkCB+hQ5is/wSjyUgvDW1PdhSFyTSQXmEW5uKhDEjrOi+CP
 D6Y5dG8E+ULK5wvSWgbxBWUVNq3cq59QxuYjeSEDyIuDxY5gpYFhvM8tW71EqxazVy
 W2exKSXG+o4D+zIgHab7vWi6+o94i7ws2dTCzaYA5AO1NjFPajMv/72LeEp/rSm/ze
 QniJadBmv5HYnpeyga1SeZbnk7dFPX2duF1W42xpfhNEqLY7mEFdy9RJ1bUmZeFF7t
 qdjrDWSaGPA8A==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: bug#71024: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <87bk4zr9db.fsf@wireframe>
References: <87r0dzriwi.fsf@wireframe>
 <20240518035037.190183-1-vagrant@HIDDEN>
 <875xv7vq3w.fsf_-_@HIDDEN> <87bk4zr9db.fsf@wireframe>
Date: Tue, 21 May 2024 12:20:37 -0700
Message-ID: <87seybottm.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
Cc: 71024 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain

On 2024-05-20, Vagrant Cascadian wrote:
> On 2024-05-20, Maxim Cournoyer wrote:
>> vagrant@HIDDEN writes:
>>
>>> From: Vagrant Cascadian <vagrant@HIDDEN>
>>>
>>> * gnu/packages/compression.scm (xz-5.4): New variable.
...
> Or fixing diffoscope to work with the older xz version in master
> (5.2.x?) that guix is already using, which, now that I have spelled out
> all of the above, seems possibly a much better idea!

This was "fixed" in upstream diffoscope git by setting a version
requirement on the test, and I think this was a new test, so not exactly
a regression in test coverage.

  https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/17c061e767e612540dd0227c3fd1f9cab460a78f

So we could build diffoscope from that commit instead, or manually apply
the patch, or just wait till the next diffoscope version.


live well,
  vagrant

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkz0BQAKCRDcUY/If5cW
qpgJAQDZYrSdiDxdPlipToMiWJAVG4wSShtTXUM//J/TaB4o0AEAucRw9KCRvh02
6hG5bdVs3L9jbPv714Dg2c2s5gkMzAw=
=ub22
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 21 May 2024 06:02:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 21 02:02:18 2024
Received: from localhost ([127.0.0.1]:47205 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s9IZm-0003BC-Cw
	for submit <at> debbugs.gnu.org; Tue, 21 May 2024 02:02:18 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:45840)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s9IZg-0003Az-Iu
 for 71024 <at> debbugs.gnu.org; Tue, 21 May 2024 02:02:16 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id 851AB1AE52;
 Mon, 20 May 2024 23:01:58 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1716271318;
 bh=hKhfxIgE4BkPElvGRpD3HNnURGENekeysyE/LmZepfY=;
 h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
 b=wruxkYkj3c8a3lFtGqTOlaDN66hbhvg0HV04LwVQeMhZBGyhAVo+qY1FQZAuXNjhF
 H/2RfFF3Jm8/xyHhQrb8VOIqHOPbeGsZPdLcHWmXbPsAh03DjE7yvV//ktvgFjmH5C
 +572WSHKH0GLxzx96YswQgpuJEwSt6N+XcRKpJb0wTIzLx2bna8fruWEkibLTUsMXV
 uvs24ds5PBodHr1mSkC7FgP41kjP44LQcpG9EWGP6C8ow/cwjwJOaPygaHlFS2YlIv
 emQlIPDXb8JbfsuCROTgeSZtnjHUZt+ruzsQ4VNMauhUKxnuJbCcL+ARFRmCYtI82S
 9KOZ/yHiB0Z7A==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: bug#71024: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <875xv7vq3w.fsf_-_@HIDDEN>
References: <87r0dzriwi.fsf@wireframe>
 <20240518035037.190183-1-vagrant@HIDDEN>
 <875xv7vq3w.fsf_-_@HIDDEN>
Date: Mon, 20 May 2024 23:01:52 -0700
Message-ID: <87bk4zr9db.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
Cc: 71024 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On 2024-05-20, Maxim Cournoyer wrote:
> vagrant@HIDDEN writes:
>
>> From: Vagrant Cascadian <vagrant@HIDDEN>
>>
>> * gnu/packages/compression.scm (xz-5.4): New variable.
>> ---
>>  gnu/packages/compression.scm | 15 +++++++++++++++
>>  1 file changed, 15 insertions(+)
>>
>> diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
>> index dd88fce9ca..d89d72c9b7 100644
>> --- a/gnu/packages/compression.scm
>> +++ b/gnu/packages/compression.scm
>> @@ -573,6 +573,21 @@ (define-public xz
>>     (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
>>     (home-page "https://tukaani.org/xz/")))
>>=20=20
>> +(define-public xz-5.4
>> +  (package
>> +    (inherit xz)
>> +    (name "xz-5.4")
>> +    (version "5.4.5")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (list (string-append "http://tukaani.org/xz/xz-" ver=
sion
>> +                                        ".tar.gz")
>> +                         (string-append "http://multiprecision.org/guix=
/xz-"
>> +                                        version ".tar.gz")))
>> +              (sha256
>> +               (base32
>> +                "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k")=
)))))
>> +
>
> Any reason not to use the latest, which is v5.6.1 (fetched from git, to
> avoid the xz backdoor issue)?

For one, 5.6.1 was also released by "Jia Tan" according to:

  https://tukaani.org/xz-backdoor/

To fix bugs in the backdoor partly introduced in 5.6.0... e.g. not to
remove the backdoor, but to make it a working backdoor.

In other words, DO NOT USE 5.6.1. :)


There are some concerns about questionable code by "Jia Tan" in earlier
versions too:

  https://bugs.debian.org/1068024

... although even the 5.4.x version I proposed was, admittedly, being a
bit lazy and just picking a version already present in core-updates as
the easiest path forward that was reasonably close to the version
present in Debian which diffoscope was tested against...

Reverting to 5.3.1 might be a more conservative approach, although I
have not tested it with diffoscope.

Or fixing diffoscope to work with the older xz version in master
(5.2.x?) that guix is already using, which, now that I have spelled out
all of the above, seems possibly a much better idea!


live well,
  vagrant

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkw40AAKCRDcUY/If5cW
qo+dAP9ocBC+5ewzvFr/dqSFFWOb1KO6ufTSlhFWxfe7f2y+zQEA/xmN9hUGfAQH
GNTzWIfW1PoA7Kq9ukPkqSSeXDoRpg0=
=OMqX
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 21 May 2024 02:50:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 20 22:50:01 2024
Received: from localhost ([127.0.0.1]:46421 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s9FZg-0000gz-Pd
	for submit <at> debbugs.gnu.org; Mon, 20 May 2024 22:50:01 -0400
Received: from mail-qv1-f47.google.com ([209.85.219.47]:61533)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1s9FZe-0000gn-0z
 for 71024 <at> debbugs.gnu.org; Mon, 20 May 2024 22:49:59 -0400
Received: by mail-qv1-f47.google.com with SMTP id
 6a1803df08f44-6a8d467aa23so14882356d6.2
 for <71024 <at> debbugs.gnu.org>; Mon, 20 May 2024 19:49:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1716259727; x=1716864527; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=q/7TSqGgrCYalAap4Zw4vsdCahMYDVOGFZrDepCi+5c=;
 b=ClEeko7NKBdou17ksMmFGcmWiJ1BeNpn3nJinp7Vz8nDhJPVmdDdPl3PG+Z2vHHNCR
 SUS127Ys5EcZkng/brn+2n4+XlYwBoCNTIshIa1PJ6uQzITYJc54Z3Zf3tE1GqL1RKha
 xTMbSKzMOlcvPXt+WiFw3j8LNf281or2y3P0EZc+dMhDzWxuQa1sxwfssLy1rINl77Qe
 UgeKXOUEtYp5ynxm5jmRCoxTfE0QUcB43LeQ1O1I35TIykKtYzctKB/PKnrnE/ndGjJY
 8ehbBljdboQhJEUY7b+lIZaFNWy2jsITojsjySXXbYoYWONeZLOJs3PUhCpdRWXHVNBy
 zjwg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1716259727; x=1716864527;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=q/7TSqGgrCYalAap4Zw4vsdCahMYDVOGFZrDepCi+5c=;
 b=bzrjuZkaGH//yUKqN8xbA/4NPkaC7pTUSk+0rb9ljotlGLMwBZHYh1S9u7ZG+k8vaa
 J1m4TWboql0cRt1Cc9XIRemjJfYkKCNBLCmbMLHurFtbc/JfJw/AF4Av8M5skaplFlAE
 p2rrYsSCqK/+Z8HvAZ6qZhCRBNJKoNmmuMpZbm5P6oZ/AgrXyj2nyAF9eqIJ6nKvreWC
 Xjrq8JcIiHJHU4bpgq2RjCwiWu0NluMHVgChIfS+h9yhKTL8Z3v2t6eqghlo3VVCxU6K
 ij/pID3YxBX/SwwF6cK/1XYNtJYh637mBgIcsxTry/OvJYJQye1R81JlSWUSsQ33N7j7
 Y72Q==
X-Gm-Message-State: AOJu0YwPKuVhhH6B2ObFT7/FYxz/YVaZyRvNvhFmu18FmnMNYKrAq7Lz
 xD0WG0ZiJS9ghDRDQMSpBhkT9AiNSqH966DNmYGazLorD5+zIU0Rc/CzlQ==
X-Google-Smtp-Source: AGHT+IHy2iq8yKJiC4BHN1jMZSxrqOBzZ7gXrlrXF+gJYgUSD2G1dSZ1m60AKHIq9351G9xLdxOXuA==
X-Received: by 2002:a05:6214:3a86:b0:6aa:ba02:7b4b with SMTP id
 6a1803df08f44-6aaba027d4emr44722926d6.5.1716259727052; 
 Mon, 20 May 2024 19:48:47 -0700 (PDT)
Received: from hurd (dsl-205-233-124-234.b2b2c.ca. [205.233.124.234])
 by smtp.gmail.com with ESMTPSA id
 6a1803df08f44-6a32e640233sm95608206d6.5.2024.05.20.19.48.46
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 20 May 2024 19:48:46 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Vagrant Cascadian <vagrant@HIDDEN>
Subject: Re: bug#71024: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <87le47rikz.fsf@wireframe> (Vagrant Cascadian's message of "Fri, 
 17 May 2024 18:53:48 -0700")
References: <87r0dzriwi.fsf@wireframe> <87o793rim3.fsf@wireframe>
 <87le47rikz.fsf@wireframe>
Date: Mon, 20 May 2024 22:48:45 -0400
Message-ID: <87y183ubg2.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
Cc: 71024 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi,

Vagrant Cascadian <vagrant@HIDDEN> writes:

> From a889aaf43ee1d3cc9669bcc80888450bbd3d9ca1 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagrant@HIDDEN>
> Date: Fri, 17 May 2024 17:18:39 -0700
> Subject: [PATCH 2/2] gnu: diffoscope: Update to 267.
>
> * gnu/packages/diffoscope.scm (diffoscope): Update to 267.
> [native-inputs]: Use xz-5.4.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

LGTM, but I think it's safe to use xz 5.6.1 *from git*, unless I've
missed recent development on the xz backdoor story.

-- 
Thanks,
Maxim
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 21 May 2024 02:48:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 20 22:48:01 2024
Received: from localhost ([127.0.0.1]:46410 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s9FXl-0000fg-9d
	for submit <at> debbugs.gnu.org; Mon, 20 May 2024 22:48:01 -0400
Received: from mail-qv1-f54.google.com ([209.85.219.54]:57821)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1s9FXg-0000fW-Nd
 for 71024 <at> debbugs.gnu.org; Mon, 20 May 2024 22:47:59 -0400
Received: by mail-qv1-f54.google.com with SMTP id
 6a1803df08f44-69b5de48126so10119866d6.3
 for <71024 <at> debbugs.gnu.org>; Mon, 20 May 2024 19:47:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1716259605; x=1716864405; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=ZzoKAbZFdVgtzZBDxAYfVHaIlEmjEwSmJm61FT9/2dQ=;
 b=f9QEFw3TSl8YPgud0hINDCBcKqlmwVg3oZWcA9X0qvcGD4pXncUiK87u7opjOc4+Fc
 W+fFuFU8ognkm6zgyT4RmP132SSsAiJ31s6SkbNu2n92shmQNWwR0SkhwQdq6uJCmTYl
 Ke06iaUND/EzT4lY5OUV88T0hXmOxkiAa0arCMONWahUooeP8+NUqueX8pEhX14Vccab
 h+h8GKxTSqwEbLpOI4DXQNieFx6NkibsQQBQoWdsSPk4DpZ5vv8oE2clZHeROV1ypTCm
 twzuCCudIAxuvxLjY7gGKmK548i594a1WfEtepz7dQNDKses4Sh47btfzU/iw1Tf3J5i
 giJg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1716259605; x=1716864405;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=ZzoKAbZFdVgtzZBDxAYfVHaIlEmjEwSmJm61FT9/2dQ=;
 b=hV1q5lXisXpNc1tDvDKkS6AB55wUILqo5XLotUYFH3XqqU6KZdNv24c0brQNQLq2Ng
 YlnftuX2+Cw5XWcS8uwaXzhyhLyaeGgpUO67H5NVj3/EF3dhKRVw8DFsa9dxh64U6lds
 lj6OvQGI+uXBFw3Lc0oR6BLXXtlNo6rH2C8oplF72NIwlO043mE4IXCKB2fMB7wdoFTW
 CAW42GywekzhFsR5WbRVsfff+AackgBIQUGLKBV9ag2M7aGcWtSuT6hwgl8Szsc9Q5Y7
 zX4mzRXSS045lzlqFD6cTrHqIP7l2D93gobnHZLcjKl0txAXIhYesWVtbsWvN7jqVrOD
 aSHA==
X-Gm-Message-State: AOJu0Yy4gezuBFgf+pxLsHb9GyCgTB9O07zw22xkB1AODKcsp+Dx8pkF
 C+FETl7nnk7Rc4M88ayDOPBrKc4v42na8gAGCs1ZrgdDV31WVspDTDrZ7w==
X-Google-Smtp-Source: AGHT+IEEKLWoz5MqBJxHwaBzJKiXGBnsdl0qN5c9z8n6UPb/5LUMSnQAWC6e000UxbklLYjTW4fGpA==
X-Received: by 2002:a05:6214:5b05:b0:6aa:2d64:2011 with SMTP id
 6a1803df08f44-6aa2d64209emr43647176d6.24.1716259605330; 
 Mon, 20 May 2024 19:46:45 -0700 (PDT)
Received: from hurd (dsl-205-233-124-234.b2b2c.ca. [205.233.124.234])
 by smtp.gmail.com with ESMTPSA id
 6a1803df08f44-6a15f1857f9sm118754046d6.49.2024.05.20.19.46.44
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 20 May 2024 19:46:44 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: vagrant@HIDDEN
Subject: Re: bug#71024: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <20240518035037.190183-1-vagrant@HIDDEN>
 (vagrant@HIDDEN's message of "Fri, 17 May 2024
 20:50:36 -0700")
References: <87r0dzriwi.fsf@wireframe>
 <20240518035037.190183-1-vagrant@HIDDEN>
Date: Mon, 20 May 2024 22:46:43 -0400
Message-ID: <875xv7vq3w.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
Cc: 71024 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi,

vagrant@HIDDEN writes:

> From: Vagrant Cascadian <vagrant@HIDDEN>
>
> * gnu/packages/compression.scm (xz-5.4): New variable.
> ---
>  gnu/packages/compression.scm | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>
> diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
> index dd88fce9ca..d89d72c9b7 100644
> --- a/gnu/packages/compression.scm
> +++ b/gnu/packages/compression.scm
> @@ -573,6 +573,21 @@ (define-public xz
>     (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
>     (home-page "https://tukaani.org/xz/")))
>  
> +(define-public xz-5.4
> +  (package
> +    (inherit xz)
> +    (name "xz-5.4")
> +    (version "5.4.5")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (list (string-append "http://tukaani.org/xz/xz-" version
> +                                        ".tar.gz")
> +                         (string-append "http://multiprecision.org/guix/xz-"
> +                                        version ".tar.gz")))
> +              (sha256
> +               (base32
> +                "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))))
> +

Any reason not to use the latest, which is v5.6.1 (fetched from git, to
avoid the xz backdoor issue)?

-- 
Thanks,
Maxim
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 18 May 2024 03:51:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 17 23:51:31 2024
Received: from localhost ([127.0.0.1]:58921 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s8B6Z-0001B9-5K
	for submit <at> debbugs.gnu.org; Fri, 17 May 2024 23:51:31 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:52784)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s8B6V-0001Ab-Kj
 for 71024 <at> debbugs.gnu.org; Fri, 17 May 2024 23:51:29 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id D41A11ACD3;
 Fri, 17 May 2024 20:50:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1716004245;
 bh=D27YiD/C3hEo4GYMHsEOwBciEXhbwnqBob4CF6UCRXI=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=rbDTyVElRb2+V/LeHgoqhS7WFwvWGVO1A8HJyL+mgilVU9o2gcvbw+J+oeOlRH2b5
 vaRwaV/ixZg5+0bDQapb4Brt0eudxz8bzzkE3Rjo/06ZnHbg1fzZRVWBStozRXasiC
 r3lMJT5mjzBKJ7dJW+NNrtvtY0nvFXLSpdo6z7Qizt1cZ1v/mWcrXGIpBjmk9ObesD
 TzQl1cicNzqXzBi5crg+EGb2QUg0Q66fdQzieMb6pemsj+AOcsHtcu4hC+0hh8I62S
 f/BZRtwE85I3IQiVh3WPxwPK93SklvWaVWubPlN4aU6/1dxGgltaWDN5Bc/wxF6h7C
 1qwcfu5A20IoA==
From: vagrant@HIDDEN
To: 71024 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: diffoscope: Update to 267.
Date: Fri, 17 May 2024 20:50:37 -0700
Message-Id: <20240518035037.190183-2-vagrant@HIDDEN>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240518035037.190183-1-vagrant@HIDDEN>
References: <20240518035037.190183-1-vagrant@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 71024
Cc: vagrant@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)

From: Vagrant Cascadian <vagrant@HIDDEN>

* gnu/packages/diffoscope.scm (diffoscope): Update to 267.
[native-inputs]: Use xz-5.4.
---
 gnu/packages/diffoscope.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d..83c8f84967 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "265")
+    (version "267")
     (source
      (origin
        (method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))))
+        (base32 "19iyx846rrz5j8fx4q9sx4p3mr8h7g7190ayjmzl8hr2y9knmy74"))))
     (build-system python-build-system)
     (arguments
      (list
@@ -219,7 +219,7 @@ (define (bin command)
             unzip
             wabt
             xxd
-            xz
+            xz-5.4 ; tests require newer version
             zip
             zstd)
 
-- 
2.39.2
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 18 May 2024 03:51:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 17 23:51:31 2024
Received: from localhost ([127.0.0.1]:58919 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s8B6Y-0001B4-Li
	for submit <at> debbugs.gnu.org; Fri, 17 May 2024 23:51:31 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:54238)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s8B6T-0001AZ-7J
 for 71024 <at> debbugs.gnu.org; Fri, 17 May 2024 23:51:29 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id 61D731AB90;
 Fri, 17 May 2024 20:50:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1716004242;
 bh=LoTYqbwMQ97JHqOL+VSRRYBL/44R19Gmg0ys5GE4XEE=;
 h=From:To:Cc:Subject:Date:From;
 b=u/tUpUeCqLwtUDy1Z8Ja0sykVq9fNGVIV3YcwzrXvJ7MtCu3dYUtsWaLO9mxObgqD
 UcFxXpqaIvMBgGo35mwo0imWxuY0beRiscOmwIYo3jOr+K9shFo9RKA4+3WLAD37SR
 BKogcI8Lty+I0Xx8VRPD/zpBnl9CivbKPBNdZtodoDF5GlfI36hUFt1jjhFbZmC28f
 sP6nkYhZTVc39fnEl9w8tBnW9UTxCjW6gOwxA/Mi7rDNZQcV8COwgDPyTSHwVfpM+m
 xOxKjA6NO/6kiAbbC8WzURpZtaAN+7IC8BpL8fCwMy4xXcsSlcWM7IyG0Z7dh5qm+p
 HAT1d/vRYF9pQ==
From: vagrant@HIDDEN
To: 71024 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Add xz-5.4 variant.
Date: Fri, 17 May 2024 20:50:36 -0700
Message-Id: <20240518035037.190183-1-vagrant@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 71024
Cc: vagrant@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)

From: Vagrant Cascadian <vagrant@HIDDEN>

* gnu/packages/compression.scm (xz-5.4): New variable.
---
 gnu/packages/compression.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index dd88fce9ca..d89d72c9b7 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -573,6 +573,21 @@ (define-public xz
    (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
    (home-page "https://tukaani.org/xz/")))
 
+(define-public xz-5.4
+  (package
+    (inherit xz)
+    (name "xz-5.4")
+    (version "5.4.5")
+    (source (origin
+              (method url-fetch)
+              (uri (list (string-append "http://tukaani.org/xz/xz-" version
+                                        ".tar.gz")
+                         (string-append "http://multiprecision.org/guix/xz-"
+                                        version ".tar.gz")))
+              (sha256
+               (base32
+                "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))))
+
 (define-public lhasa
   (package
     (name "lhasa")

base-commit: e9b25a6c6c626a560d28a1f732e6e5d362d584a4
-- 
2.39.2
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 18 May 2024 02:01:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 17 22:01:48 2024
Received: from localhost ([127.0.0.1]:58482 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s89OO-0005ZL-FJ
	for submit <at> debbugs.gnu.org; Fri, 17 May 2024 22:01:48 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:35280)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s89OM-0005ZC-8Q
 for 71024 <at> debbugs.gnu.org; Fri, 17 May 2024 22:01:46 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id 372B51AB90
 for <71024 <at> debbugs.gnu.org>; Fri, 17 May 2024 19:01:04 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1715997664;
 bh=vX/iAQjhLDOwquJc0jeU6Q5XkEW7rOwNKnX0Siv425U=;
 h=From:To:Subject:In-Reply-To:References:Date:From;
 b=uBOGAPwf8m/P8Ao/rlZZWLayMJ9jxjeLwjfA/JPgGeZXaMCRsCZhehsNvMmDk5Sy0
 nn75c70zYEO/T+W9CT8flsU3AcYTMZqn3YAKZadpE7VlNdsGl60UzOWeiP+rhhvHYS
 uRIdakoqy5PLbV69rjOt40uoW3KykI2rQXO34uMnRI+wcAXp/wnnYTLZfcqDOzfKyP
 m89/jvpcZCqlRW4nuoEsBX04cGXaWpY5Xu5ZJcgtpwfMe3BC/nXJke7UTr6aUUIKNk
 cTHniPoqkmiNnlpK8NWcljkCcccr2Dm2/tA/22hcLkg2HgcaUO5jQ19kAEiMn0n3ac
 Jp4YbuFYzZvNg==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: 71024 <at> debbugs.gnu.org
Subject: Re: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <87le47rikz.fsf@wireframe>
References: <87r0dzriwi.fsf@wireframe> <87o793rim3.fsf@wireframe>
 <87le47rikz.fsf@wireframe>
Date: Fri, 17 May 2024 19:01:01 -0700
Message-ID: <87ikzbri8y.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain

On 2024-05-17, Vagrant Cascadian wrote:
> * gnu/packages/diffoscope.scm (diffoscope): Update to 267.
> [native-inputs]: Use xz-5.4.

I should probably mention the related upstream diffoscope bug somewhere:

  https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/374

Other options would be to monkey-patch to skip the test when the xz
version is not sufficient or something similar.

live well,
  vagrant

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkgL3QAKCRDcUY/If5cW
qs0HAP964P5gyhfcHHeyYdho5EzRR8G7CDSLpXQtSv76xR2FfAEAgch1NuVUbjx3
tvYxLEAvKbHdG4nsDUc3BhF+zqqWLgg=
=hF4G
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 18 May 2024 01:54:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 17 21:54:05 2024
Received: from localhost ([127.0.0.1]:58450 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s89Gv-0005SI-5k
	for submit <at> debbugs.gnu.org; Fri, 17 May 2024 21:54:05 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:54540)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s89Gt-0005RW-Ks
 for 71024 <at> debbugs.gnu.org; Fri, 17 May 2024 21:54:04 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id 93A891ACD3
 for <71024 <at> debbugs.gnu.org>; Fri, 17 May 2024 18:53:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1715997231;
 bh=0CSFYctmdHR5L21ZcAQzsiGtjvzuOnGBPJrsqLzDnjs=;
 h=From:To:Subject:In-Reply-To:References:Date:From;
 b=I7oOvz866B151fJZIBVqDsp7i/dCmD0PfJIBKHBi1Tm3+ckn7flsVpiMXdZSLV7o9
 Svf4EcCoC6NR4AzTNeqMwaRtuzBtXJ3RtEjB8nEv99R2uAOu3lcxyvUwGf6SzwMHNj
 QiaaPG5j8zkl99gl/TIV4zI7ZK8UP5EbYAUvoFSFJT7QV7b0NN4N0s7NDzOZaW6euM
 sksAUkaPhaMAPHTDnpEtUdXseUSQuWwHea38B8RtN5fSwZsZBqLp6hGVoYyPNVfBkX
 TNHDDFiMsYPAOUr7LzeuzBmKUOXC4MET8K0HtYOZb+yVET7mKlwdjcka7GhgbQ0tTt
 YRNLADxtLb8Ig==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: 71024 <at> debbugs.gnu.org
Subject: Re: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <87o793rim3.fsf@wireframe>
References: <87r0dzriwi.fsf@wireframe> <87o793rim3.fsf@wireframe>
Date: Fri, 17 May 2024 18:53:48 -0700
Message-ID: <87le47rikz.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline;
 filename=0002-gnu-diffoscope-Update-to-267.patch
Content-Transfer-Encoding: quoted-printable

From=20a889aaf43ee1d3cc9669bcc80888450bbd3d9ca1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Fri, 17 May 2024 17:18:39 -0700
Subject: [PATCH 2/2] gnu: diffoscope: Update to 267.

* gnu/packages/diffoscope.scm (diffoscope): Update to 267.
[native-inputs]: Use xz-5.4.
=2D--
 gnu/packages/diffoscope.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d..83c8f84967 100644
=2D-- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
 (define-public diffoscope
   (package
     (name "diffoscope")
=2D    (version "265")
+    (version "267")
     (source
      (origin
        (method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
=2D        (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))=
))
+        (base32 "19iyx846rrz5j8fx4q9sx4p3mr8h7g7190ayjmzl8hr2y9knmy74"))))
     (build-system python-build-system)
     (arguments
      (list
@@ -219,7 +219,7 @@ (define (bin command)
             unzip
             wabt
             xxd
=2D            xz
+            xz-5.4 ; tests require newer version
             zip
             zstd)
=20
=2D-=20
2.39.2


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkgKLAAKCRDcUY/If5cW
qmg8AQDvRIbhX6HG480cF2L7tq5VI59aQnmwyARXsh0CaXwdUAD+ICJvNyPlXuyP
kridGKAHbDBk1a3Xt0pjLhMzW/rf8wM=
=8Ya4
-----END PGP SIGNATURE-----
--==-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at 71024 <at> debbugs.gnu.org:


Received: (at 71024) by debbugs.gnu.org; 18 May 2024 01:54:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 17 21:54:01 2024
Received: from localhost ([127.0.0.1]:58446 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s89Gq-0005Rf-LE
	for submit <at> debbugs.gnu.org; Fri, 17 May 2024 21:54:01 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:54530)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s89Go-0005RP-5f
 for 71024 <at> debbugs.gnu.org; Fri, 17 May 2024 21:53:59 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id 72E6A1AB90
 for <71024 <at> debbugs.gnu.org>; Fri, 17 May 2024 18:53:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1715997195;
 bh=jVtiXgLUdVFle9hGIAOtr2+byae7EX2i8Uhw9AjmzDk=;
 h=From:To:Subject:In-Reply-To:References:Date:From;
 b=geQg3/HKXglmSN2nhWhrjcgby2rtYbtFjNxztqMx6+ve+EWG8ckuebOBPvZZnyAuL
 tTaOUo7ZpQaWDzKbirzq7Z5ItZ2z+Zzvg3FuNomZ3kEaP9/68YnhLQSJqQO2/SJ3fX
 3J8YDqvlbrRCe1QLWPr0azPMR9XIwOBtL5w2WbvrAv/D9B+kRhqLcV5+UGnhgHcwYQ
 f5k2wFGrvspIuG4A0wJjzABzOdhpm6zNJHGNjAEIBVQFwEqzTi7b3ldF6rfFDWJufW
 jQCWyBWI0+gZKU4yeJ5pjswbh6/jur7LgMJZ9ZnvU016jByjQXDVF7IKlvgjFmqugW
 uxTp5sGpVXMsQ==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: 71024 <at> debbugs.gnu.org
Subject: Re: Update diffoscope to 267 (with xz bonus update)
In-Reply-To: <87r0dzriwi.fsf@wireframe>
References: <87r0dzriwi.fsf@wireframe>
Date: Fri, 17 May 2024 18:53:08 -0700
Message-ID: <87o793rim3.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71024
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline; filename=0001-gnu-Add-xz-5.4-variant.patch
Content-Transfer-Encoding: quoted-printable

From=201aabeef6612d8b3df66db9bbda7f44896f1a5c94 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Fri, 17 May 2024 18:33:04 -0700
Subject: [PATCH 1/2] gnu: Add xz-5.4 variant.

* gnu/packages/compression.scm (xz-5.4): New variable.
=2D--
 gnu/packages/compression.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index dd88fce9ca..d89d72c9b7 100644
=2D-- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -573,6 +573,21 @@ (define-public xz
    (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
    (home-page "https://tukaani.org/xz/")))
=20
+(define-public xz-5.4
+  (package
+    (inherit xz)
+    (name "xz-5.4")
+    (version "5.4.5")
+    (source (origin
+              (method url-fetch)
+              (uri (list (string-append "http://tukaani.org/xz/xz-" version
+                                        ".tar.gz")
+                         (string-append "http://multiprecision.org/guix/xz=
-"
+                                        version ".tar.gz")))
+              (sha256
+               (base32
+                "1mmpwl4kg1vs6n653gkaldyn43dpbjh8gpk7sk0gps5f6jwr0p0k"))))=
))
+
 (define-public lhasa
   (package
     (name "lhasa")

base-commit: e9b25a6c6c626a560d28a1f732e6e5d362d584a4
=2D-=20
2.39.2


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkgKBAAKCRDcUY/If5cW
qqDzAQClfDGdC8UqqD2ea2j/fdUL53wMdapxFsriDZVSVEupfQEAxLWTTXpr4WdB
5B96U3tsn8h0zdVvb0gGIYFVxGJcPQA=
=6NV7
-----END PGP SIGNATURE-----
--==-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 18 May 2024 01:47:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 17 21:47:12 2024
Received: from localhost ([127.0.0.1]:58417 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s89AF-0005Mt-Nz
	for submit <at> debbugs.gnu.org; Fri, 17 May 2024 21:47:11 -0400
Received: from lists.gnu.org ([209.51.188.17]:57668)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vagrant@HIDDEN>) id 1s89AD-0005Ml-Fd
 for submit <at> debbugs.gnu.org; Fri, 17 May 2024 21:47:10 -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 <vagrant@HIDDEN>)
 id 1s89A9-000212-Ht
 for guix-patches@HIDDEN; Fri, 17 May 2024 21:47:05 -0400
Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <vagrant@HIDDEN>)
 id 1s89A8-000277-2i
 for guix-patches@HIDDEN; Fri, 17 May 2024 21:47:05 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
 (Authenticated sender: vagrant@HIDDEN)
 by cascadia.aikidev.net (Postfix) with ESMTPSA id 66CC71AB90
 for <guix-patches@HIDDEN>; Fri, 17 May 2024 18:46:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=reproducible-builds.org; s=1.vagrant; t=1715996817;
 bh=bA8SIoQVW1zOszB1/AyX5g+vxcUT7PjRyjiP6piSrio=;
 h=From:To:Subject:Date:From;
 b=FcEbTmJT2JfA+NNFQKyzW+fYzUrQkMj0LfPX5KY0aeX9jdnTeg4n8C+gyEfNGG7M3
 WMTiXDDjnePPi/74sndOn0U8nd5B1AMPCWrgtVIAxRAALkUVtDtx1KteamlDO0acIW
 9SP19+WksHVnrlxOzt57ddmZMuRJpB59LWJYFDYhI18MvZ99l9wbRNkXH+5Mnb3zc7
 VYlCt6wJeHUo/F/+Qgmum7A2XAWPW2/7liPJDxxiWiy+jE2SFmTuJOwusQbxG6eog5
 5YFphMrPZvsJdSlHAm/YWHvwLUL5XEGGDPoTTJsxUAbh2AMXjY2w83AnkBzeilBzIY
 4Oat80LHP+bRw==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: guix-patches@HIDDEN
Subject: Update diffoscope to 267 (with xz bonus update)
Date: Fri, 17 May 2024 18:46:53 -0700
Message-ID: <87r0dzriwi.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: pass client-ip=2600:3c01:e000:267:0:a171:de7:c;
 envelope-from=vagrant@HIDDEN; helo=cascadia.aikidev.net
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, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

--=-=-=
Content-Type: text/plain

The upcoming patches update diffoscope to 267, which requires a newer
version of xz to pass the test suites (No, no, not the *evil* versions,
just the same version that is in core-updates, 5.4.5! (although that
version has shadows cast on it too due to involvement of a certain
infamous internet identity, caveat emptor)).

I made a versioned xz variant to avoid a world rebuild so we can update
diffoscope before updating core-updates, hopefully I did it mostly
right... :)

Uhhh... so yeah, send in the clowns... er, patches!

live well,
  vagrant

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZkgIjQAKCRDcUY/If5cW
qkKzAP9FZf/ZXUA9aKlgqRzGUoXIRxBRM5opk3+C7WoJlYjfOwEA26clVgaOTDDH
jdXT5f3Zn5y201EKJ+erezB29c4n5gY=
=wHJ7
-----END PGP SIGNATURE-----
--=-=-=--
Acknowledgement sent to Vagrant Cascadian <vagrant@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#71024; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sat, 25 May 2024 20:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.