From 7a2d1e8bf5dbddd299d1bffd6722216785baeb79b0953523523d57db5b1b0653 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sun, 23 Mar 2025 14:33:36 +0000 Subject: [PATCH] Accepting request 1255404 from home:amanzini:branches:devel:languages:python - 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: OBS-URL: https://build.opensuse.org/request/show/1255404 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=101 --- diffoscope-284.tar.bz2 | 3 -- diffoscope-284.tar.bz2.asc | 16 --------- diffoscope-291.tar.bz2 | 3 ++ diffoscope-291.tar.bz2.asc | 16 +++++++++ diffoscope.changes | 69 ++++++++++++++++++++++++++++++++++++++ diffoscope.spec | 4 +-- 6 files changed, 90 insertions(+), 21 deletions(-) delete mode 100644 diffoscope-284.tar.bz2 delete mode 100644 diffoscope-284.tar.bz2.asc create mode 100644 diffoscope-291.tar.bz2 create mode 100644 diffoscope-291.tar.bz2.asc diff --git a/diffoscope-284.tar.bz2 b/diffoscope-284.tar.bz2 deleted file mode 100644 index b991b5c..0000000 --- a/diffoscope-284.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b7d09205a11c4f737f845422e86946c74997751231cca59ff693ab9883db4f8 -size 3149578 diff --git a/diffoscope-284.tar.bz2.asc b/diffoscope-284.tar.bz2.asc deleted file mode 100644 index 8671469..0000000 --- a/diffoscope-284.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmdS0+IACgkQHpU+J9Qx -HliG8A//cDQykZOlX8VoD+bLS6cPkdEhSdzsez5J1k4VRDGi59U45cT1bmxSueef -jTKVU7j9gPX+YBTrjdz9Wn0Pjs66qrSVIvCsxTuORKaSVFKnEmjs/CHOAKkfD/C4 -If2UJelKAgGipQ9NWGigiz0T5xZGhPwEG42mRC1MKpdMOa7Vtgi3S8LDE88r/GYL -YoJgcae/3bNoPpLZytASaIxdKBL4OeMkVCN1KcDP+F8eW5MRSuKIsAIGYT84GpyO -QwjmwsWStIo5DByCtQ5JQUYtSXJ/I/+cxOLrZFW0RwRSd1XGZVraGbOlTlTyTAkJ -s16HQVxkwjEFz8RivkV6Byx/UKabJqIX0kmsAQh5P1xQ9U9w6Lm1C85nqKpdwsyO -tifajTvoM/mLdnvGaEKR8wnn/J8Whwi42ElsLYPZt/YRw9rCqc2+bvI68Fuokdqp -rYkraO3FszMyO2MW9mPj2ce8m6BZnyrJNk2qQvjXDjJ9UUm5m7JK4BCXwhcSgs9j -g7pmNzL3Q8F72ajhZycLQgf9BBVkqS8CdnEy47jPZ9ymioyVQOsolpgYVGrRUYFR -eTD+WHwLhmZsfj59Z+rqhF+dxQcuz9vLfS0fWQ4xHf0wZXsH5aVP4Zv+1/guAzQ8 -q1KSCsawTGkeUjvKGGeangp1gMa3Iwoqy4aDMbXm8LNXWM8mSgw= -=VlZW ------END PGP SIGNATURE----- diff --git a/diffoscope-291.tar.bz2 b/diffoscope-291.tar.bz2 new file mode 100644 index 0000000..d337201 --- /dev/null +++ b/diffoscope-291.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dee9e1ce82980df0333d5222ed68ccc351d021507d9f2fd8cc2cbe00f562c88a +size 3157327 diff --git a/diffoscope-291.tar.bz2.asc b/diffoscope-291.tar.bz2.asc new file mode 100644 index 0000000..ce9cc55 --- /dev/null +++ b/diffoscope-291.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmfdc6sACgkQHpU+J9Qx +Hlj1UBAAseNjGwQdnaJZLm14itVR9gHmXaCViFrwiK6V1cUa3JtpWZJ91j2+R5Gh +MuNKXs/zNLLrh+tEQa/7WXn+5JM2R7x6DV/VmyQ+HtZZH8RR8S/5/GegvPVKaCER +32u5lt07xHI5fAEWLhd3Gg4r49pizLpxbmq0F1h/61f12U2754y6ou8tykL0oJ+r +i0AHV/zSv5Mw6BoeCqjRX+GrDAoBsY0aZIRepHzLWyi6nenIPPhG0P4zq5t30eRw +jQhQWpRCdI+qyhr/OF9yzXnNVF7lZ8pGcvSukvIUn7n7KPxzp8zgZXiHoC1hLydO +Wbzfn+R7brnaFQB/kLlD6P5xUax/Tmbj3bMtSBD00ARWFvXPwTYqTDK/jTACL+6l +Jm8HzqOOeAMBh0130m3qJj4HiT6prPZx3xbjXK3IycUXslB+qLzdQSw6lRlYVof2 +GyZSlkbRXb0LHuoK7xCDpDdnBNbSH6PATL+Ve9yYuoszi3QD6jAhuw/lNxUXpPz0 +PDVb8iw/Jq1O9ehFNL8LdmWCRCxqI19VfiKNfMYmQurQ3YmoxilMx64BcA7XwEPQ +tdI8mOa5GtE6p58qb/j8uk4X3tzv/pqipi2i99PY6BavM5HZGX7LgpGhKJEFS/tm +AX19PebLRfbyy6c3z526kHEy6suLg87Du1S2sDp0/sWl1aOgdaU= +=vFCC +-----END PGP SIGNATURE----- diff --git a/diffoscope.changes b/diffoscope.changes index 64ad497..ed9795e 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Sun Mar 23 14:10:37 UTC 2025 - Andrea Manzini + +- 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 diff --git a/diffoscope.spec b/diffoscope.spec index 1e6c1d3..11cd17f 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -1,7 +1,7 @@ # # spec file for package diffoscope # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # 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: 284 +Version: 291 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later