Debian Bug report logs -
#833697
diffoscope: libarchive.exception.ArchiveError when running on two dmg files
Reported by: David Fifield <david@bamsoftware.com>
Date: Sun, 7 Aug 2016 23:21:07 UTC
Severity: normal
Found in version diffoscope/56
Fixed in versions diffoscope/82, diffoscope/83
Done: Chris Lamb <lamby@debian.org>
Bug is archived. No further changes may be made.
Toggle useless messages
Report forwarded
to debian-bugs-dist@lists.debian.org, david@bamsoftware.com, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Sun, 07 Aug 2016 23:21:11 GMT) (full text, mbox, link).
Acknowledgement sent
to David Fifield <david@bamsoftware.com>:
New Bug report received and forwarded. Copy sent to david@bamsoftware.com, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Sun, 07 Aug 2016 23:21:12 GMT) (full text, mbox, link).
Message #5 received at submit@bugs.debian.org (full text, mbox, reply):
Package: diffoscope
Version: 56
Severity: normal
I get a crash when running diffoscope on these two dmg files. They are just byproducts of a development process. The two files are here (about 65 MB each):
https://people.torproject.org/~dcf/pt-bundle/snowflake/20160806-6.5a1-965e0daa7d59/TorBrowser-6.5a1-osx64_en-US.dmg
https://people.torproject.org/~dcf/pt-bundle/snowflake/20160806-6.5a1-965e0daa7d59-2/TorBrowser-6.5a1-osx64_en-US.dmg
Here are their sha256sums:
e67dc5230d66502725a77fde910ec163a0172f893bc06f378e94eb31f755d1b4 20160806-6.5a1-965e0daa7d59/TorBrowser-6.5a1-osx64_en-US.dmg
3c182dc03de369b99c60acbd553f4a3e01b07640302a36f2562cc6b491437284 20160806-6.5a1-965e0daa7d59-2/TorBrowser-6.5a1-osx64_en-US.dmg
This is the crash:
$ diffoscope 20160806-6.5a1-965e0daa7d59/TorBrowser-6.5a1-osx64_en-US.dmg 20160806-6.5a1-965e0daa7d59-2/TorBrowser-6.5a1-osx64_en-US.dmg
bzip2: 20160806-6.5a1-965e0daa7d59/TorBrowser-6.5a1-osx64_en-US.dmg: trailing garbage after EOF ignored
bzip2: 20160806-6.5a1-965e0daa7d59-2/TorBrowser-6.5a1-osx64_en-US.dmg: trailing garbage after EOF ignored
Traceback (most recent call last):
File "/usr/lib/python3/dist-packages/diffoscope/__main__.py", line 199, in main
sys.exit(run_diffoscope(parsed_args))
File "/usr/lib/python3/dist-packages/diffoscope/__main__.py", line 170, in run_diffoscope
parsed_args.path1, parsed_args.path2)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/__init__.py", line 99, in compare_root_paths
return compare_files(file1, file2)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/__init__.py", line 115, in compare_files
return file1.compare(file2, source)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/binary.py", line 210, in compare
difference = self._compare_using_details(other, source)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/binary.py", line 180, in _compare_using_details
details.extend(filter(None, self.as_container.compare(other.as_container)))
File "/usr/lib/python3/dist-packages/diffoscope/comparators/__init__.py", line 118, in compare_commented_files
difference = compare_files(file1, file2, source=source)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/__init__.py", line 115, in compare_files
return file1.compare(file2, source)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/binary.py", line 210, in compare
difference = self._compare_using_details(other, source)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/binary.py", line 180, in _compare_using_details
details.extend(filter(None, self.as_container.compare(other.as_container)))
File "/usr/lib/python3/dist-packages/diffoscope/comparators/__init__.py", line 118, in compare_commented_files
difference = compare_files(file1, file2, source=source)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/__init__.py", line 104, in compare_files
if file1.has_same_content_as(file2):
File "/usr/lib/python3/dist-packages/diffoscope/__init__.py", line 162, in tool_check
return original_function(*args, **kwargs)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/binary.py", line 192, in has_same_content_as
my_size = os.path.getsize(self.path)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/utils.py", line 242, in path
self._path = self.container.extract(self._name, self._temp_dir.name)
File "/usr/lib/python3/dist-packages/diffoscope/comparators/libarchive.py", line 180, in extract
for buf in entry.get_blocks():
File "/usr/lib/python3/dist-packages/libarchive/entry.py", line 41, in get_blocks
r = read(archive_p, buf, block_size)
File "/usr/lib/python3/dist-packages/libarchive/ffi.py", line 85, in check_int
raise archive_error(args[0], retcode)
File "/usr/lib/python3/dist-packages/libarchive/ffi.py", line 69, in archive_error
raise ArchiveError(msg, errno(archive_p), retcode, archive_p)
libarchive.exception.ArchiveError: Truncated input file (errno=-1, retcode=-30, archive_p=23628240)
The first time I ran diffoscope, I did not have genisoimage installed. There was no crash then, but the output was just a diff of disk images and recommended to install genisoimage. After installing genisoimage, I got the output above.
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (600, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 4.6.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
Versions of packages diffoscope depends on:
ii python3-libarchive-c 2.1-3
ii python3-magic 1:5.28-4
ii python3-pkg-resources 20.10.1-1.1
pn python3:any <none>
Versions of packages diffoscope recommends:
ii acl 2.2.52-3
pn binutils-multiarch <none>
ii bzip2 1.0.6-8
pn caca-utils <none>
pn colord <none>
ii cpio 2.11+dfsg-5
pn default-jdk | java-sdk <none>
pn enjarify <none>
pn fontforge-extras <none>
pn fp-utils <none>
ii genisoimage 9:1.1.11-3
ii gettext 0.19.8.1-1
ii ghc 7.10.3-9
ii ghostscript 9.19~dfsg-1+b1
ii gnupg 1.4.20-6
pn mono-utils <none>
pn pdftk <none>
ii poppler-utils 0.44.0-3
pn python3-argcomplete <none>
pn python3-debian <none>
pn python3-guestfs <none>
pn python3-rpm <none>
pn python3-tlsh <none>
pn rpm2cpio <none>
pn sng <none>
pn sqlite3 <none>
pn squashfs-tools <none>
ii unzip 6.0-20
ii vim-common 2:7.4.1829-1
ii xz-utils 5.1.1alpha+20120614-2.1
Versions of packages diffoscope suggests:
ii libjs-jquery 1.12.4-1
-- no debconf information
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Mon, 08 Aug 2016 09:51:04 GMT) (full text, mbox, link).
Acknowledgement sent
to Chris Lamb <lamby@debian.org>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Mon, 08 Aug 2016 09:51:04 GMT) (full text, mbox, link).
Message #10 received at 833697@bugs.debian.org (full text, mbox, reply):
Hi,
> diffoscope: libarchive.exception.ArchiveError when running on two dmg files
ACK.
Wider question: what's the general diffoscope policy on what to do when the
files are invalid? It seems somewhat cumbersome to do in the code, so I am
inferring that we just blow up in lots of cases we shouldn't, particularly
when using Python module-based tools (vs. external commands).
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org / chris-lamb.co.uk
`-
Message sent on
to David Fifield <david@bamsoftware.com>:
Bug#833697.
(Mon, 08 Aug 2016 09:51:07 GMT) (full text, mbox, link).
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Mon, 08 Aug 2016 10:21:09 GMT) (full text, mbox, link).
Message #16 received at 833697@bugs.debian.org (full text, mbox, reply):
[Message part 1 (text/plain, inline)]
On Mon, Aug 08, 2016 at 11:50:26AM +0200, Chris Lamb wrote:
> Wider question: what's the general diffoscope policy on what to do when the
> files are invalid?
I don't this something like that was ever properly defined.
> It seems somewhat cumbersome to do in the code, so I am
> inferring that we just blow up in lots of cases we shouldn't, particularly
> when using Python module-based tools (vs. external commands).
istr in some cases it prints the error and return false (so that a
"lower level" comparator can do the comparison (even if a less useful
one). I think such behaviour would be perfect.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
[signature.asc (application/pgp-signature, inline)]
Message sent on
to David Fifield <david@bamsoftware.com>:
Bug#833697.
(Mon, 08 Aug 2016 10:21:19 GMT) (full text, mbox, link).
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Mon, 08 Aug 2016 10:27:11 GMT) (full text, mbox, link).
Acknowledgement sent
to Chris Lamb <lamby@debian.org>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Mon, 08 Aug 2016 10:27:11 GMT) (full text, mbox, link).
Message #24 received at 833697@bugs.debian.org (full text, mbox, reply):
> > It seems somewhat cumbersome to do in the code
>
> istr in some cases it prints the error and return false (so that a
> "lower level" comparator can do the comparison
This is, alas, done inconsistently. Some do it in ``recognizes` (returning
False) and some do it in ``compare_details`` but returning ``[]``
However, most appear to not catch useful errors. :) I will look into
this and come up with something cleaner.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org / chris-lamb.co.uk
`-
Message sent on
to David Fifield <david@bamsoftware.com>:
Bug#833697.
(Mon, 08 Aug 2016 10:27:32 GMT) (full text, mbox, link).
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Tue, 30 Aug 2016 01:18:05 GMT) (full text, mbox, link).
Acknowledgement sent
to David Fifield <david@bamsoftware.com>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Tue, 30 Aug 2016 01:18:05 GMT) (full text, mbox, link).
Message #32 received at 833697@bugs.debian.org (full text, mbox, reply):
It seems that the error lies in the handling of the dmg layer. If I
manually extract the dmg files using 7z from the p7zip-full package,
then diffoscope doesn't crash. I.e.,
mkdir -p 20160806-6.5a1-965e0daa7d59{,-2}/m
7z x 20160806-6.5a1-965e0daa7d59/TorBrowser-6.5a1-osx64_en-US.dmg -o20160806-6.5a1-965e0daa7d59/m
7z x 20160806-6.5a1-965e0daa7d59-2/TorBrowser-6.5a1-osx64_en-US.dmg -o20160806-6.5a1-965e0daa7d59-2/m
diffoscope --text diff.txt 20160806-6.5a1-965e0daa7d59{,-2}/m
diffoscope seems to treat the dmg file as a bzip2-compressed iso9660
filesystem image, when it is something more than that. Here is how the
dmg file is being created. I don't know exactly what the libdmg-hfsplus
command is doing.
https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/build-helpers/ddmg.sh?id=ce368417b914f74383bafddd268b2f1a2e9dc509
...
genisoimage -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode $EXE_MODE -new-dir-mode $EXE_MODE
cd ~/build
~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE
Information stored
:
Bug#833697; Package diffoscope.
(Tue, 30 Aug 2016 01:18:14 GMT) (full text, mbox, link).
Acknowledgement sent
to David Fifield <david@bamsoftware.com>:
Extra info received and filed, but not forwarded.
(Tue, 30 Aug 2016 01:18:14 GMT) (full text, mbox, link).
Message sent on
to David Fifield <david@bamsoftware.com>:
Bug#833697.
(Tue, 30 Aug 2016 01:18:17 GMT) (full text, mbox, link).
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Thu, 13 Apr 2017 07:21:05 GMT) (full text, mbox, link).
Acknowledgement sent
to Chris Lamb <lamby@debian.org>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Thu, 13 Apr 2017 07:21:05 GMT) (full text, mbox, link).
Message #45 received at 833697@bugs.debian.org (full text, mbox, reply):
Hi David,
> diffoscope: libarchive.exception.ArchiveError when running on two dmg files
Just looking into this. The original .dmg files now 404; could you upload
some new ones? :)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org / chris-lamb.co.uk
`-
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Thu, 13 Apr 2017 16:57:03 GMT) (full text, mbox, link).
Acknowledgement sent
to David Fifield <david@bamsoftware.com>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Thu, 13 Apr 2017 16:57:03 GMT) (full text, mbox, link).
Message #50 received at 833697@bugs.debian.org (full text, mbox, reply):
On Thu, Apr 13, 2017 at 08:17:00AM +0100, Chris Lamb wrote:
> Hi David,
>
> > diffoscope: libarchive.exception.ArchiveError when running on two dmg files
>
> Just looking into this. The original .dmg files now 404; could you upload
> some new ones? :)
I've just put the files back in place.
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Fri, 14 Apr 2017 22:03:03 GMT) (full text, mbox, link).
Acknowledgement sent
to Chris Lamb <lamby@debian.org>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Fri, 14 Apr 2017 22:03:03 GMT) (full text, mbox, link).
Message #55 received at 833697@bugs.debian.org (full text, mbox, reply):
tags 833697 + pending
thanks
Should be fixed in Git :)
https://anonscm.debian.org/git/reproducible/diffoscope.git/commit/?id=82fbe27785f08d3623073eb98a3a4670b02fd2dc
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org / chris-lamb.co.uk
`-
Added tag(s) pending.
Request was from Chris Lamb <lamby@debian.org>
to control@bugs.debian.org.
(Fri, 14 Apr 2017 22:03:05 GMT) (full text, mbox, link).
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Sat, 15 Apr 2017 17:57:02 GMT) (full text, mbox, link).
Acknowledgement sent
to David Fifield <david@bamsoftware.com>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Sat, 15 Apr 2017 17:57:02 GMT) (full text, mbox, link).
Message #62 received at 833697@bugs.debian.org (full text, mbox, reply):
On Fri, Apr 14, 2017 at 11:00:50PM +0100, Chris Lamb wrote:
> tags 833697 + pending
> thanks
>
> Should be fixed in Git :)
>
> https://anonscm.debian.org/git/reproducible/diffoscope.git/commit/?id=82fbe27785f08d3623073eb98a3a4670b02fd2dc
I confirm that using 82fbe27785f08d3623073eb98a3a4670b02fd2dc,
diffoscope no longer crashes and instead produces the output:
--- TorBrowser-6.5a1-osx64_en-US.dmg
+++ TorBrowser-6.5a1-osx64_en-US.dmg.1
│ --- TorBrowser-6.5a1-osx64_en-US.dmg-content
├── +++ TorBrowser-6.5a1-osx64_en-US.dmg.1-content
│┄ Error extracting 'TorBrowser.app/Contents/Resources/omni.ja', falling back to binary comparison ('Truncated input file (errno=-1, retcode=-30, archive_p=94687314358976)')
│ <extensive hexdump diff>
It is surprising to me that the error message refers to
TorBrowser.app/Contents/Resources/omni.ja (which is a zip file), because
there's no error if I extract the dmg files with 7z and run diffoscope
on the directories directly. I thought in Message #32, that the error
was because of the dmg layer, not because of an individual zip file, but
now I'm not so sure.
I tested on a few other pairs of dmg files:
https://get.videolan.org/vlc/2.2.3/macosx/vlc-2.2.3.dmg
https://get.videolan.org/vlc/2.2.4/macosx/vlc-2.2.4.dmg
https://download-installer.cdn.mozilla.net/pub/firefox/releases/52.0.2/mac/en-US/Firefox%2052.0.1.dmg
https://download-installer.cdn.mozilla.net/pub/firefox/releases/52.0.2/mac/en-US/Firefox%2052.0.2.dmg
They didn't result in any errors in the text output, though the Firefox
one wrote to stderr:
bzip2: Firefox 52.0.1.dmg: trailing garbage after EOF ignored
bzip2: Firefox 52.0.2.dmg: trailing garbage after EOF ignored
In all these cases, diffoscope showed a diff of hexdumps of the bzip2
decompression of the dmg files (not the diffs of the files inside the
ISO image).
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Sat, 15 Apr 2017 19:24:03 GMT) (full text, mbox, link).
Acknowledgement sent
to Chris Lamb <lamby@debian.org>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Sat, 15 Apr 2017 19:24:03 GMT) (full text, mbox, link).
Message #67 received at 833697@bugs.debian.org (full text, mbox, reply):
David Fifield wrote:
> It is surprising to me that the error message refers to
> TorBrowser.app/Contents/Resources/omni.ja
That was the filename diffoscope was attempting to extract at the time of
the error.
> bzip2: Firefox 52.0.1.dmg: trailing garbage after EOF ignored
> bzip2: Firefox 52.0.2.dmg: trailing garbage after EOF ignored
Hm, that should already be fixed with 21180c4b9f06ae967a77bee82df306058790fd98.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org / chris-lamb.co.uk
`-
Information forwarded
to debian-bugs-dist@lists.debian.org, Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>:
Bug#833697; Package diffoscope.
(Sat, 15 Apr 2017 20:18:02 GMT) (full text, mbox, link).
Acknowledgement sent
to David Fifield <david@bamsoftware.com>:
Extra info received and forwarded to list. Copy sent to Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>.
(Sat, 15 Apr 2017 20:18:02 GMT) (full text, mbox, link).
Message #72 received at 833697@bugs.debian.org (full text, mbox, reply):
On Sat, Apr 15, 2017 at 08:20:56PM +0100, Chris Lamb wrote:
> > bzip2: Firefox 52.0.1.dmg: trailing garbage after EOF ignored
> > bzip2: Firefox 52.0.2.dmg: trailing garbage after EOF ignored
>
> Hm, that should already be fixed with 21180c4b9f06ae967a77bee82df306058790fd98.
You're right. That was my mistake. I was running out of the git working
directory as
~/diffoscope/bin/diffoscope --text Firefox.txt Firefox\ 52.0.*.dmg
The error messages stopped appearing after I actually installed the deb:
debuild -i -uc -us -b
sudo dpkg -i ../diffoscope_81_all.deb
Reply sent
to Chris Lamb <lamby@debian.org>:
You have taken responsibility.
(Wed, 26 Apr 2017 15:09:05 GMT) (full text, mbox, link).
Notification sent
to David Fifield <david@bamsoftware.com>:
Bug acknowledged by developer.
(Wed, 26 Apr 2017 15:09:05 GMT) (full text, mbox, link).
Message #77 received at 833697-close@bugs.debian.org (full text, mbox, reply):
Source: diffoscope
Source-Version: 82
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 833697@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Chris Lamb <lamby@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 ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 26 Apr 2017 16:17:57 +0200
Source: diffoscope
Binary: diffoscope
Architecture: source
Version: 82
Distribution: experimental
Urgency: medium
Maintainer: Reproducible builds folks <reproducible-builds@lists.alioth.debian.org>
Changed-By: Chris Lamb <lamby@debian.org>
Description:
diffoscope - in-depth comparison of files, archives, and directories
Closes: 833697 858867 859034 859056 859117 861109
Changes:
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.
.
[ beuc@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).
Checksums-Sha1:
f2b2909e530c15bf6c4ba38362d59603e582f6d2 3217 diffoscope_82.dsc
6256685ec889184164c417d7ac6338658c3faa16 626408 diffoscope_82.tar.xz
24fc7c18966417d354b1bc25b44b1bd6a7563d0f 17976 diffoscope_82_amd64.buildinfo
Checksums-Sha256:
0a070d727403446ee39ff1bba30bcf1fe59469392f8aaf77aacba0a20124a0f8 3217 diffoscope_82.dsc
9335692349da6420756664e91a0b4e1a56feb589f6aff221361535c17de1b357 626408 diffoscope_82.tar.xz
917a2dbcc0c4c334507d5298fc0e8578ebc58401226532e9a75a3e31bdfbb473 17976 diffoscope_82_amd64.buildinfo
Files:
b4680b5bdc09061989597eb0eb1b589f 3217 devel optional diffoscope_82.dsc
97e93d7b5df60a40208ed7a9f59e4cea 626408 devel optional diffoscope_82.tar.xz
63363901480cde3eba47b5a77249e2b6 17976 devel optional diffoscope_82_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAlkArp0ACgkQHpU+J9Qx
HlhIJg/+KkTS698+j6G6ifwiSMCHheBYnFmNKr6xfuMu23Q/R+3Lr5PbJLQGGMTl
FyBW+VDzTZY8aDDr8jRVah+1yF3BMHfrkCpmiO3yHkQQs8S6hD1DjdmNmmayR5vI
n+Zj8MJfV5gLtuZwEdRezqRr9S2PgfiDZ3ChcKLX5ByVeAVARfvJVLBgQtUj4nly
7ONtYDueg21qERh0H3CDF/fbN+NqAFiJrdLCU7mVCOj0J/FaMGdEgFAVK9aJzz0Q
i0FLkPU2iQmta/Hh/od5jQYPIHrnWTIQ+MGZgdTJGIFtHp3mNvLcjiFokrQzV02j
FDXP5L1imCA6GEf4XKByPc4yMHteaOp3ZtqUaMpyT2uaHR3l2uKaojR8zhjqPiyE
sZbt7qqvUSXh0yz5yrzCda+RpzMaMYAEJlOOSPMVuACgJpVeM5WI5Yg8VfQH/F6o
WU91csCqHvtZjkR5G2FSaGGYrODsAb+OvkHbfEsyDwJIiTJA5YicYA0c5ybBfJDO
hZdT+XEsFfQeXSW68UNLDCTPonIN36dJKURtfQCyXqGs1lFS+1y25auyNdymaMTB
9+Podwg+unj5wvYJxn6fsR/wzc2jtq3y0dmR5NRUQ9nYIppGkDbEugOuuytsVMxK
DiJ5Fb5UUBi6pcG7CfSIelzh7ef5MdEglfP7SUtUS/FebHxdu2s=
=oZgw
-----END PGP SIGNATURE-----
Reply sent
to Chris Lamb <lamby@debian.org>:
You have taken responsibility.
(Sun, 18 Jun 2017 09:09:05 GMT) (full text, mbox, link).
Notification sent
to David Fifield <david@bamsoftware.com>:
Bug acknowledged by developer.
(Sun, 18 Jun 2017 09:09:05 GMT) (full text, mbox, link).
Message #82 received at 833697-close@bugs.debian.org (full text, mbox, reply):
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 833697@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Chris Lamb <lamby@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 ftpmaster@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 <lamby@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.
.
[ beuc@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-----
Bug archived.
Request was from Debbugs Internal Request <owner@bugs.debian.org>
to internal_control@bugs.debian.org.
(Mon, 17 Jul 2017 07:36:00 GMT) (full text, mbox, link).
Send a report that this bug log contains spam.
Debian bug tracking system administrator <owner@bugs.debian.org>.
Last modified:
Wed May 17 13:51:41 2023;
Machine Name:
buxtehude
Debian Bug tracking system
Debbugs is free software and licensed under the terms of the GNU
Public License version 2. The current version can be obtained
from https://bugs.debian.org/debbugs-source/.
Copyright © 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson,
2005-2017 Don Armstrong, and many other contributors.