Bug#912756: diffoscope: Test failures with upcoming upstream file(1) version 5.35

2018-11-04 Thread Chris Lamb 
tags 912756 + pending
thanks

Thanks for this. I've tested it both sid and experimental (with
file 5.35) and it now passes in both so I've applied it in Git,
pending upload:

  
https://salsa.debian.org/reproducible-builds/diffoscope/commit/0dfb8182fed6491296e1c1014351e00b29e59d8e

  diffoscope/comparators/pcap.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)


Best wishes,

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

Bug#912756: diffoscope: Test failures with upcoming upstream file(1) version 5.35

2018-11-03 Thread Daniel Shahaf 
Control: tags -1 patch

Christoph Biedl wrote on Sat, Nov 03, 2018 at 16:13:58 +0100:
> -diffoscope-104/tests/data/test2.pcap: tcpdump capture file (little-endian) - 
> version 2.4 (Ethernet, capture length 262144)
> +diffoscope-104/tests/data/test2.pcap: pcap capture file, microsecond ts 
> (little-endian) - version 2.4 (Ethernet, capture length 262144)

Untested patch:

diff -ru diffoscope-104/diffoscope/comparators/pcap.py 
diffoscope-104.new/diffoscope/comparators/pcap.py
--- diffoscope-104/diffoscope/comparators/pcap.py   2018-10-15 
10:09:05.0 +
+++ diffoscope-104.new/diffoscope/comparators/pcap.py   2018-11-03 
17:04:03.749507655 +
@@ -40,7 +40,9 @@
 
 class PcapFile(File):
 DESCRIPTION = "tcpdump capture files (.pcap)"
-FILE_TYPE_RE = re.compile(r'^tcpdump capture file\b')
+# The regexp covers both libmagic<5.35 and libmagic>=5.35.
+# See https://bugs.debian.org/912756
+FILE_TYPE_RE = re.compile(r'^(tcpdump|pcap) capture file\b')
 
 def compare_details(self, other, source=None):
 return [Difference.from_command(

Cheers,

Daniel

Bug#912756: diffoscope: Test failures with upcoming upstream file(1) version 5.35

2018-11-03 Thread Christoph Biedl 
Package: diffoscope
Version: 104
Severity: important

Dear Maintainer,

A new upstream release of file/libmagic has been accepted into
experimental a few moments ago, version 1:5.35-1. As your package is
one of those that somewhat suffered from surprising feature changes of
libmagic in the past, I'd like to give you an opportunity to test and
to prepare for any changes, for better or for worse. In case of the
latter, use the BTS as usual to report detections that could see an
improvement.

Test-building diffoscope resulted in a regression, see log extract
below. I reckon this was introduced by an upstream change of pcap file
detection, e.g.

-diffoscope-104/tests/data/test2.pcap: tcpdump capture file (little-endian) - 
version 2.4 (Ethernet, capture length 262144)
+diffoscope-104/tests/data/test2.pcap: pcap capture file, microsecond ts 
(little-endian) - version 2.4 (Ethernet, capture length 262144)

My plan is to upload to unstable in a week from now. Let me know, if you
need more time.

Sorry for the hazzle,

Christoph, bringer of the bad news

-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.18.11 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: unable to detect

Versions of packages diffoscope depends on:
ii  libpython3.5-stdlib3.5.6-1
ii  libpython3.6-stdlib3.6.7-1
ii  python33.6.7-1
ii  python3-distro 1.3.0-1
ii  python3-distutils  3.7.1-1
ii  python3-libarchive-c   2.1-3.1
ii  python3-magic  2:0.4.15-2
ii  python3-pkg-resources  40.4.3-1

Versions of packages diffoscope recommends:
pn  abootimg   
pn  acl
pn  apktool
pn  binutils-multiarch 
ii  bzip2  1.0.6-9
pn  caca-utils 
pn  colord 
pn  db-util
pn  default-jdk-headless | default-jdk | java-sdk  
pn  device-tree-compiler   
pn  docx2txt   
ii  e2fsprogs  1.44.4-2
pn  enjarify   
pn  fontforge-extras   
pn  fp-utils   
pn  genisoimage
ii  gettext0.19.8.1-8
pn  ghc
pn  ghostscript
pn  giflib-tools   
pn  gnumeric   
ii  gnupg  2.2.10-3
pn  imagemagick
pn  jsbeautifier   
pn  libarchive-tools   
pn  llvm   
pn  lz4 | liblz4-tool  
pn  mono-utils 
pn  ocaml-nox  
pn  odt2txt
pn  oggvideotools  
ii  openssh-client 1:7.9p1-1
pn  pgpdump
pn  poppler-utils  
pn  procyon-decompiler 
pn  python3-argcomplete
pn  python3-binwalk
ii  python3-debian 0.1.33
pn  python3-defusedxml 
pn  python3-guestfs
pn  python3-jsondiff   
pn  python3-progressbar
pn  python3-pypdf2 
pn  python3-pyxattr
pn  python3-tlsh   
pn  r-base-core
pn  rpm2cpio   
pn  sng
pn  sqlite3
pn  squashfs-tools 
ii  tcpdump4.9.2-3
ii  unzip  6.0-21
ii  vim-common 2:8.1.0320-1
pn  xmlbeans   
ii  xxd2:8.1.0320-1
ii  xz-utils   5.2.2-1.3

Versions of packages diffoscope suggests:
ii  libjs-jquery  3.2.1-1

-- no debconf information


Build log:

(...)
tests/comparators/test_pcap.py::test_identification FAILED   [ 74%]
tests/comparators/t