Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package diffoscope for openSUSE:Factory checked in at 2026-02-11 18:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffoscope (Old) and /work/SRC/openSUSE:Factory/.diffoscope.new.1670 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope" Wed Feb 11 18:49:09 2026 rev:51 rq:1332413 version:312 Changes: -------- --- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2025-12-26 16:23:45.284144343 +0100 +++ /work/SRC/openSUSE:Factory/.diffoscope.new.1670/diffoscope.changes 2026-02-11 18:50:51.446441720 +0100 @@ -1,0 +2,19 @@ +Wed Feb 11 08:06:52 UTC 2026 - Dirk Müller <[email protected]> + +- update to 312: + * Adjust u-boot-tools/fit diff to match new lines. + * Fix test compatibility with u-boot-tools 2026-01. Thanks, + Jelle! + * Bump Standards-Version to 4.7.3. + * Drop implied "Priority: optional" from debian/control. + * Also drop implied "Rules-Requires-Root: no" entry in + debian/control. + * Update copyright years. + * Reference the Debian 'ocaml' package instead of 'ocaml-nox'. + * Attempt to fix automatic deployment to PyPi by explictly + installing setuptools. + * Attempt to fix compatability with LLVM 21. + * Update copyright years. + * Update CI to try and deploy to PyPI upon tagging a release. + +------------------------------------------------------------------- Old: ---- diffoscope-306.tar.bz2 diffoscope-306.tar.bz2.asc New: ---- diffoscope-312.tar.bz2 diffoscope-312.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffoscope.spec ++++++ --- /var/tmp/diff_new_pack.ivRnAi/_old 2026-02-11 18:50:52.822499507 +0100 +++ /var/tmp/diff_new_pack.ivRnAi/_new 2026-02-11 18:50:52.830499843 +0100 @@ -1,7 +1,7 @@ # # spec file for package diffoscope # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: diffoscope -Version: 306 +Version: 312 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later ++++++ diffoscope-306.tar.bz2 -> diffoscope-312.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/debian/changelog new/diffoscope-312/debian/changelog --- old/diffoscope-306/debian/changelog 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/debian/changelog 2026-02-06 17:53:37.000000000 +0100 @@ -1,3 +1,56 @@ +diffoscope (312) unstable; urgency=medium + + [ Jelle van der Waa ] + * Adjust u-boot-tools/fit diff to match new lines. + + -- Chris Lamb <[email protected]> Fri, 06 Feb 2026 08:53:34 -0800 + +diffoscope (311) unstable; urgency=medium + + [ Chris Lamb ] + * Fix test compatibility with u-boot-tools 2026-01. Thanks, Jelle! + * Bump Standards-Version to 4.7.3. + * Drop implied "Priority: optional" from debian/control. + * Also drop implied "Rules-Requires-Root: no" entry in debian/control. + * Update copyright years. + + -- Chris Lamb <[email protected]> Fri, 23 Jan 2026 09:38:10 -0800 + +diffoscope (310) unstable; urgency=medium + + [ Chris Lamb ] + * Reference the Debian 'ocaml' package instead of 'ocaml-nox'. + (Closes: #1125094) + + -- Chris Lamb <[email protected]> Fri, 09 Jan 2026 12:04:10 -0800 + +diffoscope (309) unstable; urgency=medium + + [ Chris Lamb ] + * Attempt to fix automatic deployment to PyPi by explictly installing + setuptools. + + -- Chris Lamb <[email protected]> Fri, 14 Nov 2025 09:49:55 -0800 + +diffoscope (308) unstable; urgency=medium + + [ Chris Lamb ] + * Attempt to fix automatic deployment to PyPi: + - Separate out deploy-tag and deploy-pypi into different stages, and base + the latter on debian:unstable. + - Call apt-get update prior to attempting installing twine. + + -- Chris Lamb <[email protected]> Fri, 07 Nov 2025 10:09:32 -0800 + +diffoscope (307) unstable; urgency=medium + + * Attempt to fix compatability with LLVM 21. + (Closes: reproducible-builds/diffoscope#419) + * Update copyright years. + * Update CI to try and deploy to PyPI upon tagging a release. + + -- Chris Lamb <[email protected]> Fri, 31 Oct 2025 10:51:59 -0700 + diffoscope (306) unstable; urgency=medium [ Zbigniew Jędrzejewski-Szmek ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/debian/control new/diffoscope-312/debian/control --- old/diffoscope-306/debian/control 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/debian/control 2026-02-06 17:53:37.000000000 +0100 @@ -1,6 +1,5 @@ Source: diffoscope Section: devel -Priority: optional Maintainer: Reproducible builds folks <[email protected]> Uploaders: Chris Lamb <[email protected]>, @@ -56,7 +55,7 @@ lz4 <!nocheck>, lzip <!nocheck>, mono-devel (>= 6.14.1+ds-3) <!nocheck> | mono-utils (<< 6.14.1+ds-3) <!nocheck>, - ocaml-nox <!nocheck>, + ocaml <!nocheck>, odt2txt <!nocheck>, oggvideotools [!s390x] <!nocheck>, openssh-client <!nocheck>, @@ -100,8 +99,7 @@ zstd <!nocheck>, Build-Conflicts: graphicsmagick-imagemagick-compat, -Standards-Version: 4.7.2 -Rules-Requires-Root: no +Standards-Version: 4.7.3 Homepage: https://diffoscope.org Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git Vcs-Browser: https://salsa.debian.org/reproducible-builds/diffoscope diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/debian/tests/control new/diffoscope-312/debian/tests/control --- old/diffoscope-306/debian/tests/control 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/debian/tests/control 2026-02-06 17:53:37.000000000 +0100 @@ -7,7 +7,7 @@ # $ mv debian/tests/control.tmp debian/tests/control Tests: pytest-with-recommends -Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, abootimg, acl, apksigcopier, apksigner, apktool, binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils [!risv64], db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!riscv64 !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-devel (>= 6.14.1+ds-3) [!riscv64] | mono-utils (<< 6.14.1+ds-3) [!riscv64], ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, systemd-ukify, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh +Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, abootimg, acl, apksigcopier, apksigner, apktool, binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils [!risv64], db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!riscv64 !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-devel (>= 6.14.1+ds-3) [!riscv64] | mono-utils (<< 6.14.1+ds-3) [!riscv64], ocaml, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, systemd-ukify, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, python3-argcomplete, pyth on3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh Tests: pytest Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file, python3-tlsh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/diffoscope/__init__.py new/diffoscope-312/diffoscope/__init__.py --- old/diffoscope-306/diffoscope/__init__.py 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/diffoscope/__init__.py 2026-02-06 17:53:37.000000000 +0100 @@ -2,7 +2,7 @@ # diffoscope: in-depth comparison of files, archives, and directories # # Copyright © 2014-2015 Jérémy Bobbio <[email protected]> -# Copyright © 2015-2025 Chris Lamb <[email protected]> +# Copyright © 2015-2026 Chris Lamb <[email protected]> # # diffoscope is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,4 +17,4 @@ # You should have received a copy of the GNU General Public License # along with diffoscope. If not, see <https://www.gnu.org/licenses/>. -VERSION = "306" +VERSION = "312" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/diffoscope/external_tools.py new/diffoscope-312/diffoscope/external_tools.py --- old/diffoscope-306/diffoscope/external_tools.py 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/diffoscope/external_tools.py 2026-02-06 17:53:37.000000000 +0100 @@ -1,7 +1,7 @@ # # diffoscope: in-depth comparison of files, archives, and directories # -# Copyright © 2017-2025 Chris Lamb <[email protected]> +# Copyright © 2017-2026 Chris Lamb <[email protected]> # Copyright © 2021 Jean-Romain Garnier <[email protected]> # # diffoscope is free software: you can redistribute it and/or modify @@ -159,7 +159,7 @@ "arch": "binutils", "guix": "binutils", }, - "ocamlobjinfo": {"debian": "ocaml-nox", "arch": "ocaml", "guix": "ocaml"}, + "ocamlobjinfo": {"debian": "ocaml", "arch": "ocaml", "guix": "ocaml"}, "odt2txt": {"debian": "odt2txt", "arch": "odt2txt", "guix": "odt2txt"}, "oggDump": {"debian": "oggvideotools"}, "openssl": {"debian": "openssl", "arch": "openssl", "guix": "openssl"}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/tests/comparators/test_fit.py new/diffoscope-312/tests/comparators/test_fit.py --- old/diffoscope-306/tests/comparators/test_fit.py 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/tests/comparators/test_fit.py 2026-02-06 17:53:37.000000000 +0100 @@ -3,7 +3,7 @@ # diffoscope: in-depth comparison of files, archives, and directories # # Copyright © 2020 Conrad Ratschan <[email protected]> -# Copyright © 2021, 2023 Chris Lamb <[email protected]> +# Copyright © 2021, 2023, 2026 Chris Lamb <[email protected]> # # diffoscope is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -112,7 +112,7 @@ return uboot_fit1.compare(uboot_fit2).details[1].details -@skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01") +@skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2026.01") @skip_unless_tools_exist("fdtdump") def test_file_differences(differences): assert_diff(differences[0], "fit_expected_diff") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/tests/comparators/test_rlib.py new/diffoscope-312/tests/comparators/test_rlib.py --- old/diffoscope-306/tests/comparators/test_rlib.py 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/tests/comparators/test_rlib.py 2026-02-06 17:53:37.000000000 +0100 @@ -3,7 +3,7 @@ # # Copyright © 2015 Jérémy Bobbio <[email protected]> # Copyright © 2016 Ximin Luo <[email protected]> -# Copyright © 2016-2023 Chris Lamb <[email protected]> +# Copyright © 2016-2023, 2025 Chris Lamb <[email protected]> # # diffoscope is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -89,6 +89,9 @@ if actual_ver >= "16.0": diff_file = "rlib_llvm_dis_expected_diff_16" + if actual_ver >= "21.0": + diff_file = "rlib_llvm_dis_expected_diff_21" + return get_data(diff_file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/tests/data/fit_expected_diff new/diffoscope-312/tests/data/fit_expected_diff --- old/diffoscope-306/tests/data/fit_expected_diff 2025-09-08 00:31:34.000000000 +0200 +++ new/diffoscope-312/tests/data/fit_expected_diff 2026-02-06 17:53:37.000000000 +0100 @@ -1,4 +1,4 @@ -@@ -5,15 +5,15 @@ +@@ -5,16 +5,16 @@ Created: Fri Jan 1 00:00:00 2021 Type: RAMDisk Image Compression: uncompressed @@ -16,3 +16,4 @@ Description: unavailable Kernel: unavailable Init Ramdisk: ramdisk-1 + Loadables: ramdisk-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-306/tests/data/rlib_llvm_dis_expected_diff_21 new/diffoscope-312/tests/data/rlib_llvm_dis_expected_diff_21 --- old/diffoscope-306/tests/data/rlib_llvm_dis_expected_diff_21 1970-01-01 01:00:00.000000000 +0100 +++ new/diffoscope-312/tests/data/rlib_llvm_dis_expected_diff_21 2026-02-06 17:53:37.000000000 +0100 @@ -0,0 +1,36 @@ +@@ -42,32 +42,32 @@ + entry-block: + %out.i.i = alloca ptr, align 8 + %4 = icmp ult i64 %3, 17 + br i1 %4, label %then-block-195-.i, label %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i + + then-block-195-.i: ; preds = %entry-block + %5 = tail call ptr @realloc(ptr %0, i64 %2) #2 +- br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit ++ br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit + + _ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i: ; preds = %entry-block + %6 = bitcast ptr %out.i.i to ptr + call void @llvm.lifetime.start.p0(i64 8, ptr %6) #2 + store ptr null, ptr %out.i.i, align 8 + %7 = call i32 @posix_memalign(ptr nonnull %out.i.i, i64 %3, i64 %2) #2 + %8 = icmp eq i32 %7, 0 + %9 = load ptr, ptr %out.i.i, align 8 + %sret_slot.0.i.i = select i1 %8, ptr %9, ptr null + call void @llvm.lifetime.end.p0(i64 8, ptr %6) #2 + %10 = icmp ule i64 %2, %1 + %11 = select i1 %10, i64 %2, i64 %1 + call void @llvm.memmove.p0.p0.i64(ptr align 1 %sret_slot.0.i.i, ptr align 1 %0, i64 %11, i1 false) #2 + call void @free(ptr %0) #2 +- br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit ++ br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit + +-_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i ++_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i + %sret_slot.0.i = phi ptr [ %5, %then-block-195-.i ], [ %sret_slot.0.i.i, %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i ] + ret ptr %sret_slot.0.i + } + + ; Function Attrs: nounwind memory(none) uwtable + define i64 @__rust_reallocate_inplace(ptr readnone captures(none) %0, i64 %1, i64 %2, i64 %3) unnamed_addr #1 { + entry-block:
