Accepting request 1324454 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1324454
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/diffoscope?expand=0&rev=50

diffoscope-265.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:604f3547c95338cdf09affc621a201a94ab63ba52f9d46878ee5d9d34c8353c5
-size 3143847

diffoscope-265.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmYiNk8ACgkQHpU+J9Qx
-Hli9sxAAnLTpMEuC++m/9mI5DunV3PgUvO+1IlNi1YiupWa3GyaRY0OfRaSFKfAO
-dGYTtxtMI/X68Ndm8n2cTY054UTb30Xpxwo6wYevCdIAjgKOGLgGE4CshV0yz44C
-V/YiOcTbwGvi8/4HLFa5d4vvceC1zWCy7/iGsR8X5Wk3sqLVAkTq5OQX8vywgBl9
-KVPTvblkz6w4pQ/7TgOCfhU9yzRI7yLW0OS/aeJN5mgMds21XtdZqMoKL0S+vHct
-P3ahmOypCWEYDBaos8r9vBxkcXC5Fc4jiMfxZDrs/uo+EOqafY5bOPBKQ5SxFrcP
-n3o/Nq3yP2mZYUHS9ZDTINmVyZO/pPkJcLhxr5c0jqENulRw83uI/11M03dPDfJ4
-Iqum5FTAV3k+FQVr1BOi3xzFoMrZtiDMH2lFIl9I+B9At087kfdvfbc1AiL5YtUr
-NJ/QPoblzkMEpJtzPZwIorelqInpiyeOzYSi+p5his81wRsWv7GO3HVvLiUeRXDQ
-vBi0qS+mpVvip2Ye6GrQ/sRyKBcrgE/CPYoGPANpwNFEbq719j+fk6TU2lauTL2d
-zdV6dRwg4Am1xoK3TOxyAdRbNEpTaOsqPKHtiGM9spphqZ/Hc94AW3QSUUoEjDng
-VanpP99vWQbT9b16OQzrKr1Ez94mLc4tH8QbJTG0WTL2yQBrTMo=
-=Hrjj
------END PGP SIGNATURE-----

diffoscope-306.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62be31ca78d1e4deda2266fc5552ec89413e3a828ea2778351bc3d3bb6fbedbf
+size 3154052

diffoscope-306.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmi+B9EACgkQHpU+J9Qx
+HlgQjg//cZ9IAJ8YQiCa6aKEFxixQwd2SSIan8VUXFnYnRnbGzANR2SlVBzleAWD
+4smaY0KKjXoyjfeOzHKDH/ThON8X0obPE76PpUZLkfnIcWd8R9Uzo2COLn7hnOxN
+Cj4kFM0iHmlVOjuIYaB2C+Sy/1IFCZqOUEm6nzzFdMQKuTI7dzorYLEhUNSapOSC
+bkF6Cq2/PxL8Wrhkq6zRz6JulxlF3rlYXQSr5I7BGaI8MVtg6tnKcxEyCpu59HOy
+k9zjJKi+mwVMF0Xz3Dc7TbgRhRaCJRLHys8NA7s3klmrkVgffxJGMTDPuSUd8lbP
+Wf+qK1qq9uePlAKkPsm3Mi/nYFDdgWg63cIlSwr2Jp26TyG5fqQJrb1AAg/k6G8Y
+Dk0RqA6uXT/yaLMthJzqf2YIjhu7Bw+Qc7eVw6BID5s4UzVV2nxMPpeGs7PsMKow
+pf39E3/bm+kWmncpYuvpoHMrvWuwKpgMseMwnHhrVTVx8+DyJUafdAgLD6q8kQfM
+No9j4NslzGBXPTSivPyssislbuIQ6k3L/lCkpk2voz43akILxE8c+LFuLPbQIc22
+qJPwwzq/ijUQRzZHV1/7Avf3jpUFPqQK7HDrvE/T0OcADA0LQNgcZsu78DM0L44F
+EhdkJuldLP3XKanoYvAFc3ffqayfLRXLVCmUHi+nUjzgRi7+eug=
+=VhZA
+-----END PGP SIGNATURE-----

diffoscope.changes

@@ -1,3 +1,226 @@
+-------------------------------------------------------------------
+Fri Dec 26 11:56:43 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Avoid influences from checks on build result
+  for reproducible builds (boo#1227364)
+
+-------------------------------------------------------------------
+Thu Sep 11 20:18:49 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- update to 306:
+  * Fix compatibility with RPM 6.
+  * Use regular 'open' calls instead of the deprecated
+    'codecs.open'.
+  * Accept additional 'v' when calling 'fdtump --version'.
+  * Do not run jsondiff on files over 100KiB as the algorithm
+    runs in O(n^2)
+  * Fix test after the upload of systemd-ukify 258~rc3 (vs.
+    258~rc2).
+  * Avoid a crash in the HTML presenter when page limit is None.
+  * Don't check for PyPDF version 3 specifically, check for >= 3.
+  * Ensure that Java class files are named .class on the
+    filesystem before passing them to javap(1).
+  * Mask stderr from the extract-vmlinux script.
+  * Make it much more explicit that we return 'success' from the
+    extract-vmlinux script instead of just falling through to
+    the bottom of the script.
+  * Use Difference.from_operation in an attempt to pipeline the
+    output of extract-vmlinux, potentially avoiding it all
+    residing in memory. This is an attempt to prevent out of
+    memory issues on try.diffoscope.org.
+  * Avoid spurious differences in h5dump output caused by
+    exposure of absolute internal extraction paths.
+  * Use our_check_output in the ODT comparator.
+  * Fix a regression and add a test so that diffoscope picks up
+    differences in metadata for identical files again.
+  * Handle RPM's HEADERSIGNATURES and HEADERIMMUTABLE specially
+    to avoid unncessarily large diffs.
+  * Add a LZMA comparator and tests.
+  * Don't rely on zipdetails' --walk functionality to be
+    available; only add that argument after testing for a new
+    enough versions.
+  * Use --walk over the potentially dangerous --scan argument of
+    zipdetails(1).
+  * Correct longstanding issue where many ">"-based version tests
+    used in conditional fixtures were broken due to the lack of a
+    __gt__ method.
+  * Address a long-hidden issue in the test_versions testsuite
+    where we weren't actually testing ">" as it was masked by the
+    tests for equality in the testsuite.
+  * Correct import masking issue.
+  * Ignore st_size entry for directories to avoid spurious diffs
+    as this value is essentially filesystem dependent.
+
+-------------------------------------------------------------------
+Sun Mar 23 14:10:37 UTC 2025 - Andrea Manzini <andrea.manzini@suse.com>
+
+- update to version 291:
+  * Make two required adjustments for the new version of the src:file package:
+    file(1) version 5.46 now emits "XHTML document" for .xhtml files, such as
+    those found nested within our .epub tests. Therefore, match this string
+    when detecting XML files. This was causing an FTBFS due to inconsistent
+    indentation in diffoscope's output.
+  * Require the new, upcoming, version of file(1) for a quine-related
+    testcase after adjusting the expected output. Previous versions of
+    file(1) had a duplicated "last modified, last modified" string for some
+    Zip archives that has now been removed.
+  * Add a missing subprocess import.
+  * Bump Standards-Version to 4.7.2.
+
+- update to version 290:
+  * Also consider .aar files as APK files for the sake of not falling back to a
+    binary diff. (Closes: #1099632)
+  * Ensure all calls to out_check_output in the ELF comparator have the
+    potential CalledProcessError exception caught. (Re: #398)
+  * Ensure a potential CalledProcessError is caught in the OpenSSL comparator
+    as well.
+
+- update to version 289:
+  * Catch CalledProcessError when calling html2text.
+
+- update to version 288:
+  * Add 'asar' to DIFFOSCOPE_FAIL_TESTS_ON_MISSING_TOOLS. (Closes: #1095057)
+  * Update minimal 'black' version.
+
+- update to version 287:
+  * Drop an unused subprocess import.
+  * Update copyright years.
+  * Add ASAR comparator.
+
+- update to version 286:
+  * Bug fixes:
+  - When passing files on the command line, don't call specialize(..) before
+    we've checked that the files are identical. In the worst case, this was
+    resulting in spinning up binwalk and extracting two entire filesystem
+    images merely to confirm that they were indeed filesystem images..
+    before simply concluding that they were identical anyway.
+  - Do not exit with a traceback if paths are inaccessible, either directly,
+    via symbolic links or within a directory. (Closes: #1065498)
+  - Correctly identify changes to only the line-endings of files; don't mark
+    them as "Ordering differences only".
+  - Use the "surrogateescape" mechanism of str.{decode,encode} to avoid a
+    UnicodeDecodeError and crash when decoding zipinfo output that is not
+    valid UTF-8. (Closes: #1093484)
+  * Testsuite changes:
+  - Don't mangle newlines when opening test fixtures; we want them untouched.
+  - Move to assert_diff in test_text.py.
+  * Misc:
+  - Remove unnecessary return value from check_for_ordering_differences in
+    the Difference class.
+  - Drop an unused function in iso9600.py
+  - Inline a call/check of Config().force_details; no need for an additional
+    variable.
+
+- update to version 285:
+  * Validate --css command-line argument. Thanks to Daniel Schmidt @ SRLabs for
+    the report. (Closes: #396)
+  * Prevent XML entity expansion attacks through vulnerable versions of
+    pyexpat. Thanks to Florian Wilkens @ SRLabs for the report. (Closes: #397)
+  * Print a warning if we have disabled XML comparisons due to a potentially
+    vulnerable version of pyexpat.
+  * Remove (unused) logging facility from a few comparators.
+
+-------------------------------------------------------------------
+Sun Dec 22 20:29:42 UTC 2024 - Sebastian Wagner <sebix@sebix.at>
+
+- update to version 284:
+ - Simplify tests_quines.py::test_{differences,differences_deb} to use
+   assert_diff and not mangle the expected test output.
+ - Update some tests to support file(1) version 5.46.
+   (Closes: reproducible-builds/diffoscope#395)
+- update test skips, remove test_diff, add test_obj_identification
+
+-------------------------------------------------------------------
+Mon Dec  2 21:08:30 UTC 2024 - Sebastian Wagner <sebix@sebix.at>
+
+- update to version 283:
+ - Fix crash when objdump is missing when checking .EFI files.
+- update to version 282:
+ - Ignore errors when listing .ar archives. (Closes: #1085257)
+ - Update copyright years.
+- update to version 281:
+ - Don't try and test with systemd-ukify within Debian stable.
+ - Add support for UKI files.
+- update to version 280:
+ - Drop Depends on deprecated python3-pkg-resources. (Closes: #1083362)
+- update to version 279:
+ - Drop removal of calculated basename from readelf output.
+   (Closes: reproducible-builds/diffoscope#394)
+- update to version 278:
+ - Temporarily remove procyon-decompiler from Build-Depends as it was removed
+   from testing (#1057532). (Closes: #1082636)
+ - Add a helpful contextual message to the output if comparing Debian .orig
+   tarballs within .dsc files without the ability to "fuzzy-match" away the
+   leading directory. (Closes: reproducible-builds/diffoscope#386)
+ - Correctly invert "X% similar" value and do not emit "100% similar".
+   (Closes: reproducible-builds/diffoscope#391)
+ - Update copyright years.
+- update to version 277:
+ - Don't crash when attempting to hashing symlinks with targets that point to
+   a directory.
+- update to version 276:
+ - Also catch RuntimeError when importing PyPDF so that PyPDF or, crucially,
+   its transitive dependencies do not cause diffoscope to traceback at runtime
+   and build time. (Closes: #1078944, reproducible-builds/diffoscope#389)
+ - Factor out a method for stripping ANSI escapes.
+ - Strip ANSI escapes from the output of Procyon. Thanks, Aman Sharma!
+ - Update copyright years.
+- update to version 275:
+ - Update the test_zip.py text fixtures and definitions to support new changes
+   to IO::Compress. (Closes: #1078050)
+ - Do not call marshal.loads(...) of precompiled Python bytecode as it is
+   inherently unsafe. Replace, at least for now, with a brief summary of the
+   code section of .pyc files. (Re: reproducible-builds/diffoscope#371)
+ - Don't bother to check the Python version number in test_python.py: the
+   fixture for this test is deterministic/fixed.
+ - Update copyright years.
+- update to version 274:
+ - Add support for IO::Compress::Zip >= 2.212. (Closes: #1078050)
+ - Don't include debug output when calling dumppdf(1).
+ - Append output from dumppdf(1) in more cases.
+   (Closes: reproducible-builds/diffoscope#387)
+ - Update copyright years.
+ - Update the available architectures for test dependencies.
+- update to version 273:
+ - Factor out version detection in test_jpeg_image. (Re:
+   reproducible-builds/diffoscope#384)
+ - Ensure that 'convert' is from Imagemagick 6.x; we will need to update a
+   few things with IM7. (Closes: reproducible-builds/diffoscope#384)
+ - Correct import of identify_version after refactoring change in 037bdcbb0.
+ - tests:
+   + Add OpenSSH key test with a ed25519 key.
+   + Skip the OpenSSH test with DSA key if openssh is >> 9.7
+   + Support ffmpeg >= 7 that adds some extra context to the diff
+ - Do not ignore testing in gitlab-ci.
+
+-------------------------------------------------------------------
+Tue Jul  9 13:21:55 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 272:
+  * Move away from using DSA OpenSSH keys in tests; support has
+    been removed in OpenSSH 9.8p1.
+  * Move to assert_diff helper in test_openssh_pub_key.py
+  * Update tests to support zipdetails version 4.004 shipped with
+    Perl 5.40.
+  * Drop apktool from Build-Depends; we can still test our APK
+    code via autopkgtests. (Closes: #1071410)
+  * Fix tests for 7zip version 24.05.
+  * Add a versioned dependency for at least version 5.4.5 for the
+    xz tests; they fail under (at least xz 5.2.8).
+  * Relax Chris' versioned xz test dependency (5.4.5) to also
+    allow version 5.4.1.
+  * Include "xz --verbose --verbose" (ie. double --verbose)
+    output, not just the single --verbose. (Closes: #1069329)
+  * Only include "xz --list" output if the xz has no other
+    differences.
+  * Use "xz --list" to supplement the output when comparing .xz
+    archives; essential when some underlying metadata differs.
+  * Actually append the xz --list after the container
+    differences, as it simplifies tests and the output.
+  * Maintain an in-header boolean state to determine whether to
+    drop from-file/to-file lines. This fixes an issue where HTML
+    differences were being inadvertendly neglected.
+
 -------------------------------------------------------------------
 Mon Apr 22 21:12:38 UTC 2024 - Joshua Smith <smolsheep@opensuse.org>
 

diffoscope.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package diffoscope
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 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:        265
+Version:        306
 Release:        0
 Summary:        In-depth comparison of files, archives, and directories
 License:        GPL-3.0-or-later
@@ -37,7 +37,6 @@ BuildRequires:  python3-setuptools
 Requires:       python3-curses
 Requires:       python3-libarchive-c
 Requires:       python3-python-magic
-Requires:       python3-setuptools
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 # Tools required for proper function of this program
@@ -135,8 +134,8 @@ fi
 
 %check
 # test_identification https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/98
-# comparators/test_python/test_diff https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/284#note_280561
+cp -a `pwd` ../testrundir && cd ../testrundir # for boo#1227364
-py.test-%{python3_bin_suffix} -k 'not ((test_python and test_diff) or test_identification)'
+py.test-%{python3_bin_suffix} -k 'not (test_python or test_identification or test_obj_identification)'
 
 %files
 %doc README.rst