Bug#893702: Please stop build-depending on pdftk

2018-03-22 Thread Matthias Klose 
On 23.03.2018 00:08, Chris Lamb wrote:
> tags 893702 - patch
> thanks
> 
> Hi Matthias,
> 
>> pdftk still still depends on GCJ, and is likely to be removed when gcj is
>> removed. Please stop build-depending on pdftk.
> 
> We build-depend on pdftk because we actually use it to compare files,
> so unfortunately simply dropping it from the Build-Depends is not a
> sufficient patch.

Another package suggested pyPDF as an alternative. I didn't look if that's
feasable for diffoscope as well. There's also a pdftk port to OpenJDK mentioned
in one of the pdftk bugs, but that doesn't yet look very mature.

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#884095: flag to force file types

2018-03-22 Thread Hans-Christoph Steiner 

Chris Lamb:
> Hi Hans,
> 
>> It would be literally impossible to auto-detect since a Janus APK is
>> both a valid DEX file (starting with the bytes "dex") and […]
> 
> Oh dear, I got a little lost in the weeds of Janus/APK/ZIP here..
> 
> Could you excuse my pedanticness and ask for direct links to files,
> what you are seeing and what you are expecting?  That would immediately
> clarify a few questions and avoid a lengthy back-and-forth :)
> 
> 
> Best wishes,

https://www.androidpolice.com/wp-content/uploads/janus-poc/HelloWorld-Janus.apk

Or create your own:
https://github.com/odensc/janus

.hc

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#893702: Please stop build-depending on pdftk

2018-03-22 Thread Vagrant Cascadian 
Control: affects 892539 diffoscope

On 2018-03-21, Matthias Klose wrote:
> pdftk still still depends on GCJ, and is likely to be removed when gcj is
> removed. Please stop build-depending on pdftk.

FWIW, there's a reference to a fork of pdftk that doesn't require gcj:

  https://bugs.debian.org/892539


live well,
  vagrant


signature.asc
Description: PGP signature
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#893037: Add support for diffing docker-format containers

2018-03-22 Thread Juliana Oliveira 
Hi Jonathan and Lamby,

AFAIK, docker /images/ can be exported to tarballs. Not sure how human
readable they are, but diffoscope can definitely work. (:

On Thu, 15 Mar 2018 22:52:40 + Chris Lamb  wrote:
> tags 893037 + moreinfo
> thanks
>
> Hi Jonathan,
>
> Thank you very much for the idea and wishlist bug.
>
> > It would be nice if diffoscope could diff against docker containers
available
> > on the local system.
>
> Could you briefly elaborate on what you mean here? I have a bunch of
> directories under /var/lib/docker/containers -- are you wanting to
> diffoscope two of these, or...? diffoscope basically works on "paths",
> you see.
>
>
> Best wishes,
>
> --
> ,''`.
> : :' : Chris Lamb
> `. `'` la...@debian.org / chris-lamb.co.uk
> `-
>
>

-- 

Juliana

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#893702: Please stop build-depending on pdftk

2018-03-22 Thread Holger Levsen 
control: severity -1 important
thanks

On Wed, Mar 21, 2018 at 08:38:31PM +0800, Matthias Klose wrote:
> pdftk still still depends on GCJ, and is likely to be removed when gcj is
> removed. Please stop build-depending on pdftk.

thanks for warning us, Matthias! I'm lowering the severity until gcj has
been removed.


-- 
cheers,
Holger


signature.asc
Description: PGP signature
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Processed: Re: Bug#893702: Please stop build-depending on pdftk

2018-03-22 Thread Debian Bug Tracking System 
Processing control commands:

> severity -1 important
Bug #893702 [src:diffoscope] Please stop build-depending on pdftk
Severity set to 'important' from 'serious'

-- 
893702: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893702
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Processed: Re: Bug#893702: Please stop build-depending on pdftk

2018-03-22 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> tags 893702 - patch
Bug #893702 [src:diffoscope] Please stop build-depending on pdftk
Removed tag(s) patch.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
893702: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893702
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#893702: Please stop build-depending on pdftk

2018-03-22 Thread Chris Lamb 
tags 893702 - patch
thanks

Hi Matthias,

> pdftk still still depends on GCJ, and is likely to be removed when gcj is
> removed. Please stop build-depending on pdftk.

We build-depend on pdftk because we actually use it to compare files,
so unfortunately simply dropping it from the Build-Depends is not a
sufficient patch.

It's in Build-Depends for the testsuite run; it's also in Recommends.
ACK the underlying issue regarding it's removal, naturally. What is
the timeline on this, out of interest?


Best wishes,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#884095: flag to force file types

2018-03-22 Thread Chris Lamb 
Hi Hans,

> It would be literally impossible to auto-detect since a Janus APK is
> both a valid DEX file (starting with the bytes "dex") and […]

Oh dear, I got a little lost in the weeds of Janus/APK/ZIP here..

Could you excuse my pedanticness and ask for direct links to files,
what you are seeing and what you are expecting?  That would immediately
clarify a few questions and avoid a lengthy back-and-forth :)


Best wishes,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#893802: marked as done (diffoscope: missing Depends: python3-distutils)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:15:26 +
with message-id 
<1521731726.2099249.1312414904.6111e...@webmail.messagingengine.com>
and subject line Re: Bug#893802: diffoscope: missing Depends: python3-distutils
has caused the Debian Bug report #893802,
regarding diffoscope: missing Depends: python3-distutils
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.)


-- 
893802: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893802
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 91
Severity: serious
User: helm...@debian.org
Usertags: rebootstrap

In a fresh sid debootstrap, after apt-get install
--no-install-recommends diffoscope, you get:

$ diffoscope --help
Traceback (most recent call last):
  File "/usr/bin/diffoscope", line 33, in 
from diffoscope.main import main
  File "/usr/lib/python3/dist-packages/diffoscope/main.py", line 32, in 
from .tools import tool_prepend_prefix, tool_required, OS_NAMES, 
get_current_os
  File "/usr/lib/python3/dist-packages/diffoscope/tools.py", line 29, in 

from distutils.spawn import find_executable
ModuleNotFoundError: No module named 'distutils'
$

This is due to python3.6/3.6.5~rc1-2 having dropped its dependency on
python3-distutils. I guess we need to add disutils to install_requires
in setup.py to fix this issue.

Helmut
--- End Message ---
--- Begin Message ---
Version: 92

> In a fresh sid debootstrap, after apt-get install
> --no-install-recommends diffoscope, you get:

This was fixed yesterday in Git and uploaded *just* before
your bug was filed as 92!

  
https://anonscm.debian.org/git/reproducible/diffoscope.git/commit/?id=6131e2fc50db17135b0161c3ba87f4c55049bd61

Thanks!


Best wishes,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   ` End Message ---
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#893324: marked as done (diffoscope: terminology used in docs about exclusion options)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#893324: fixed in diffoscope 92
has caused the Debian Bug report #893324,
regarding diffoscope: terminology used in docs about exclusion options
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.)


-- 
893324: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893324
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 91
Severity: wishlist

When I am sponsoring packages I sometimes use diffoscope to compare
source packages. Often a lot of timestamps have changed but I don't
really care about timestamp changes when sponsoring packages, so it
would be nice to have a way to ignore the modification timestamp.
Here is an example of what I am seeing:

│ │ │   --- streamlink-0.10.0+dfsg/debian/source/format
│ │ ├── +++ streamlink-0.11.0+dfsg/debian/source/format
│ │ │ ├── stat {}
│ │ │ │ @@ -1,8 +1,8 @@
│ │ │ │  
│ │ │ │Size: 12 Blocks: 8  IO Block: 4096   regular file
│ │ │ │  Links: 1
│ │ │ │  Access: (0640/-rw-r-)  Uid: ( 1000/pabs)   Gid: ( 1000/
pabs)
│ │ │ │  
│ │ │ │ -Modify: 2018-01-23 22:55:45.0 +
│ │ │ │ +Modify: 2018-03-08 23:12:49.0 +
│ │ │ │  
│ │ │ │   Birth: -

-- System Information:
Debian Release: buster/sid
  APT prefers testing-debug
  APT policy: (900, 'testing-debug'), (900, 'testing'), (800, 
'unstable-debug'), (800, 'unstable'), (790, 'buildd-unstable'), (700, 
'experimental-debug'), (700, 'experimental'), (690, 'buildd-experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.14.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8), 
LANGUAGE=en_AU.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages diffoscope depends on:
ii  python33.6.4-1
ii  python3-distro 1.0.1-2
ii  python3-libarchive-c   2.1-3.1
ii  python3-magic  2:0.4.15-1
ii  python3-pkg-resources  38.4.0-1

Versions of packages diffoscope recommends:
ii  abootimg 0.6-1+b2
ii  acl  2.2.52-3+b1
ii  apktool  2.3.1+dfsg-1
ii  binutils-multiarch   2.30-7
ii  bzip21.0.6-8.1
ii  caca-utils   0.99.beta19-2+b2
ii  colord   1.3.3-2
ii  db-util  5.3.1
ii  default-jdk [java-sdk]   2:1.8-59
ii  default-jdk-headless 2:1.8-59
pn  device-tree-compiler 
pn  docx2txt 
ii  e2fsprogs1.43.9-2
ii  enjarify 1:1.0.3-3
ii  fontforge-extras 0.3-4
pn  fp-utils 
ii  genisoimage  9:1.1.11-3+b2
ii  gettext  0.19.8.1-4
ii  ghc  8.0.2-11
ii  ghostscript  9.22~dfsg-2
ii  giflib-tools 5.1.4-2
ii  gnupg2.2.5-1
ii  imagemagick  8:6.9.9.34+dfsg-3
ii  imagemagick-6.q16 [imagemagick]  8:6.9.9.34+dfsg-3
ii  jsbeautifier 1.6.4-6
pn  libarchive-tools 
ii  llvm 1:4.0-40
pn  mono-utils   
pn  odt2txt  
pn  oggvideotools
ii  openjdk-8-jdk [java-sdk] 8u151-b12-1
ii  openssh-client   1:7.6p1-4
ii  pdftk2.02-4+b2
ii  pgpdump  0.31-0.2
ii  poppler-utils0.61.1-2
pn  procyon-decompiler   
ii  python3-argcomplete  1.8.1-1
ii  python3-binwalk  2.1.1-16
ii  python3-debian   0.1.32
pn  python3-defusedxml   
pn  python3-guestfs  
ii  python3-jsondiff 1.1.1-1
ii  python3-progressbar  2.3-4
ii  python3-pyxattr  0.6.0-2+b1
ii  python3-rpm  4.14.0+dfsg1-2
ii  python3-tlsh 3.4.4+20151206-1+b3
pn  r-base-core  
ii  rpm2cpio 4.14.0+dfsg1-2
ii  sng  1.1.0-1+b1
ii  sqlite3  3.22.0-1
ii  squashfs-tools   1:4.3-4
ii  tcpdump  4.9.2-2
ii  unzip6.0-21
ii  vim-common   2:8.0.1453-1
pn  xmlutils

Bug#893443: marked as done (diffoscope: please make it easier to see supported file formats)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#893443: fixed in diffoscope 92
has caused the Debian Bug report #893443,
regarding diffoscope: please make it easier to see supported file formats
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.)


-- 
893443: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893443
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 91
Severity: wishlist
X-Debbugs-CC: Jonathan Dowland 

Hi,

  < Jon> lamby, https://diffoscope.org/ should link to or provide (more
 easily) a list of supported archive types

Great idea. :)


Best wishes,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 92

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 893...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Chris Lamb  (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: Thu, 22 Mar 2018 10:28:44 -0400
Source: diffoscope
Binary: diffoscope
Built-For-Profiles: nocheck
Architecture: source all
Version: 92
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks 

Changed-By: Chris Lamb 
Description:
 diffoscope - in-depth comparison of files, archives, and directories
Closes: 890904 891363 891903 892240 893183 893311 893324 893443
Changes:
 diffoscope (92) unstable; urgency=medium
 .
   [ Chris Lamb ]
 .
   * New features:
 - Show the list of supported file types in the manual and --help output. We
   can copy-paste this into the website, etc.. Thanks to Jonathan Dowland
   for the suggestion. (Closes: #893443)
 - Add support for comparing Gnumeric spreadsheets. (Closes: #893311)
 .
   * Bug fixes:
 - Additionally extract the classes.dex file from .apk files; apktool does
   not do this by default which was preventing us from recursing into it to
   find differences. Thanks to Hans-Christoph Steiner for the report.
   (Closes: #890904)
 - Recursively reset the permissions of temporary directories prior to
   deletion to ensure that non-writable permissions such as 0555 are removed
   and do not cause a traceback. (Closes: #891363)
 - Support the case where the python3-xattr package is installed but
   python3-pyxattr is not. Based on an patch by Doug Freed; thanks!
   (Closes: #892240)
 - Update Java tests for openjdk-9. (Closes: #893183)
 .
   * Output:
 - Print a nicer error message if you only specify one file to compare.
 - Don't show progress bar if we passed --debug as it just gets in the way.
 .
   * Code tidying:
 - Avoid some necessary indentation around unconditional control flow.
 - Tidy unnecessary assignments.
 - Move the documentation for maybe_decode into a docstring on the method
   itself.
 - Import LooseVersion as LooseVersion.
 - Use more Pythonic `old_level` variable names (over `oldLabel`) and avoid
   using ambiguous `l` variable names.
 - Add whitespace around operators and ensure 4-line indentation throughout.
 .
   * debian/*:
 - Move DOS/MBR check into the testsuite.
 - Add explicit runtime dependency on python3-distutils as it was dropped in
   src:python3.6 3.6.5~rc1-2.
 .
   * Misc:
 - Clarify that the Reproducible Builds project is not just about
 - Drop executable bit on doc/Makefile.
 - Use our bin/diffoscope wrapper in manpage generation to ensure we are
   using the local version of diffoscope.
 .
   [ Mattia Rizzolo ]
   * Update terminology used in docs about exclusion options. Thanks to Paul
 Wise for the idea. (Closes: #893324)
   * Don't try to decode a string in comparators.utils.file. (Closes: #891903)
   * Save a bunch of system calls by resetting

Bug#891363: marked as done (Diffoscope crashes when cleaning non-writeable temporary files/dirs)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#891363: fixed in diffoscope 92
has caused the Debian Bug report #891363,
regarding Diffoscope crashes when cleaning non-writeable temporary files/dirs
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.)


-- 
891363: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891363
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 90

When comparing two NixOS iso images (one pulled from website and one I 
built myself), diffoscope fails after or during printing results with 
(full error included at the bottom):
> PermissionError: [Errno 13] Permission denied: 'curl'
> Unable to delete 
> Traceback (most recent call last):
>   File 
> "/nix/store/1ipliryvqaxixffryxw1w7ckqly0sw35-diffoscope-90/lib/python3.6/site-packages/diffoscope/main.py",
>  
> line 412, in main
>     sys.exit(run_diffoscope(parsed_args))
> SystemExit: 1

It seems that diffoscope is not able to remove r-xr-xr-x temporary file:
> ~> find /tmp/tmpun51yx54_diffoscope -name curl -exec ls -gGd {} +
> dr-xr-xr-x 2   4096 Jan  1  1970 
> /tmp/tmpun51yx54_diffoscope/d1yxmlqavkg9pp02h3b20sn6wbw1ngmd-nixos-17.09.3047.8bce347f02f/nixos/pkgs/tools/networking/curl
> -r-xr-xr-x 1 151168 Jan  1  1970 
> /tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin/curl
> lrwxrwxrwx 1 68 Feb 24 22:10 
> /tmp/tmpun51yx54_diffoscope/plr0a7lnqmz4v453drw7q1ivrdrcamvj-system-path/bin/curl
>  
> -> /nix/store/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin/curl

The 'curl' seems to be first to be removed:
> ~> rm -r /tmp/tmpun51yx54_diffoscope
> rm: descend into write-protected directory 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin'?
>  
> y
> rm: descend into write-protected directory 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin'?
>  
> y
> rm: remove write-protected regular file 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin/curl'?
>  
> y
> rm: cannot remove 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin/curl':
>  
> Permission denied
> rm: descend into write-protected directory 
> '/tmp/tmpun51yx54_diffoscope/a18nnq9b1vyh9f7f71w5lmip91cqr1px-gdbm-1.13'? 
> ^C

Non-writeable files and dirs are quite common for NixOS isos:
> ~> rm -r /tmp/tmpun51yx54_diffoscope
> rm: descend into write-protected directory 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin'?
>  
> y
> rm: descend into write-protected directory 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin'?
>  
> y
> rm: remove write-protected regular file 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin/curl'?
>  
> y
> rm: cannot remove 
> '/tmp/tmpun51yx54_diffoscope/dmchxbmdbk9616xl98f0a69wb55anmq6-curl-7.58.0-bin/bin/curl':
>  
> Permission denied
> rm: descend into write-protected directory 
> '/tmp/tmpun51yx54_diffoscope/a18nnq9b1vyh9f7f71w5lmip91cqr1px-gdbm-1.13'? 
> ^C

Full stacktrace:
> Unable to delete 
> Traceback (most recent call last):
>   File 
> "/nix/store/1ipliryvqaxixffryxw1w7ckqly0sw35-diffoscope-90/lib/python3.6/site-packages/diffoscope/main.py",
>  
> line 412, in main
>     sys.exit(run_diffoscope(parsed_args))
> SystemExit: 1
>
> During handling of the above exception, another exception occurred:
>
> Traceback (most recent call last):
>   File 
> "/nix/store/1ipliryvqaxixffryxw1w7ckqly0sw35-diffoscope-90/lib/python3.6/site-packages/diffoscope/tempfiles.py",
>  
> line 62, in clean_all_temp_files
>     x.cleanup()
>   File 
> "/nix/store/53dyjh7xjhnbibqllr7j27lk2h98n7j7-python3-3.6.4/lib/python3.6/tempfile.py",
>  
> line 811, in cleanup
>     _shutil.rmtree(self.name)
>   File 
> "/nix/store/53dyjh7xjhnbibqllr7j27lk2h98n7j7-python3-3.6.4/lib/python3.6/shutil.py",
>  
> line 480, in rmtree
>     _rmtree_safe_fd(fd, path, onerror)
>   File 
> "/nix/store/53dyjh7xjhnbibqllr7j27lk2h98n7j7-python3-3.6.4/lib/python3.6/shutil.py",
>  
> line 418, in _rmtree_safe_fd
>     _rmtree_safe_fd(dirfd, fullname, onerror)
>   File 
> "/nix/store/53dyjh7xjhnbibqllr7j27lk2h98n7j7-python3-3.6.4/lib/python3.6/shutil.py",
>  
> line 418, in _rmtree_safe_fd
>     _rmtree_safe_fd(dirfd, fullname, onerror)
>   File 
> "/nix/store/53dyjh7xjhnbibqllr7j27lk2h98n7j7-python3-3.6.4/lib/python3.6/shutil.py",
>  
> line 438, in _rmtree_safe_fd
>     onerror(os.unlink, fullname,

Bug#893183: marked as done (diffoscope FTBFS with openjdk-9)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#893183: fixed in diffoscope 92
has caused the Debian Bug report #893183,
regarding diffoscope FTBFS with openjdk-9
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.)


-- 
893183: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893183
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: diffoscope
Version: 91
Severity: serious

https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope.html

...
___ test_diff_javap 

differences_javap = []

@skip_unless_tool_is_at_least('javap', javap_version, '1.8')
def test_diff_javap(differences_javap):
>   diff(differences_javap, 'javap_class_expected_diff')

differences_javap = []

tests/comparators/test_java.py:84: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

differences = []
expected_diff_file = 'javap_class_expected_diff'

def diff(differences, expected_diff_file):
expected_diff = get_data(expected_diff_file)
>   assert differences[0].unified_diff == expected_diff
E   assert '@@ -34,13 +3..."Test.java"\n' == '@@ -31,13 +31..."Test.java"\n'
E - @@ -34,13 +34,13 @@
E ?  ^  ^
E + @@ -31,13 +31,13 @@
E ?  ^  ^
Eline 1: 0
E
E  public static int main(java.lang.String[]);
Edescriptor: ([Ljava/lang/String;)I
E -  flags: (0x0009) ACC_PUBLIC, ACC_STATIC
E ?-
E +  flags: ACC_PUBLIC, ACC_STATIC
ECode:
E  stack=1, locals=1, args_size=1
E   - 0: bipush42
E   - 2: ireturn
E   + 0: iconst_m1
E   + 1: ireturn
E  LineNumberTable:
Eline 3: 0
E}
ESourceFile: "Test.java"

differences = []
expected_diff = '@@ -31,13 +31,13 @@\n line 1: 0\n \n   public static 
int main(java.lang.String[]);\n descriptor: ([Ljava/...   0: 
iconst_m1\n+ 1: ireturn\n   LineNumberTable:\n line 3: 0\n 
}\n SourceFile: "Test.java"\n'
expected_diff_file = 'javap_class_expected_diff'

tests/comparators/test_java.py:66: AssertionError
-- Captured log setup --
__init__.py127 DEBUGLoaded 65 comparator classes
specialize.py   40 DEBUGUsing ClassFile for 
/build/1st/diffoscope-91/.pybuild/cpython3_3.6/build/tests/data/Test1.class
specialize.py   40 DEBUGUsing ClassFile for 
/build/1st/diffoscope-91/.pybuild/cpython3_3.6/build/tests/data/Test2.class
command.py  38 DEBUGExecuting javap -verbose -constants -s 
-l -private 
/build/1st/diffoscope-91/.pybuild/cpython3_3.6/build/tests/data/Test1.class
command.py  38 DEBUGExecuting javap -verbose -constants -s 
-l -private 
/build/1st/diffoscope-91/.pybuild/cpython3_3.6/build/tests/data/Test2.class
diff.py177 DEBUGRunning diff -aU7 
/tmp/tmpff97aoah_diffoscope/fifo1 /tmp/tmpff97aoah_diffoscope/fifo2
diff.py193 DEBUGdiff -aU7 
/tmp/tmpff97aoah_diffoscope/fifo1 /tmp/tmpff97aoah_diffoscope/fifo2: returncode 
1, parsed True
== 2 failed, 364 passed, 18 skipped in 992.92 seconds ==
E: pybuild pybuild:323: test: plugin distutils failed with: exit code=1: cd 
/build/1st/diffoscope-91/.pybuild/cpython3_3.6/build; python3.6 -m pytest -vv 
-r sxX -l --cov=diffoscope --cov-report=term-missing --cov-report=html
dh_auto_test: pybuild --test --test-pytest -i python{version} -p 3.6 returned 
exit code 13
make: *** [debian/rules:35: binary] Error 25
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 92

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 893...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Chris Lamb  (supplier of updated diffoscope package)

(This message was generated automatically at their request; if you
believe that

Bug#892240: marked as done (diffoscope: crashes comparing directories with python3-xattr installed)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#892240: fixed in diffoscope 92
has caused the Debian Bug report #892240,
regarding diffoscope: crashes comparing directories with python3-xattr installed
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.)


-- 
892240: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892240
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 91
Severity: wishlist 
Usertags: crash

diffoscope crashes when comparing directories when the python3-xattr
package is installed but the python3-pyxattr package is not installed.

I would suggest that diffoscope should either conflict with the
incompatible python3-xattr package (as python3-pyxattr does), or
add support for the API provided by the python3-xattr package.

Personally I would prefer the latter, since python3-xattr has a
useful command-line tool in the xattr package that I sometimes use.

$ mkdir foo bar
$ diffoscope foo bar
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/diffoscope/main.py", line 422, in main
sys.exit(run_diffoscope(parsed_args))
  File "/usr/lib/python3/dist-packages/diffoscope/main.py", line 394, in 
run_diffoscope
difference = compare_root_paths(path1, path2)
  File 
"/usr/lib/python3/dist-packages/diffoscope/comparators/utils/compare.py", line 
62, in compare_root_paths
return compare_directories(path1, path2)
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/directory.py", 
line 165, in compare_directories
return FilesystemDirectory(path1).compare(FilesystemDirectory(path2))
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/directory.py", 
line 216, in compare
differences.extend(compare_meta(self.name, other.name))
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/directory.py", 
line 161, in compare_meta
differences.append(xattr(path1, path2))
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/directory.py", 
line 124, in xattr
fn(path1), fn(path2), path1, path2, source='extended file attributes',
  File "/usr/lib/python3/dist-packages/diffoscope/comparators/directory.py", 
line 121, in fn
) for k, v in sorted(xattr.get_all(x)))
AttributeError: module 'xattr' has no attribute 'get_all'

-- System Information:
Debian Release: buster/sid
  APT prefers testing-debug
  APT policy: (900, 'testing-debug'), (900, 'testing'), (800, 
'unstable-debug'), (800, 'unstable'), (790, 'buildd-unstable'), (700, 
'experimental-debug'), (700, 'experimental'), (690, 'buildd-experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.14.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8), 
LANGUAGE=en_AU.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages diffoscope depends on:
ii  python33.6.4-1
ii  python3-distro 1.0.1-2
ii  python3-libarchive-c   2.1-3.1
ii  python3-magic  2:0.4.15-1
ii  python3-pkg-resources  38.4.0-1

Versions of packages diffoscope recommends:
ii  abootimg 0.6-1+b2
ii  acl  2.2.52-3+b1
ii  apktool  2.3.1+dfsg-1
ii  binutils-multiarch   2.30-5
ii  bzip21.0.6-8.1
ii  caca-utils   0.99.beta19-2+b2
ii  colord   1.3.3-2
ii  db-util  5.3.1
ii  default-jdk [java-sdk]   2:1.8-59
ii  default-jdk-headless 2:1.8-59
pn  device-tree-compiler 
pn  docx2txt 
ii  e2fsprogs1.43.9-2
ii  enjarify 1:1.0.3-3
ii  fontforge-extras 0.3-4
pn  fp-utils 
ii  genisoimage  9:1.1.11-3+b2
ii  gettext  0.19.8.1-4
ii  ghc  8.0.2-11
ii  ghostscript  9.22~dfsg-2
ii  giflib-tools 5.1.4-2
ii  gnupg2.2.5-1
ii  imagemagick  8:6.9.9.34+dfsg-3
ii  imagemagick-6.q16 [imagemagick]  8:6.9.9.34+dfsg-3
ii  jsbeautifier 1.6.4-6
pn  libarchive-tools 
ii  llvm 1:4.0-40
pn  mono-utils   
pn  odt2txt  
pn  oggvideotools
ii  openjdk-8-jdk [java-sdk] 8u151-b12-1
ii  openssh-client

Bug#891903: marked as done (diffoscope: "AttributeError: 'str' object has no attribute 'decode'" when processing ELF binary)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#891903: fixed in diffoscope 92
has caused the Debian Bug report #891903,
regarding diffoscope: "AttributeError: 'str' object has no attribute 'decode'" 
when processing ELF binary
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.)


-- 
891903: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891903
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 91
Severity: normal

Dear Maintainer,

I'm trying to update diffoscope to version 91 in Fedora rawhide, and
the tests failing for reasons I haven't diagnosed yet (it builds fine
locally, but fails on an s390x builder). When the tests are failing, a
try..except clause is reached which normally wouldn't be reached, and the
code there is non-python3-compatible:

E   subprocess.CalledProcessError: Command '['objdump', 
'--line-numbers', '--disassemble', '--demangle', '--section=.text', 
'/tmp/tmp5ujok4po_diffoscope/0/2.o']' returned non-zero exit status 1.
diffoscope/feeders.py:94: CalledProcessError
During handling of the above exception, another exception occurred:
rlib1 = < 
/builddir/build/BUILD/diffoscope-91/tests/data/test1.rlib>
rlib2 = < 
/builddir/build/BUILD/diffoscope-91/tests/data/test2.rlib>
@pytest.fixture
def differences(rlib1, rlib2):
>   return rlib1.compare(rlib2).details
tests/comparators/test_rlib.py:53: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
diffoscope/comparators/utils/file.py:362: in compare
difference = self._compare_using_details(other, source)
diffoscope/comparators/utils/file.py:317: in _compare_using_details
details.extend(self.as_container.compare(other.as_container, 
no_recurse=no_recurse))
diffoscope/comparators/utils/container.py:174: in compare_pair
difference = compare_files(file1, file2, source=None, 
diff_content_only=no_recurse)
diffoscope/comparators/utils/compare.py:117: in compare_files
return file1.compare(file2, source)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
self = < alloc_system-d16b8f0e.0.o>
other = < alloc_system-d16b8f0e.0.o>, source = None
def compare(self, other, source=None):
if hasattr(self, 'compare_details') or self.as_container:
try:
difference = self._compare_using_details(other, source)
# no differences detected inside? let's at least do a binary 
diff
if difference is None:
difference = self.compare_bytes(other, source=source)
if difference is None:
return None
difference.add_comment(
"No file format specific differences found inside, "
"yet data differs ({})".format(self.magic_file_type),
)
except subprocess.CalledProcessError as e:
difference = self.compare_bytes(other, source=source)
if e.output:
>   output = re.sub(r'^', '', e.output.decode('utf-8', 
> errors='replace'), flags=re.MULTILINE)
E   AttributeError: 'str' object has no attribute 'decode'
diffoscope/comparators/utils/file.py:375: AttributeError

It seem pretty clear that .decode() is called on a str object, which cannot 
work.

The full log is at 
https://kojipkgs.fedoraproject.org//work/tasks/2918/25412918/build.log.

Zbyszek
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 92

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 891...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Chris Lamb  (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: Thu, 22 Mar 2018 10:28:44 -0400
Source: diffoscope
Binary: diffoscope
Built-For-Profiles: nocheck
Architecture: source all
Version: 92
Distribution: unstable
Urgency: medium

Bug#893311: marked as done (diffoscope: Please add support for comparing gnumeric spreadsheets)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#893311: fixed in diffoscope 92
has caused the Debian Bug report #893311,
regarding diffoscope: Please add support for comparing gnumeric spreadsheets
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.)


-- 
893311: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893311
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: diffoscope
Version: 91
Severity: wishlist

Hi,

gnumeric ships with ssdiff(1) a tool to compare two spreadsheets. We could
thus fairly easily add support for this file format.


Best wishes,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 92

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 893...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Chris Lamb  (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: Thu, 22 Mar 2018 10:28:44 -0400
Source: diffoscope
Binary: diffoscope
Built-For-Profiles: nocheck
Architecture: source all
Version: 92
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks 

Changed-By: Chris Lamb 
Description:
 diffoscope - in-depth comparison of files, archives, and directories
Closes: 890904 891363 891903 892240 893183 893311 893324 893443
Changes:
 diffoscope (92) unstable; urgency=medium
 .
   [ Chris Lamb ]
 .
   * New features:
 - Show the list of supported file types in the manual and --help output. We
   can copy-paste this into the website, etc.. Thanks to Jonathan Dowland
   for the suggestion. (Closes: #893443)
 - Add support for comparing Gnumeric spreadsheets. (Closes: #893311)
 .
   * Bug fixes:
 - Additionally extract the classes.dex file from .apk files; apktool does
   not do this by default which was preventing us from recursing into it to
   find differences. Thanks to Hans-Christoph Steiner for the report.
   (Closes: #890904)
 - Recursively reset the permissions of temporary directories prior to
   deletion to ensure that non-writable permissions such as 0555 are removed
   and do not cause a traceback. (Closes: #891363)
 - Support the case where the python3-xattr package is installed but
   python3-pyxattr is not. Based on an patch by Doug Freed; thanks!
   (Closes: #892240)
 - Update Java tests for openjdk-9. (Closes: #893183)
 .
   * Output:
 - Print a nicer error message if you only specify one file to compare.
 - Don't show progress bar if we passed --debug as it just gets in the way.
 .
   * Code tidying:
 - Avoid some necessary indentation around unconditional control flow.
 - Tidy unnecessary assignments.
 - Move the documentation for maybe_decode into a docstring on the method
   itself.
 - Import LooseVersion as LooseVersion.
 - Use more Pythonic `old_level` variable names (over `oldLabel`) and avoid
   using ambiguous `l` variable names.
 - Add whitespace around operators and ensure 4-line indentation throughout.
 .
   * debian/*:
 - Move DOS/MBR check into the testsuite.
 - Add explicit runtime dependency on python3-distutils as it was dropped in
   src:python3.6 3.6.5~rc1-2.
 .
   * Misc:
 - Clarify that the Reproducible Builds project is not just about
 - Drop executable bit on doc/Makefile.
 - Use our bin/diffoscope wrapper in manpage generation to ensure we are
   using the local version of diffoscope.
 .
   [ Mattia Rizzolo ]
   * Update terminology used in docs about exclusion options. Thanks to Paul
 Wise for the idea. (Closes: #893324)
   * Don't try to decode a string in comparators.utils.file. (Closes: #891903)
   * Save a bunch of system calls by resetting tempfile permissions when
 we actually need to do it.

Bug#890904: marked as done (diffoscope does not show classes.dex diff)

2018-03-22 Thread Debian Bug Tracking System 
Your message dated Thu, 22 Mar 2018 15:07:00 +
with message-id 
and subject line Bug#890904: fixed in diffoscope 92
has caused the Debian Bug report #890904,
regarding diffoscope does not show classes.dex diff
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.)


-- 
890904: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=890904
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---

Package: diffoscope
Version: 90~bpo9+1

Attached are two APKs that have different classes.dex files.  They are
the same size, but have different contents.  diffoscope does not show a
diff for them.  When I extract the classes.dex files from the APK, diff
and vbindiff do show the differences.

Here are the test files:
https://verification.f-droid.org/tmp/a2dp.Vol_137.apk
https://verification.f-droid.org/tmp/sigcp_a2dp.Vol_137.apk

And the report:
https://verification.f-droid.org/tmp/a2dp.Vol_137.apk.diffoscope.txt
https://verification.f-droid.org/tmp/a2dp.Vol_137.apk.diffoscope.html
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 92

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 890...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Chris Lamb  (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: Thu, 22 Mar 2018 10:28:44 -0400
Source: diffoscope
Binary: diffoscope
Built-For-Profiles: nocheck
Architecture: source all
Version: 92
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks 

Changed-By: Chris Lamb 
Description:
 diffoscope - in-depth comparison of files, archives, and directories
Closes: 890904 891363 891903 892240 893183 893311 893324 893443
Changes:
 diffoscope (92) unstable; urgency=medium
 .
   [ Chris Lamb ]
 .
   * New features:
 - Show the list of supported file types in the manual and --help output. We
   can copy-paste this into the website, etc.. Thanks to Jonathan Dowland
   for the suggestion. (Closes: #893443)
 - Add support for comparing Gnumeric spreadsheets. (Closes: #893311)
 .
   * Bug fixes:
 - Additionally extract the classes.dex file from .apk files; apktool does
   not do this by default which was preventing us from recursing into it to
   find differences. Thanks to Hans-Christoph Steiner for the report.
   (Closes: #890904)
 - Recursively reset the permissions of temporary directories prior to
   deletion to ensure that non-writable permissions such as 0555 are removed
   and do not cause a traceback. (Closes: #891363)
 - Support the case where the python3-xattr package is installed but
   python3-pyxattr is not. Based on an patch by Doug Freed; thanks!
   (Closes: #892240)
 - Update Java tests for openjdk-9. (Closes: #893183)
 .
   * Output:
 - Print a nicer error message if you only specify one file to compare.
 - Don't show progress bar if we passed --debug as it just gets in the way.
 .
   * Code tidying:
 - Avoid some necessary indentation around unconditional control flow.
 - Tidy unnecessary assignments.
 - Move the documentation for maybe_decode into a docstring on the method
   itself.
 - Import LooseVersion as LooseVersion.
 - Use more Pythonic `old_level` variable names (over `oldLabel`) and avoid
   using ambiguous `l` variable names.
 - Add whitespace around operators and ensure 4-line indentation throughout.
 .
   * debian/*:
 - Move DOS/MBR check into the testsuite.
 - Add explicit runtime dependency on python3-distutils as it was dropped in
   src:python3.6 3.6.5~rc1-2.
 .
   * Misc:
 - Clarify that the Reproducible Builds project is not just about
 - Drop executable bit on doc/Makefile.
 - Use our bin/diffoscope wrapper in manpage generation to ensure we are
   using the local version of diffoscope.
 .
   [ Mattia Rizzolo ]
   * Update terminology used in docs about

Accepted diffoscope 92 (source all) into unstable

2018-03-22 Thread Chris Lamb 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Thu, 22 Mar 2018 10:28:44 -0400
Source: diffoscope
Binary: diffoscope
Built-For-Profiles: nocheck
Architecture: source all
Version: 92
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks 

Changed-By: Chris Lamb 
Description:
 diffoscope - in-depth comparison of files, archives, and directories
Closes: 890904 891363 891903 892240 893183 893311 893324 893443
Changes:
 diffoscope (92) unstable; urgency=medium
 .
   [ Chris Lamb ]
 .
   * New features:
 - Show the list of supported file types in the manual and --help output. We
   can copy-paste this into the website, etc.. Thanks to Jonathan Dowland
   for the suggestion. (Closes: #893443)
 - Add support for comparing Gnumeric spreadsheets. (Closes: #893311)
 .
   * Bug fixes:
 - Additionally extract the classes.dex file from .apk files; apktool does
   not do this by default which was preventing us from recursing into it to
   find differences. Thanks to Hans-Christoph Steiner for the report.
   (Closes: #890904)
 - Recursively reset the permissions of temporary directories prior to
   deletion to ensure that non-writable permissions such as 0555 are removed
   and do not cause a traceback. (Closes: #891363)
 - Support the case where the python3-xattr package is installed but
   python3-pyxattr is not. Based on an patch by Doug Freed; thanks!
   (Closes: #892240)
 - Update Java tests for openjdk-9. (Closes: #893183)
 .
   * Output:
 - Print a nicer error message if you only specify one file to compare.
 - Don't show progress bar if we passed --debug as it just gets in the way.
 .
   * Code tidying:
 - Avoid some necessary indentation around unconditional control flow.
 - Tidy unnecessary assignments.
 - Move the documentation for maybe_decode into a docstring on the method
   itself.
 - Import LooseVersion as LooseVersion.
 - Use more Pythonic `old_level` variable names (over `oldLabel`) and avoid
   using ambiguous `l` variable names.
 - Add whitespace around operators and ensure 4-line indentation throughout.
 .
   * debian/*:
 - Move DOS/MBR check into the testsuite.
 - Add explicit runtime dependency on python3-distutils as it was dropped in
   src:python3.6 3.6.5~rc1-2.
 .
   * Misc:
 - Clarify that the Reproducible Builds project is not just about
 - Drop executable bit on doc/Makefile.
 - Use our bin/diffoscope wrapper in manpage generation to ensure we are
   using the local version of diffoscope.
 .
   [ Mattia Rizzolo ]
   * Update terminology used in docs about exclusion options. Thanks to Paul
 Wise for the idea. (Closes: #893324)
   * Don't try to decode a string in comparators.utils.file. (Closes: #891903)
   * Save a bunch of system calls by resetting tempfile permissions when
 we actually need to do it.
Checksums-Sha1:
 bf5454135e289dc72b6c90b701e236b4cf1aca96 3450 diffoscope_92.dsc
 4d2de0fd8ef3e408b3c9e0ef21424a8c13e19950 8941108 diffoscope_92.tar.xz
 26ca12fbbaac88d473ecefb8104d4970b5707bf7 119368 diffoscope_92_all.deb
 abb5d892ed2888c52b2ef71b211f6e7821e7f87d 6496 diffoscope_92_amd64.buildinfo
Checksums-Sha256:
 89825858473b26ef732bb12c0c63325ef292cc2d2c200a088d7a66e1bfe414cc 3450 
diffoscope_92.dsc
 dc0ec115af492d91cc3512d71a0b0882847faa1319e381cdbbc4ec155d568e06 8941108 
diffoscope_92.tar.xz
 e3b2e70a097f98b4c318dabf2dd09af84365d0e8c89a45f477dc1f4c91fa33d4 119368 
diffoscope_92_all.deb
 fbcc092a28a5874a4b46b31e03a1f9b568363481d94953c4aaad67ac9bb47972 6496 
diffoscope_92_amd64.buildinfo
Files:
 a91e7adac25c9b7a6a172ce72251327f 3450 devel optional diffoscope_92.dsc
 8e25a63003ead4b79ed3c1eb130a3470 8941108 devel optional diffoscope_92.tar.xz
 1859965190e58bd76231dcc9439d492b 119368 devel optional diffoscope_92_all.deb
 e0b84b217304d667e0ea353fd5a5d79c 6496 devel optional 
diffoscope_92_amd64.buildinfo

-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAlqzv4AACgkQHpU+J9Qx
HlgZ1g/9GQQhyCZFU3KETg6AjGkNGyNAjYYD2FqKAJyM0bb3o9Zyg5QWvVPxFYHf
CDaKAwMQn6yws908OEfDPWGQAtowFGMPAXab9ejy9IvyD8wGXJ9iBXzgwtOWUCD7
hvyTCBKGRNwH/LdCWNfX1sNFX+usLDB5mlZytlRZe+aOUN+MKuRzNnDhl7wt6EU9
LiXsjqxdYDMJgBCIMcOJ50q3r8RkFjK7YCHeROrwiMRd/YGIR2i9Ed+g/zIkd2pr
ztgwec9nebOmHmFbWc6bqzKMVSkmejSyOjbZmmudTg0sUKrRF1qO/b5z9kEezSL6
VxyZKHHvqXBgAuwspvluJ4HWLifsWtwOIyg5xrcAAeeGm/j8RoIP8UanOyXbm8Bk
3+MsuGwZJEuNC7y2eiGx/HvcE2R9KK9UJlbIFeKKp16AYbLIINGTMDlHiYo9ItTz
Q77N4sbjSgKIuyBf3qzoyL0luWODVB5bpht+iCJxrOVnNDE2u8xFBYG/wTSxpftA
5X3pj1vPYy+1ozBDddaxOQppoDc/DHCgp6PWAf1K1/FvqNqrOPFiBaEg+L7QMthT
ADXhzB0+z6JnPU92URh7a0/rw+5hfU4dxZElCFznQhDLf8U3NngsSpCfnY3OK3Uu
qknLgJERC2K6iJrhVB023yksPPxAeTH7L+0BDpXeXFReJ6ldOCg=
=CTQP
-END PGP SIGNATURE-


___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org

diffoscope_92_amd64.changes ACCEPTED into unstable

2018-03-22 Thread Debian FTP Masters 


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Thu, 22 Mar 2018 10:28:44 -0400
Source: diffoscope
Binary: diffoscope
Built-For-Profiles: nocheck
Architecture: source all
Version: 92
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks 

Changed-By: Chris Lamb 
Description:
 diffoscope - in-depth comparison of files, archives, and directories
Closes: 890904 891363 891903 892240 893183 893311 893324 893443
Changes:
 diffoscope (92) unstable; urgency=medium
 .
   [ Chris Lamb ]
 .
   * New features:
 - Show the list of supported file types in the manual and --help output. We
   can copy-paste this into the website, etc.. Thanks to Jonathan Dowland
   for the suggestion. (Closes: #893443)
 - Add support for comparing Gnumeric spreadsheets. (Closes: #893311)
 .
   * Bug fixes:
 - Additionally extract the classes.dex file from .apk files; apktool does
   not do this by default which was preventing us from recursing into it to
   find differences. Thanks to Hans-Christoph Steiner for the report.
   (Closes: #890904)
 - Recursively reset the permissions of temporary directories prior to
   deletion to ensure that non-writable permissions such as 0555 are removed
   and do not cause a traceback. (Closes: #891363)
 - Support the case where the python3-xattr package is installed but
   python3-pyxattr is not. Based on an patch by Doug Freed; thanks!
   (Closes: #892240)
 - Update Java tests for openjdk-9. (Closes: #893183)
 .
   * Output:
 - Print a nicer error message if you only specify one file to compare.
 - Don't show progress bar if we passed --debug as it just gets in the way.
 .
   * Code tidying:
 - Avoid some necessary indentation around unconditional control flow.
 - Tidy unnecessary assignments.
 - Move the documentation for maybe_decode into a docstring on the method
   itself.
 - Import LooseVersion as LooseVersion.
 - Use more Pythonic `old_level` variable names (over `oldLabel`) and avoid
   using ambiguous `l` variable names.
 - Add whitespace around operators and ensure 4-line indentation throughout.
 .
   * debian/*:
 - Move DOS/MBR check into the testsuite.
 - Add explicit runtime dependency on python3-distutils as it was dropped in
   src:python3.6 3.6.5~rc1-2.
 .
   * Misc:
 - Clarify that the Reproducible Builds project is not just about
 - Drop executable bit on doc/Makefile.
 - Use our bin/diffoscope wrapper in manpage generation to ensure we are
   using the local version of diffoscope.
 .
   [ Mattia Rizzolo ]
   * Update terminology used in docs about exclusion options. Thanks to Paul
 Wise for the idea. (Closes: #893324)
   * Don't try to decode a string in comparators.utils.file. (Closes: #891903)
   * Save a bunch of system calls by resetting tempfile permissions when
 we actually need to do it.
Checksums-Sha1:
 bf5454135e289dc72b6c90b701e236b4cf1aca96 3450 diffoscope_92.dsc
 4d2de0fd8ef3e408b3c9e0ef21424a8c13e19950 8941108 diffoscope_92.tar.xz
 26ca12fbbaac88d473ecefb8104d4970b5707bf7 119368 diffoscope_92_all.deb
 abb5d892ed2888c52b2ef71b211f6e7821e7f87d 6496 diffoscope_92_amd64.buildinfo
Checksums-Sha256:
 89825858473b26ef732bb12c0c63325ef292cc2d2c200a088d7a66e1bfe414cc 3450 
diffoscope_92.dsc
 dc0ec115af492d91cc3512d71a0b0882847faa1319e381cdbbc4ec155d568e06 8941108 
diffoscope_92.tar.xz
 e3b2e70a097f98b4c318dabf2dd09af84365d0e8c89a45f477dc1f4c91fa33d4 119368 
diffoscope_92_all.deb
 fbcc092a28a5874a4b46b31e03a1f9b568363481d94953c4aaad67ac9bb47972 6496 
diffoscope_92_amd64.buildinfo
Files:
 a91e7adac25c9b7a6a172ce72251327f 3450 devel optional diffoscope_92.dsc
 8e25a63003ead4b79ed3c1eb130a3470 8941108 devel optional diffoscope_92.tar.xz
 1859965190e58bd76231dcc9439d492b 119368 devel optional diffoscope_92_all.deb
 e0b84b217304d667e0ea353fd5a5d79c 6496 devel optional 
diffoscope_92_amd64.buildinfo

-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAlqzv4AACgkQHpU+J9Qx
HlgZ1g/9GQQhyCZFU3KETg6AjGkNGyNAjYYD2FqKAJyM0bb3o9Zyg5QWvVPxFYHf
CDaKAwMQn6yws908OEfDPWGQAtowFGMPAXab9ejy9IvyD8wGXJ9iBXzgwtOWUCD7
hvyTCBKGRNwH/LdCWNfX1sNFX+usLDB5mlZytlRZe+aOUN+MKuRzNnDhl7wt6EU9
LiXsjqxdYDMJgBCIMcOJ50q3r8RkFjK7YCHeROrwiMRd/YGIR2i9Ed+g/zIkd2pr
ztgwec9nebOmHmFbWc6bqzKMVSkmejSyOjbZmmudTg0sUKrRF1qO/b5z9kEezSL6
VxyZKHHvqXBgAuwspvluJ4HWLifsWtwOIyg5xrcAAeeGm/j8RoIP8UanOyXbm8Bk
3+MsuGwZJEuNC7y2eiGx/HvcE2R9KK9UJlbIFeKKp16AYbLIINGTMDlHiYo9ItTz
Q77N4sbjSgKIuyBf3qzoyL0luWODVB5bpht+iCJxrOVnNDE2u8xFBYG/wTSxpftA
5X3pj1vPYy+1ozBDddaxOQppoDc/DHCgp6PWAf1K1/FvqNqrOPFiBaEg+L7QMthT
ADXhzB0+z6JnPU92URh7a0/rw+5hfU4dxZElCFznQhDLf8U3NngsSpCfnY3OK3Uu
qknLgJERC2K6iJrhVB023yksPPxAeTH7L+0BDpXeXFReJ6ldOCg=
=CTQP
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
Reproducible-builds mailing

Bug#893802: diffoscope: missing Depends: python3-distutils

2018-03-22 Thread Helmut Grohne 
Package: diffoscope
Version: 91
Severity: serious
User: helm...@debian.org
Usertags: rebootstrap

In a fresh sid debootstrap, after apt-get install
--no-install-recommends diffoscope, you get:

$ diffoscope --help
Traceback (most recent call last):
  File "/usr/bin/diffoscope", line 33, in 
from diffoscope.main import main
  File "/usr/lib/python3/dist-packages/diffoscope/main.py", line 32, in 
from .tools import tool_prepend_prefix, tool_required, OS_NAMES, 
get_current_os
  File "/usr/lib/python3/dist-packages/diffoscope/tools.py", line 29, in 

from distutils.spawn import find_executable
ModuleNotFoundError: No module named 'distutils'
$

This is due to python3.6/3.6.5~rc1-2 having dropped its dependency on
python3-distutils. I guess we need to add disutils to install_requires
in setup.py to fix this issue.

Helmut

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Processing of diffoscope_92_amd64.changes

2018-03-22 Thread Debian FTP Masters 
diffoscope_92_amd64.changes uploaded successfully to localhost
along with the files:
  diffoscope_92.dsc
  diffoscope_92.tar.xz
  diffoscope_92_all.deb
  diffoscope_92_amd64.buildinfo

Greetings,

Your Debian queue daemon (running on host usper.debian.org)

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Bug#884095: flag to force file types

2018-03-22 Thread Hans-Christoph Steiner 


Chris Lamb:
> Hi Hans!
> 
>>> Have we really exhausted the detection route for this? :)
>>
>> I think the detection route has been exhausted.  It seems that no one
>> wants to do what it takes to reliably detect APKs. 
> 
> I'm sorry you think so and, with the greatest of respect, I'm not
> sure this is entirely accurate... at least from my point of view.
> 
> Could you perhaps attach or otherwise link to some testcases where
> diffoscope gets the detection wrong? It sounds like a fun challenge,
> if nothing else..

Any Janus APK, including the examples linked to in the github, etc. are
test cases.

It would be literally impossible to auto-detect since a Janus APK is
both a valid DEX file (starting with the bytes "dex") and a functional
ZIP and APK.  Most ZIP readers will happily skip any bytes that don't
make sense before the ZIP contents, since the file information is stored
at the end of a ZIP.  A Janus APK is technically not an officially valid
ZIP, since it has non-ZIP bytes before the ZIP header. The most recent
APK tools now reject Janus APKs as invalid, but zip tools will still
happily work with them.  So in my case, I'd want to compare a valid APK
with a modified version of the valid APK that turns it into a Janus APK.

As for increasing the reliability of the auto-detection, I think libfile
could do a quick check for APK Signature v2 or v3, then reliably mark
the file as an APK (vs. ZIP or JAR).

APK Signature v2:
https://source.android.com/security/apksigning/v2

APK Signature v3:
https://android-review.googlesource.com/c/platform/tools/apksig/+/587834/

.hc

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds