diffoscope 270__tar.gz → 271__tar.gz

{diffoscope-270 → diffoscope-271}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 270
+Version: 271
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-270 → diffoscope-271}/debian/changelog

@@ -1,8 +1,18 @@
-diffoscope (271) UNRELEASED; urgency=medium
+diffoscope (272) UNRELEASED; urgency=medium
 
   * WIP (generated upon release).
 
- -- Chris Lamb <lamby@debian.org>  Tue, 04 Jun 2024 09:17:49 +0100
+ -- Chris Lamb <lamby@debian.org>  Fri, 07 Jun 2024 09:34:59 +0100
+
+diffoscope (271) unstable; urgency=medium
+
+  [ Chris Lamb]
+  * Drop Build-Depends on liblz4-tool. Thanks, Chris Peterson.
+    (Closes: #1072575)
+  * Update tests to support zipdetails version 4.004 shipped with Perl 5.40.
+    (Closes: reproducible-builds/diffoscope#377)
+
+ -- Chris Lamb <lamby@debian.org>  Fri, 07 Jun 2024 09:33:33 +0100
 
 diffoscope (270) unstable; urgency=medium
 

{diffoscope-270 → diffoscope-271}/debian/control

@@ -53,7 +53,7 @@ Build-Depends:
  libjs-jquery-throttle-debounce <!nocheck>,
  linux-image-amd64 [amd64] <!nocheck> | linux-image-generic [amd64] <!nocheck>,
  llvm <!nocheck>,
- lz4 <!nocheck> | liblz4-tool <!nocheck>,
+ lz4 <!nocheck>,
  lzip <!nocheck>,
  mono-utils <!nocheck>,
  ocaml-nox <!nocheck>,

{diffoscope-270 → diffoscope-271}/debian/tests/control

@@ -7,7 +7,7 @@
 #   $ mv debian/tests/control.tmp debian/tests/control
 
 Tests: pytest-with-recommends
-Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, aapt [amd64 arm64 armel armhf i386 mips64el mipsel], abootimg, acl, apksigcopier, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, dexdump [amd64 arm64 armhf i386], docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4 | liblz4-tool, lzip, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, androguard, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
+Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, aapt [amd64 arm64 armel armhf i386 mips64el mipsel], abootimg, acl, apksigcopier, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, dexdump [amd64 arm64 armhf i386], docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, androguard, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file, python3-tlsh

{diffoscope-270 → diffoscope-271}/diffoscope/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "270"
+VERSION = "271"

{diffoscope-270 → diffoscope-271}/diffoscope/external_tools.py

@@ -129,7 +129,7 @@ EXTERNAL_TOOLS = {
         "FreeBSD": "e2fsprogs",
         "guix": "e2fsprogs",
     },
-    "lz4": {"debian": "lz4 | liblz4-tool", "FreeBSD": "lz4", "guix": "lz4"},
+    "lz4": {"debian": "lz4", "FreeBSD": "lz4", "guix": "lz4"},
     "lzip": {"debian": "lzip", "guix": "lzip"},
     "msgunfmt": {
         "debian": "gettext",

{diffoscope-270 → diffoscope-271}/diffoscope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 270
+Version: 271
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-270 → diffoscope-271}/tests/comparators/test_epub.py

@@ -24,7 +24,9 @@ from diffoscope.comparators.zip import ZipFile
 from diffoscope.comparators.missing_file import MissingFile
 
 from ..utils.data import load_fixture, get_data
-from ..utils.tools import skip_unless_tools_exist
+from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
+
+from .test_zip import zipdetails_version
 
 
 epub1 = load_fixture("test1.epub")
@@ -46,6 +48,7 @@ def differences(epub1, epub2):
 
 
 @skip_unless_tools_exist("zipinfo", "zipdetails")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
 def test_differences(differences):
     assert differences[0].source1 == "zipinfo {}"
     assert differences[0].source2 == "zipinfo {}"

{diffoscope-270 → diffoscope-271}/tests/comparators/test_zip.py

@@ -18,11 +18,12 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import pytest
+import subprocess
 
 from diffoscope.comparators.zip import ZipFile, MozillaZipFile, JmodJavaModule
 
 from ..utils.data import load_fixture, assert_diff
-from ..utils.tools import skip_unless_tools_exist
+from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
 
@@ -39,6 +40,10 @@ test_comment1 = load_fixture("test_comment1.zip")
 test_comment2 = load_fixture("test_comment2.zip")
 
 
+def zipdetails_version():
+    return subprocess.check_output(["zipdetails", "--version"]).decode("UTF-8")
+
+
 def test_identification(zip1):
     assert isinstance(zip1, ZipFile)
 
@@ -59,6 +64,7 @@ def differences2(zip1, zip3):
 
 
 @skip_unless_tools_exist("zipinfo", "zipdetails")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
 def test_metadata(differences):
     assert_diff(differences[0], "zip_zipinfo_expected_diff")
     assert_diff(differences[1], "zip_zipdetails_expected_diff")
@@ -144,6 +150,7 @@ def comment_differences(test_comment1, test_comment2):
 
 
 @skip_unless_tools_exist("zipnote", "zipdetails")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
 def test_commented(comment_differences):
     assert_diff(comment_differences[1], "comment_zipinfo_expected_diff")
     assert_diff(comment_differences[2], "comment_zipdetails_expected_diff")

diffoscope-271/tests/data/comment_zipdetails_expected_diff

@@ -0,0 +1,48 @@
+@@ -37,15 +37,15 @@
+ 0047 Compression Method    0000 (0) 'Stored'
+ 0049 Modification Time     4D869485 (1300665477) 'Thu Dec  6 18:36:10 2018'
+ 004D CRC                   00000000 (0)
+ 0051 Compressed Size       00000000 (0)
+ 0055 Uncompressed Size     00000000 (0)
+ 0059 Filename Length       0003 (3)
+ 005B Extra Length          0018 (24)
+-005D Comment Length        0000 (0)
++005D Comment Length        0005 (5)
+ 005F Disk Start            0000 (0)
+ 0061 Int File Attributes   0000 (0)
+      [Bit 0]               0 'Binary Data'
+ 0063 Ext File Attributes   81A40000 (2175008768)
+      [Bits 16-24]          01A4 (420) 'Unix attrib: rw-r--r--'
+      [Bits 28-31]          08 (8) 'Regular File'
+ 0067 Local Header Offset   00000000 (0)
+@@ -61,20 +61,22 @@
+ 0077 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
+ 0079   Length              000B (11)
+ 007B   Version             01 (1)
+ 007C   UID Size            04 (4)
+ 007D   UID                 000003E8 (1000)
+ 0081   GID Size            04 (4)
+ 0082   GID                 000003E8 (1000)
++0086 Comment               'XXXXX'
+ 
+-0086 END CENTRAL HEADER    06054B50 (101010256)
+-008A Number of this disk   0000 (0)
+-008C Central Dir Disk no   0000 (0)
+-008E Entries in this disk  0001 (1)
+-0090 Total Entries         0001 (1)
+-0092 Size of Central Dir   00000049 (73)
+-0096 Offset to Central Dir 0000003D (61)
+-009A Comment Length        0000 (0)
++008B END CENTRAL HEADER    06054B50 (101010256)
++008F Number of this disk   0000 (0)
++0091 Central Dir Disk no   0000 (0)
++0093 Entries in this disk  0001 (1)
++0095 Total Entries         0001 (1)
++0097 Size of Central Dir   0000004E (78)
++009B Offset to Central Dir 0000003D (61)
++009F Comment Length        0007 (7)
++00A1 Comment               'XXXXXXX'
+ #
+ # Warning Count: 2
+ #
+ # Done