Your message dated Fri, 12 Nov 2021 15:04:08 +0000 with message-id <[email protected]> and subject line Bug#999438: fixed in diffoscope 191 has caused the Debian Bug report #999438, regarding diffoscope: issues with XML files not named *.xml to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 999438: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=999438 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: diffoscope Version: 190 Severity: normal There are two issues with XML files not named *.xml: They don't get reformatted before comparison, resulting in a diff of the plain text, instead of a diff of the reformatted XML. When comparing them with XML files named *.xml, a comparison of the bytes is done, resulting in a diff of two hex dumps, instead of a diff of the reformatted XML or a diff of the plain text. The reformatted XML would be the best thing to diff, but plain text should be a fallback. The xmllint tool can reformat them just fine and the file tool can detect them as XML and detect their MIME type, so this issue is likely to be a problem in the diffoscope code. $ head -vn-0 test-{old,new}.xml ==> test-old.xml <== <?xml version="1.0" encoding="UTF-8"?> <test> <foo> <bar> </bar> </foo> </test> ==> test-new.xml <== <?xml version="1.0" encoding="UTF-8"?> <test> <foo> <bar> <baz> </baz> </bar> </foo> </test> $ diffoscope test-{old,new}.xml --- test-old.xml +++ test-new.xml │ --- test-old.xml ├── +++ test-new.xml │ @@ -1,6 +1,8 @@ │ <?xml version="1.0" encoding="utf-8"?> │ <test> │ <foo> │ - <bar/> │ + <bar> │ + <baz/> │ + </bar> │ </foo> │ </test> $ cp test-new.xml test-new.not-xml $ cp test-old.xml test-old.not-xml $ diffoscope test-{old,new}.not-xml --- test-old.not-xml +++ test-new.not-xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <test> <foo> <bar> +<baz> +</baz> </bar> </foo> </test> $ diffoscope test-old.xml test-new.not-xml --- test-old.xml +++ test-new.not-xml @@ -1,5 +1,6 @@ 00000000: 3c3f 786d 6c20 7665 7273 696f 6e3d 2231 <?xml version="1 00000010: 2e30 2220 656e 636f 6469 6e67 3d22 5554 .0" encoding="UT 00000020: 462d 3822 3f3e 0a3c 7465 7374 3e0a 3c66 F-8"?>.<test>.<f -00000030: 6f6f 3e0a 3c62 6172 3e0a 3c2f 6261 723e oo>.<bar>.</bar> -00000040: 0a3c 2f66 6f6f 3e0a 3c2f 7465 7374 3e0a .</foo>.</test>. +00000030: 6f6f 3e0a 3c62 6172 3e0a 3c62 617a 3e0a oo>.<bar>.<baz>. +00000040: 3c2f 6261 7a3e 0a3c 2f62 6172 3e0a 3c2f </baz>.</bar>.</ +00000050: 666f 6f3e 0a3c 2f74 6573 743e 0a foo>.</test>. $ diffoscope test-old.not-xml test-new.xml --- test-old.not-xml +++ test-new.xml @@ -1,5 +1,6 @@ 00000000: 3c3f 786d 6c20 7665 7273 696f 6e3d 2231 <?xml version="1 00000010: 2e30 2220 656e 636f 6469 6e67 3d22 5554 .0" encoding="UT 00000020: 462d 3822 3f3e 0a3c 7465 7374 3e0a 3c66 F-8"?>.<test>.<f -00000030: 6f6f 3e0a 3c62 6172 3e0a 3c2f 6261 723e oo>.<bar>.</bar> -00000040: 0a3c 2f66 6f6f 3e0a 3c2f 7465 7374 3e0a .</foo>.</test>. +00000030: 6f6f 3e0a 3c62 6172 3e0a 3c62 617a 3e0a oo>.<bar>.<baz>. +00000040: 3c2f 6261 7a3e 0a3c 2f62 6172 3e0a 3c2f </baz>.</bar>.</ +00000050: 666f 6f3e 0a3c 2f74 6573 743e 0a foo>.</test>. $ xmllint --format test-old.xml <?xml version="1.0" encoding="UTF-8"?> <test> <foo> <bar> </bar> </foo> </test> $ xmllint --format test-new.xml <?xml version="1.0" encoding="UTF-8"?> <test> <foo> <bar> <baz> </baz> </bar> </foo> </test> $ xmllint --format test-old.not-xml <?xml version="1.0" encoding="UTF-8"?> <test> <foo> <bar> </bar> </foo> </test> $ xmllint --format test-new.not-xml <?xml version="1.0" encoding="UTF-8"?> <test> <foo> <bar> <baz> </baz> </bar> </foo> </test> $ file test-* test-new.not-xml: XML 1.0 document, ASCII text test-new.xml: XML 1.0 document, ASCII text test-old.not-xml: XML 1.0 document, ASCII text test-old.xml: XML 1.0 document, ASCII text $ file --mime test-* test-new.not-xml: text/xml; charset=us-ascii test-new.xml: text/xml; charset=us-ascii test-old.not-xml: text/xml; charset=us-ascii test-old.xml: text/xml; charset=us-ascii -- System Information: Debian Release: bookworm/sid APT prefers testing-debug APT policy: (900, 'testing-debug'), (900, 'testing'), (860, 'testing-proposed-updates-debug'), (860, 'testing-proposed-updates'), (800, 'unstable-debug'), (800, 'unstable'), (790, 'buildd-unstable'), (700, 'experimental-debug'), (700, 'experimental'), (690, 'buildd-experimental') Architecture: amd64 (x86_64) Kernel: Linux 5.14.0-4-amd64 (SMP w/8 CPU threads) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8), LANGUAGE=en_AU:en Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages diffoscope depends on: ii diffoscope-minimal 190 Versions of packages diffoscope recommends: ii abootimg 0.6-1+b2 ii acl 2.3.1-1 ii androguard 3.4.0~a1-1 ii apksigner 30.0.3-4 ii apktool 2.5.0+dfsg.1-2 ii binutils-multiarch 2.37-7 ii bzip2 1.0.8-4 ii caca-utils 0.99.beta19-2.2 ii colord 1.4.5-3 ii db-util 5.3.1+nmu1 ii default-jdk [java-sdk] 2:1.11-72 ii default-jdk-headless 2:1.11-72 pn device-tree-compiler <none> pn docx2txt <none> ii e2fsprogs 1.46.4-1 ii enjarify 1:1.0.3-5 ii ffmpeg 7:4.4.1-1+b1 ii fontforge-extras 1:20201107~dfsg-4 pn fp-utils <none> ii genisoimage 9:1.1.11-3.2 ii gettext 0.21-4 ii ghc 8.8.4-3 ii ghostscript 9.54.0~dfsg-5 ii giflib-tools 5.1.9-2 ii gnumeric 1.12.50-1 ii gnupg 2.2.27-2 ii gnupg-utils 2.2.27-2 pn hdf5-tools <none> ii imagemagick 8:6.9.11.60+dfsg-1.3 ii imagemagick-6.q16 [imagemagick] 8:6.9.11.60+dfsg-1.3 ii jsbeautifier 1.14.0-1 ii libarchive-tools 3.4.3-2+b1 ii llvm 1:11.0-51+nmu5 ii lz4 [liblz4-tool] 1.9.3-2 pn mono-utils <none> ii ocaml-nox 4.11.1-4 pn odt2txt <none> pn oggvideotools <none> ii openjdk-11-jdk [java-sdk] 11.0.13+8-1 ii openssh-client 1:8.7p1-1 ii openssl 1.1.1l-1 ii pgpdump 0.33-2 ii poppler-utils 20.09.0-3.1 pn procyon-decompiler <none> ii python3-argcomplete 1.12.3-0.1 ii python3-binwalk 2.3.2+dfsg1-1 ii python3-debian 0.1.42 ii python3-defusedxml 0.7.1-1 ii python3-guestfs 1:1.44.2-1+b1 ii python3-jsondiff 1.1.1-4 ii python3-pdfminer 20201018+dfsg-1 ii python3-progressbar 2.5-2 ii python3-pypdf2 1.26.0-4 ii python3-pyxattr 0.7.2-1+b1 ii python3-rpm 4.16.1.2+dfsg1-3 ii python3-tlsh 3.4.4+20151206-1.4 pn r-base-core <none> pn radare2 <none> ii rpm2cpio 4.16.1.2+dfsg1-3 ii sng 1.1.0-4 ii sqlite3 3.36.0-2 ii squashfs-tools 1:4.5-3 ii tcpdump 4.99.1-3 ii u-boot-tools 2021.10+dfsg-1 ii unzip 6.0-26 ii vim-common 2:8.2.3565-1 pn wabt <none> pn xmlbeans <none> ii xxd 2:8.2.3565-1+b1 ii xz-utils 5.2.5-2 ii zip 3.0-12 ii zstd 1.4.8+dfsg-3 Versions of packages diffoscope suggests: ii libjs-jquery 3.5.1+dfsg+~3.5.5-8 -- no debconf information -- bye, pabs https://wiki.debian.org/PaulWise
signature.asc
Description: This is a digitally signed message part
--- End Message ---
--- Begin Message ---Source: diffoscope Source-Version: 191 Done: Chris Lamb <[email protected]> We believe that the bug you reported is fixed in the latest version of diffoscope, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Chris Lamb <[email protected]> (supplier of updated diffoscope package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Fri, 12 Nov 2021 06:43:57 -0800 Source: diffoscope Built-For-Profiles: nocheck Architecture: source Version: 191 Distribution: unstable Urgency: medium Maintainer: Reproducible builds folks <[email protected]> Changed-By: Chris Lamb <[email protected]> Closes: 999438 Changes: diffoscope (191) unstable; urgency=medium . [ Chris Lamb ] * Detect XML files as XML files if either file(1) claims if they are XML files, or if they are named .xml. (Closes: #999438, reproducible-builds/diffoscope#287) * Don't reject Debian .changes files if they contain non-printable characters. (Closes: reproducible-builds/diffoscope#286) * Continue loading a .changes file even if the referenced files inside it do not exist, but include a comment in the diff as a result. * Log the reason if we cannot load a Debian .changes file. . [ Zbigniew Jędrzejewski-Szmek ] * Fix inverted logic in the assert_diff_startswith() utility. Checksums-Sha1: 9e60565f48fdb8e324595e38a20853824b40e324 4973 diffoscope_191.dsc 55367fd3ba1a4e17d12129b306fb781b36ff805d 2090012 diffoscope_191.tar.xz 1bfee97fe9aa0e15101cd4c53b81ad38bc22efb4 6883 diffoscope_191_amd64.buildinfo Checksums-Sha256: 78c40ecc20b1bedee53ec681f2605599547ec2130459382490fef353c4019dde 4973 diffoscope_191.dsc de851598309a10061ad9c276f77eacd378e64b9ac0b06f48d33d12b3064d33d4 2090012 diffoscope_191.tar.xz 0e8f524d40a18aee1a1db2fc05ad7ef183332b86006cc8c36cef9a4ed3e4f0c5 6883 diffoscope_191_amd64.buildinfo Files: fff8bca513e1cf9c98de7592617e926c 4973 devel optional diffoscope_191.dsc 1886b83cc956325b2e117a5defcfbde2 2090012 devel optional diffoscope_191.tar.xz 195ddbe9eb01d784c1512a7a5e5156c6 6883 devel optional diffoscope_191_amd64.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmGOfp0ACgkQHpU+J9Qx Hli9lRAAo5fkWH2jofAXl/UJjRp77scu7R2HZXj/SEf6ByyJX8jWkNUJYo/6T3GK lZ2n1hBpaEqMh2Wf8BffwdEiWMSPN3TGDaoIzYST7H31hX6Fql80YmjhIAJ0lMFH k2bwTnpynEOw3mvUjjWkrhzDsMlUZrl/iIt0ljEv4AUjbkEBTMN+fMlYx+mNK/nP LksKPHgmQdZ4k2HYGKU5GNTzYT5Sl1+Fj3OX9ZXQ3CTBB+He7PwXYJfaMGwdOs5A fiqZm8kjwROsXHWhW/QJxKMK9sMNoN0RkOZ2ofp69JNKsbFMpPyBI2gFYO0DwGRc Qat4Cmp53Grmyk1eCfLQYsHgvdFF4aym4LTk3ZPyPBO719v0sweLnKcKnegi4NRl xkbjy885zl16dA3bx3RZ9jcERkcYVPo41aIqxIcmkw2AXppIYasEx0dttIS4TA5q QFN27zyHECXGtKX8YnOFmjwnaYI4m/WWPAtSEDowCryEx1/sjZoMC9xZN2GYH6u6 1cIVdSkBEYabl+VvHvElFFq/0ax1O+S+pRHAg7omIlo8phpxRPFTTK2xMzosZroY 9gQgtROiuD2sdNSoq7ind5QxvTHpTVNdz4klYU7jZu5DMCi8NCq7xz8B9QESRjoX CtL6eyU+VcCGks6ebGWGy1aK3sjQYzzFQ2VQ/eQxNawO8mgVQqc= =ExTX -----END PGP SIGNATURE-----
--- End Message ---
