Bug#1120867: diffoscope: FTBFS in trixie

2025-12-01 Thread Chris Lamb
Chris Lamb wrote:

> I think the cleanest way to fix this is to backport commit c79674ecd42
> from diffoscope (shipped in diffoscope 304).

Bug filed against release.debian.org at #1121754.


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  [email protected] 🍥 chris-lamb.co.uk
   `-



Bug#1120867: diffoscope: FTBFS in trixie

2025-11-17 Thread Chris Lamb
Santiago Vila wrote:

> Package: src:diffoscope
> Version: 297
> Severity: serious
> Control: fixed -1 308
> Tags: ftbfs trixie
>
> Dear maintainer:
>
> During a rebuild of all packages in trixie, this package failed to build.
>
> [ Note: The bug is marked as fixed with the version in forky/sid, but
>   packages in trixie must still build in trixie ].

Indeed, and I can reproduce this! Looking into this more, this looks like
it was caused by the upload of systemd 257.8-1~deb13u1 to trixie as it
ships a newer system-ukify.

I've just checked the version of systemd that is currently available in
trixie-proposed-updates (i.e. 257.9-1~deb13u1 — note the easily confused
version number!) and this also fails... which makes sense given that
systemd 257.8.1 (or thereabouts) was improving the output.

I think the cleanest way to fix this is to backport commit c79674ecd42
from diffoscope (shipped in diffoscope 304).


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  [email protected] 🍥 chris-lamb.co.uk
   `-



Bug#1120867: diffoscope: FTBFS in trixie

2025-11-17 Thread Santiago Vila
Package: src:diffoscope
Version: 297
Severity: serious
Control: fixed -1 308
Tags: ftbfs trixie

Dear maintainer:

During a rebuild of all packages in trixie, this package failed to build.

[ Note: The bug is marked as fixed with the version in forky/sid, but
  packages in trixie must still build in trixie ].

Below you will find the last part of the build log (probably the most
relevant part, but not necessarily). If required, the full build log
is available here:

https://people.debian.org/~sanvila/build-logs/trixie/

About the archive rebuild: The build was made on virtual machines from AWS,
using sbuild and a reduced chroot with only build-essential packages.

If you cannot reproduce the bug please contact me privately, as I
am willing to provide ssh access to a virtual machine where the bug is
fully reproducible.

If this is really a bug in one of the build-depends, please use
reassign and add an affects on src:diffoscope, so that this is still
visible in the BTS web page for this package.

Thanks.


[...]

differences = []

@skip_unless_tools_exist("objdump")
@skip_unless_tools_exist("ukify")
def test_diff(differences):
>   assert_diff(differences[0], "uki_expected_diff")

differences = []

tests/comparators/test_uki.py:81: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

difference = 
filename = 'uki_expected_diff'

def assert_diff(difference, filename):
# Assign seen and expected values to local variables to improve 
contextual
# information in failed tests.
seen = difference.unified_diff
expected = get_data(filename)
>   assert seen == expected
E   AssertionError

difference = 
expected   = ('@@ -4,19 +4,19 @@\n'
 '   text:\n'
 ' sbat,1,SBAT '
 'Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md\n'
 ' systemd-stub,1,The systemd Developers,systemd,257,https://systemd.io/\n'
 ' systemd-stub.fedora,1,Fedora '
 'Linux,systemd,257~devel-g8dc40c2^,https://bugzilla.redhat.com/\n'
 ' '
 
'uki,1,UKI,uki,1,https://uapi-group.org/specifications/specs/unified_kernel_image/\n'
 ' \x00\n'
 ' .osrel:\n'
 '-  size: 4 bytes\n'
 '-  sha256: 890cabe271136403326f8252c59cfdd47160fa63fe7a37801d3bffc1dbbf03f3\n'
 '+  size: 6 bytes\n'
 '+  sha256: 81d93757457f988523814ae0009837ae893f38d3fe123f2c37896f118b4c7804\n'
 '   text:\n'
 '-arch\n'
 '+debian\n'
 ' .uname:\n'
 '   size: 4 bytes\n'
 '-  sha256: 49b513c0cc7f8b9f7e64c436a8eee1548b2cf5f907f4345992013a5662550942\n'
 '+  sha256: e4d86b820871b1f065479509c0993f26763118991aa84a9b33c6027d209729d7\n'
 '   text:\n'
 '-6.11\n'
 '+6.12\n'
 ' .linux:\n'
 '   size: 6 bytes\n'
 '   sha256: '
 '6923dd1bc0460082c5d55a831908c24a282860b7f1cd6c2b79cf1bc8857c639c\n')
filename   = 'uki_expected_diff'
seen   = ('@@ -3,19 +3,19 @@\n'
 '   sha256: 9615341509c2d7a91172e8faab9216d139506451db4f1850d37325d0a14b1ea0\n'
 '   text:\n'
 ' sbat,1,SBAT '
 'Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md\n'
 ' systemd-stub,1,The systemd Developers,systemd,257,https://systemd.io/\n'
 ' systemd-stub.fedora,1,Fedora '
 'Linux,systemd,257~devel-g8dc40c2^,https://bugzilla.redhat.com/\n'
 ' '
 
'uki,1,UKI,uki,1,https://uapi-group.org/specifications/specs/unified_kernel_image/\n'
 ' .osrel:\n'
 '-  size: 4 bytes\n'
 '-  sha256: 890cabe271136403326f8252c59cfdd47160fa63fe7a37801d3bffc1dbbf03f3\n'
 '+  size: 6 bytes\n'
 '+  sha256: 81d93757457f988523814ae0009837ae893f38d3fe123f2c37896f118b4c7804\n'
 '   text:\n'
 '-arch\n'
 '+debian\n'
 ' .uname:\n'
 '   size: 4 bytes\n'
 '-  sha256: 49b513c0cc7f8b9f7e64c436a8eee1548b2cf5f907f4345992013a5662550942\n'
 '+  sha256: e4d86b820871b1f065479509c0993f26763118991aa84a9b33c6027d209729d7\n'
 '   text:\n'
 '-6.11\n'
 '+6.12\n'
 ' .linux:\n'
 '   size: 6 bytes\n'
 '   sha256: '
 '6923dd1bc0460082c5d55a831908c24a282860b7f1cd6c2b79cf1bc8857c639c\n')

tests/utils/data.py:64: AssertionError
 Captured stderr setup -
/tmp/pytest-of-sbuild/pytest-0/test_diff2/linux1 is not a valid PE file and 
cannot be decompressed either
/tmp/pytest-of-sbuild/pytest-0/test_diff2/linux1 is not a valid PE file, not 
extracting SBAT section.
.linux in 
/<>/.pybuild/cpython3_3.13/build/tests/data/dummyx64.efi.stub is 
not a valid PE, ignoring
Wrote unsigned linux1.unsigned.efi
/tmp/pytest-of-sbuild/pytest-0/test_diff2/linux2 is not a valid PE file and 
cannot be decompressed either
/tmp/pytest-of-sbuild/pytest-0/test_diff2/linux2 is not a valid PE file, not 
extracting SBAT section.
.linux in 
/<>/.pybuild/cpython3_3.13/build/tests/data/dummyx64.efi.stub is 
not a valid PE, ignoring
Wrote unsigned linux2.unsigned.efi
=== XPASSES 

-- coverage: platform linux, python 3.13.5-final-0 ---
Name