Your message dated Sun, 18 Jun 2017 09:05:15 +0000
with message-id <e1dmw8x-00024l...@fasolo.debian.org>
and subject line Bug#850758: fixed in diffoscope 83
has caused the Debian Bug report #850758,
regarding diffoscope: redundant undecoded AndroidManifest.xml (Binary XML)
comparison in APK comparator
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 ow...@bugs.debian.org
immediately.)
--
850758: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850758
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 67
Severity: normal
Dear Maintainer,
The result of comparing AndroidManifest.xml (Binary XML) file from APK file in
apk.py comparator is shown twice,
first, as AndroidManifest.xml (XML file decoded from original file by apktool)
second, as original/AndroidManifest.xml (the original undecoded binary file)
fix:
1. if there is a difference in decoded AndroidManifest.xml file, remove
the original/AndroidManifest.xml.
if there is no difference in AndroidManifest.xml but
original/AndroidManifest.xml differ, show "No file format specific differences
found inside, yet data differs" message (which shown by diffoscope in similar
scenarios [when tool failed to find differences])
2. it will be better to indicate the AndroidManifest.xml type, such as
for example:
show AndroidManifest.xml as "AndroidManifest.xml
(decoded)"
show original/AndroidManifest.xml as "AndroidManifest.xml
(original / undecoded)"
examples:
https://verification.f-droid.org/org.opengemara.shiurim_2.apk.diffoscope.html
https://verification.f-droid.org/org.systemcall.scores_2.apk.diffoscope.html
TXT result example:
├── AndroidManifest.xml
@@ -1,9 +1,9 @@
│ <?xml version="1.0" encoding="utf-8"?>
│ -<manifest android:versionCode="2" android:versionName="1.1"
package="org.systemcall.scores" platformBuildVersionCode="17"
platformBuildVersionName="4.2.2-576024"
│ +<manifest android:versionCode="2" android:versionName="1.1"
package="org.systemcall.scores" platformBuildVersionCode="17"
platformBuildVersionName="4.2.2-1425461"
├── original/AndroidManifest.xml
@@ -1,17 +1,17 @@
│ -00000000: 0300 0800 9808 0000 0100 1c00 9c04 0000 ................
│ +00000000: 0300 0800 9c08 0000 0100 1c00 a004 0000 ................
│ 00000010: 1f00 0000 0000 0000 0000 0000 9800 0000 ................
│ 00000020: 0000 0000 0000 0000 1a00 0000 3400 0000 ............4...
│ 00000030: 5200 0000 7600 0000 9000 0000 9c00 0000 R...v...........
│ 00000040: aa00 0000 b800 0000 c400 0000 d600 0000 ................
│ 00000050: 2e01 0000 3201 0000 4401 0000 7801 0000 ....2...D...x...
│ 00000060: ac01 0000 c001 0000 ee01 0000 f801 0000 ................
│ -00000070: 0002 0000 1c02 0000 3002 0000 4a02 0000 ........0...J...
│ -00000080: 5e02 0000 aa02 0000 c802 0000 d802 0000 ^...............
│ -00000090: 1003 0000 2403 0000 6803 0000 bc03 0000 ....$...h.......
│ +00000070: 0002 0000 1e02 0000 3202 0000 4c02 0000 ........2...L...
│ +00000080: 6002 0000 ac02 0000 ca02 0000 da02 0000 `...............
│ +00000090: 1203 0000 2603 0000 6a03 0000 be03 0000 ....&...j.......
│ 000000a0: 0b00 7600 6500 7200 7300 6900 6f00 6e00 ..v.e.r.s.i.o.n.
│ 000000b0: 4300 6f00 6400 6500 0000 0b00 7600 6500 C.o.d.e.....v.e.
│ 000000c0: 7200 7300 6900 6f00 6e00 4e00 6100 6d00 r.s.i.o.n.N.a.m.
│ 000000d0: 6500 0000 0d00 6d00 6900 6e00 5300 6400 e.....m.i.n.S.d.
│ 000000e0: 6b00 5600 6500 7200 7300 6900 6f00 6e00 k.V.e.r.s.i.o.n.
│ 000000f0: 0000 1000 7400 6100 7200 6700 6500 7400 ....t.a.r.g.e.t.
│ 00000100: 5300 6400 6b00 5600 6500 7200 7300 6900 S.d.k.V.e.r.s.i.
│ @@ -36,103 +36,103 @@
│ 00000230: 6c00 6400 5600 6500 7200 7300 6900 6f00 l.d.V.e.r.s.i.o.
│ 00000240: 6e00 4e00 6100 6d00 6500 0000 0800 6d00 n.N.a.m.e.....m.
│ 00000250: 6100 6e00 6900 6600 6500 7300 7400 0000 a.n.i.f.e.s.t...
│ 00000260: 1500 6f00 7200 6700 2e00 7300 7900 7300 ..o.r.g...s.y.s.
│ 00000270: 7400 6500 6d00 6300 6100 6c00 6c00 2e00 t.e.m.c.a.l.l...
│ 00000280: 7300 6300 6f00 7200 6500 7300 0000 0300 s.c.o.r.e.s.....
│ 00000290: 3100 2e00 3100 0000 0200 3100 3700 0000 1...1.....1.7...
│ -000002a0: 0c00 3400 2e00 3200 2e00 3200 2d00 3500 ..4...2...2.-.5.
│ -000002b0: 3700 3600 3000 3200 3400 0000 0800 7500 7.6.0.2.4.....u.
│ -000002c0: 7300 6500 7300 2d00 7300 6400 6b00 0000 s.e.s.-.s.d.k...
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 83
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 850...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Chris Lamb <la...@debian.org> (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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 18 Jun 2017 15:34:59 +0800
Source: diffoscope
Binary: diffoscope
Built-For-Profiles: nocheck
Architecture: source
Version: 83
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks
<reproducible-builds@lists.alioth.debian.org>
Changed-By: Chris Lamb <la...@debian.org>
Description:
diffoscope - in-depth comparison of files, archives, and directories
Closes: 780761 833697 850758 856446 856447 857610 857940 858223 858867 859034
859056 859117 861109 861286
Changes:
diffoscope (83) unstable; urgency=medium
.
[ Chris Lamb ]
* New features:
* Add comparator for Fontconfig cache files.
* Bug fixes:
- Don't fail when run under perversely recursive input files. See
<https://research.swtch.com/zip> for more information. (Closes: #780761)
- Prevent a traceback when using --new-file with containers by passing
progress_name of the Member and not the member itself. (Closes: #861286)
- Drop passing has_differences around, fixing an issue with generating
files called '-'.
* Cleanups & refactoring:
- Reorder and rename FIFOFeeder arguments to prevent tools incorrectly
parsing as a SyntaxError.
- Refactor HTML and text presenters so they fit the same interface.
- Refactor Presenter to a singleton manager.
- Split output and configuration of presenters.
- Prevent abstraction-level violation by defining visual diff support on
the Presenter classes.
- Split diffoscope.difference into a feeders module.
- Document various variables.
- PEP8-ify and tidy a lot of files.
.
[ Ximin Luo ]
* New features:
- Add --max-container-depth CLI option.
- Add various traverse_* methods to Difference.
- Weigh elements in progress bar by their size.
- Add a reader for the JSON format.
- Add a --exclude-command CLI for filtering out long-running commands like
"readelf --debug-dump=info".
- Don't show +/- controls for differences with no children.
- Use unicode chars for the +/- controls instead of punctuation.
* Bug fixes:
- Fix --exclude control.tar.gz.
- Make the progress bar play nicely with --debug.
- When enforcing max-container-depth, show which internal files differ,
without showing details.
- Fix JSON presenter to handle recursion properly.
- Avoid a ZeroDivisionError in the progress bar
- Fix create_limited_print_func.
* Tests:
- Fix failing tests due to logging global state.
- Add tips about running with TMPDIR=/run/shm.
* Cleanups & refactoring:
- Remove unnecessary "dest" args to argparse.
- Refactor DirectoryContainer to be more similar to Container.
- Refactor Container abstract method names.
- Remove unused imports and tidy up Container.comparisons().
- rename get_{filtered => adjusted}_members_sizes for consistency.
- Move tests/comparators/utils up one directory.
- html-dir: show/hide diff comments which can be very large.
- Refactor html-dir presenter to a class instance avoiding global state.
- Move side-by-side and linediff algorithms to difference.py.
- difference: has_children -> has_visible_children, and take into account
comments.
- Move ydiff/linediff from diffoscope.{difference => diff} to group
unified_diff-related things together
.
[ Maria Glukhova ]
* New features:
- Add visual comparisons for JPEG, ICO, PNG and static GIF images.
* Test improvements:
- Test that external tools providers are being returned when tool is not
found.
- Add tests for OutputParserError and ContainerExtractionError.
* Cleanups & refactoring:
* Ignore text difference if we have a visual one.
* Fix link formatting and typo in README.
* Rename html_output to compute_visual_diffs and explain its purpose.
* Removed duplicated functions from diff.py.
.
[ Mattia Rizzolo ]
* Export junit-xml style test report when building on Jenkins.
.
[ anthraxx ]
* Extend external Arch Linux tools list.
.
diffoscope (82) experimental; urgency=medium
.
[ Chris Lamb ]
* New features:
- Add support for comparing Pcap files. (Closes: #858867)
- Add support for .docx and .odt files via docx2txt & odt2txt.
(Closes: #859056)
- Add support for PGP files via pgpdump. (Closes: #859034)
- Add support for comparing Ogg Vorbis files.
* Bug fixes:
- Don't crash on invalid archives; print a useful error instead.
(Closes: #833697)
- Ensure tests and the runtime environment can locate binaries in
/usr/sbin (eg. tcpdump)
* Tests:
- Ensure that PATH is modified.
- Ensure @tool_required raises RequiredToolNotFound.
- Don't assume that /sbin/init exists; locate any /sbin binary manually and
then test for that. This should prevent FTBFS on travis-ci.org.
- Show packages installed in report output.
* Misc:
- comparators.bzip2: Don't print error output from bzip2 call.
- comparators.pcap: Show the delta, not the absolute time.
- Use /usr/share/dpkg/pkg-info.mk over manual calls to dpkg-parsechangelog
in debian/rules.
- Document PYTHONPATH usage when running tests in README.Source.
- Add internal documentation for @tool_required decorator.
.
[ b...@beuc.net ]
* Display differences in zip platform-specific timestamps. (Closes: #859117)
.
[ Ximin Luo ]
* Add support for R .rds and .rdb object files.
.
[ Vagrant Cascadian ]
* Add support for .dtb (device tree blob) files (Closes: #861109).
.
diffoscope (81) experimental; urgency=medium
.
[ Chris Lamb ]
* Correct meaningless "1234-content" metadata when introspecting files
within archives. This was a regression since #854723 due to the use of
auto-incrementing on-disk filenames. (Closes: #858223)
* Refactor get_compressed_content_name.
.
[ Ximin Luo ]
* Improve ISO9660/DOS/MBR check.
.
diffoscope (80) experimental; urgency=medium
.
* Ensure that we really are using ImageMagick and not, for example, the
GraphicsMagick compatibility layer installed by
graphicsmagick-imagemagick-compat. (Closes: #857940)
* Factor out the unicode decoding of the identify -version output.
* travis.yml: Don't build tags.
.
diffoscope (79) experimental; urgency=medium
.
[ Chris Lamb ]
* Extract SquashFS images in one go rather than per-file, speeding up (eg.)
Tails ISO comparison by ~10x.
* Support newer versions of cbfstool to avoid test failures.
(Closes: #856446)
* Skip icc test that varies on endian if the Debian-specific patch is not
present. (Closes: #856447)
* Compare GIF images using gifbuild. (Closes: #857610)
* Also interpret "DOS/MBR boot sector" files as ISO images as they may have
been processed by isohybrid.
* Progress bar:
- Hide bar if we are running with --debug mode.
- Update prior to working on an item so the displayed filename is correct.
.
[ Maria Glukhova ]
* Improve AndroidManifest.xml comparison for APK files.
- Indicate the AndroidManifest.xml type. (Closes: #850758)
Checksums-Sha1:
8ee2f30785e4c2eb1509acb9d682eb5ed00fb216 3217 diffoscope_83.dsc
35b07d8349c804bd8d5028eefc9ccfd17bfe0d0e 641012 diffoscope_83.tar.xz
8b811f4c2dbb8f9c4be03436326b503ad993d021 6370 diffoscope_83_amd64.buildinfo
Checksums-Sha256:
487d50c63ee1c67fb304b7244038b935ae756c231f649156a23dc730e8fd1673 3217
diffoscope_83.dsc
09fc25285eb9ad9ebe6dec80b11c2b3f8c5b7250b3e047be6fefbf0f9149308f 641012
diffoscope_83.tar.xz
58e3e6df90a0b306f0bb0a419133dd8527ffd7119817a27702bbf87ebaa8c456 6370
diffoscope_83_amd64.buildinfo
Files:
2f3c4b9bc0f16ea6ac6257ec0283b382 3217 devel optional diffoscope_83.dsc
dffd5533f8b0bfaf5a5ef59c6ff90f21 641012 devel optional diffoscope_83.tar.xz
e5852580906da10eb8028c6f4af2c19c 6370 devel optional
diffoscope_83_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAllGNGIACgkQHpU+J9Qx
HliPlA//bthdQrAQR8qfpuJCGj4wNS4j8V4b+ZgyCVLzHtBYmgiPjE69W6CTZZNf
pkZlLTtEkbnlbTL39bgKcNp3PAu8+4pWLj7blG2p/XxCnDrNPQvS0GN5zSI+hy+X
7I51641tjTzJQvYXFk7ZfSBAkwbNrsRm87WZySCOhU+TBSBYASBKpqHRqTpB3Csi
bVIW7z0Yli43h5+Ge9lpazp42ZXffBwt4rDhJHt/tKfoXhh2AXRL5Rer93Pih/Ah
akX/yL9LY691nfxNsv04kBNl4bBGBSKQDzsYuF71GO824R61XmsancMGlUT6QByP
czjILbdzbecFC6N3kikVXciwxPhXdAC3uRzGPIAAG+7Acqee7I270KR2nOxVZIoy
uVPPasXs4nK2pR50E9eHXh8P+TZxHHjTpVaYLh8aJwTBdpoGF/DUB1fmMkpZBvBD
5y7WxQlV2a/ZvwF4Hxt2nu5lJjvfb4zZH/2O07pVGnhPi/gmtAxGw8wLWKMaV6NJ
Ov1CtUMYp6nICWFMqumrDLHcZkp5rGlF2DVQy8l+o8A37gkioGQiwseIH5c/rt35
FVNXLkLwj2HfGC8PdVj8R9ZknVv20Tbhmd58pXshcPnSLetEM8pQbXDeiQHz7iEs
jU02FT9ac/EUHGAeKKoolo82/M4SYSV4H5xRaLHj6QMjuLfvXpU=
=2QRm
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
