The NetBSD Project

CVS log for pkgsrc/sysutils/py-diffoscope/Makefile

[BACK] Up to [] / pkgsrc / sysutils / py-diffoscope

Request diff between arbitrary revisions

Default branch: MAIN

Revision 1.24 / (download) - annotate - [select for diffs], Sun Jan 28 21:04:45 2024 UTC (3 weeks, 2 days ago) by adam
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)

py-diffoscope: updated to 255

* Add/fix compatibility for Python progressbar 2.5 & 3.0 etc.
* Update copyright years.

Revision 1.23 / (download) - annotate - [select for diffs], Wed Jan 24 23:53:04 2024 UTC (3 weeks, 6 days ago) by adam
Branch: MAIN
Changes since 1.22: +2 -3 lines
Diff to previous 1.22 (colored)

py-diffoscope: updated to 254


* Reflow some code according to black.
* Add support for comparing the 'eXtensible ARchive' (.XAR/.PKG) file format.
* Add external tool on GNU Guix for 7z.

Revision 1.22 / (download) - annotate - [select for diffs], Sat Jan 20 16:03:03 2024 UTC (4 weeks, 3 days ago) by wiz
Branch: MAIN
Changes since 1.21: +3 -1 lines
Diff to previous 1.21 (colored)

py-diffoscope: add missing tools

Revision 1.21 / (download) - annotate - [select for diffs], Mon Jan 15 20:03:39 2024 UTC (5 weeks, 1 day ago) by schmonz
Branch: MAIN
Changes since 1.20: +3 -6 lines
Diff to previous 1.20 (colored)

py-diffoscope: update to 253. Changes:

- Improve DOS/MBR extraction by adding support for 7z.
  (Closes: reproducible-builds/diffoscope#333)
- Process objdump symbol comment filter inputs as the Python "bytes" type
  (and not str). (Closes: reproducible-builds/diffoscope#358)
- Add a missing RequiredToolNotFound import.
- Update copyright years.

- As UI/UX improvement, try and avoid printing an extended traceback if
  diffoscope runs out of memory. This may not always be possible to detect.
- Mark diffoscope as stable in (for Whatever diffoscope
  is, at least, not "alpha" anymore.

- If the equivalent of `file -i` returns text/plain, fallback to comparing
  this file as a text file. This especially helps when file(1) miscategorises
  text files as some esoteric type. (Closes: Debian:#1053668)
- Update copyright years.

- Fix compatibility with file 5.45. (Closes: reproducible-builds/diffoscope#351)
- Add external tool references for GNU Guix (for html2text and ttx).

- Add specialize_as() method, and use it to speed up .smali comparison in
  APKs. (Closes: reproducible-builds/diffoscope!108)
- Add documentation for the new specialize_as, and expand the documentation
  of `specialize` too. (Re: reproducible-builds/diffoscope!108)
- Update copyright years.
- Correct typos in diffoscope/presenters/

- Merge Docker "RUN" commands into single layer.

- Fix compataibility with file(1) version 5.45.
- Use assert_diff in test_uimage and test_cpio.
- xb-tool has moved in Debian bookworm.

- Add support for LLVM 16.

- Don't include file size in image metadata; it is, at best, distracting and
  it is already in the directory metadata.
- Move to using assert_diff in ICO and JPEG tests.
- Update copyright years.

- Address compatibility with python-libarchive-c version 5.
  (Closes: reproducible-builds/diffoscope#344)
- Testsuite changes:
  - Mark that test_dex::test_javap_14_differences requires procyon.
  - Fix "test skipped" textual reason generation in the case of a required
    version being outside of the required range.
  - Temporarily mark some Android-related as XFAIL due to Debian bugs
    #1040941 and #1040916.

- Drop Jenkins build reference in README.rst.
- Update FreeBSD package names
- Improve the documentation on to produce that binary blob that in the arsc

- If the binwalk Python module is not available, ensure the user knows they
  may be missing more differences in, for example, concatenated .cpio
- Factor out routine to generate a human-readable comments when
  Python modules are missing.

- Add a missing 'raise' statement dropped in 2d95ae41e. Thanks, Mattia!
- document sending out an email upon release

- Update Lintian override info format in debian/source/lintian-overrides.
- Add Lintian overrides for some "very long lines" in test cases.
- Update Lintian overrides for tests being tagged source-is-missing or
- Add Lintian override for very long lines for debian/tests/control.
- Re-add two Lintian overrides about (well-known) source-is-missing
- Drop the use of include_package_data=True in

- Fix compatibility with pypdf 3.x, and correctly restore test data.
  (Closes: reproducible-builds/diffoscope#335)
- Rework PDF annotations processing into a separate method.

- autopkgtest: fix tool name in the skippable list.

- autopkgtest: only install aapt and dexdump on architectures where they are
  available. (Closes: #1031297)
- compartors/pdf:
  + Drop backward compatibility assignment.
  + Fix flake warnings, potentially reinstating PyPDF 1.x support (untested).

- Update code to match latest version of Black. (Closes: #1031433)
- Require at least Black version 23.1.0 to run the internal Black tests.
- Update copyright years.

- Update .gitlab-ci.yml to push versioned tags to the container registry.
  (Closes: reproducible-builds/diffoscope!119)
- Fix compatibility with PyPDF2. (Closes: reproducible-builds/diffoscope#331)
- Fix compatibility with ImageMagick 7.1.
  (Closes: reproducible-builds/diffoscope#330)
- Update from PyPDF2 to pypdf. (Closes: #1029741, #1029742)
- Add support for Android resources.arsc files.
  (Closes: reproducible-builds/diffoscope!116)
- Add support for dexdump. (Closes: reproducible-builds/diffoscope#134)
- Improve DexFile's FILE_TYPE_RE and add FILE_TYPE_HEADER_PREFIX, and remove
  "Dalvik dex file" from ApkFile's FILE_TYPE_RE as well.
- Update external tool for isoinfo on guix.
  (Closes: reproducible-builds/diffoscope!124)

- test_text_proper_indentation requires at least file version 5.44.
  (Closes: reproducible-builds/diffoscope#329)

pkgsrc changes:
- Convert to

Revision 1.20 / (download) - annotate - [select for diffs], Mon Oct 23 06:37:52 2023 UTC (3 months, 4 weeks ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2023Q4-base, pkgsrc-2023Q4
Changes since 1.19: +3 -2 lines
Diff to previous 1.19 (colored)

*: update for Python base package change

Instead of depending on one of the removed packages (that are now included
in the base Python packages), include to require
a Python version that supplies them.

Remove now included packages.


Revision 1.19 / (download) - annotate - [select for diffs], Sat Jan 28 00:50:28 2023 UTC (12 months, 3 weeks ago) by khorben
Branch: MAIN
CVS Tags: pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1
Changes since 1.18: +2 -2 lines
Diff to previous 1.18 (colored)

py-diffoscope: update to 233

Changes in version 233:

[ FC Stegerman ]
* Split packaging metadata into an extras_require.json file instead of using
  the pep517 and the pip modules directly. This was causing build failures if
  not using a virtualenv and/or building without internet access.
  (Closes: #1029066, reproducible-builds/diffoscope#325)

[ Vagrant Cascadian ]
* Add an external tool reference for GNU Guix (lzip).
* Drop an external tool reference for GNU Guix (pedump).

[ Chris Lamb ]
* Split inline Python code in shell script to generate test dependencies to a
  separate Python script.
* No need for "from __future__ import print_function" import in
* Comment and tidy the new extras_require.json handling.

Changes in version 232:

[ Chris Lamb ]
* Allow ICC tests to (temporarily) fail.
* Update debian/tests/control after the addition of PyPDF 3 support.

[ FC Stegerman ]
* Update regular expression for Android .APK files.

[ Sam James ]
* Support PyPDF version 3.

Revision 1.18 / (download) - annotate - [select for diffs], Sat Jan 7 07:20:29 2023 UTC (13 months, 2 weeks ago) by khorben
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored)

py-diffoscope: update to 231

Changes in version 231:

* Improve "[X] may produce better output" messages. Based on a patch by
  Helmut Grohne. (Closes: #1026982)

Changes in version 230:

[ Chris Lamb ]
* Fix compatibility with file(1) version 5.43; thanks, Christoph Biedl.

[ Jelle van der Waa ]
* Support Berkeley DB version 6.

Revision 1.17 / (download) - annotate - [select for diffs], Wed Dec 28 03:58:58 2022 UTC (13 months, 3 weeks ago) by khorben
Branch: MAIN
Changes since 1.16: +2 -2 lines
Diff to previous 1.16 (colored)

py-diffoscope: updated to 229

Changes in 229:

[ Chris Lamb ]
* Skip if html2text is not installed.
  (Closes: #1026034)

[ Holger Levsen ]
* Bump standards version to 4.6.2, no changes needed.

Changes in 228:

[ FC Stegerman ]
* As an optimisation, don't run apktool if no differences are detected before
  the signing block. (Closes: reproducible-builds/diffoscope!105)

[ Chris Lamb ]
* Support both the python3-progressbar and python3-progressbar2 Debian
  packages, two modules providing the "progressbar" Python module.
  (Closes: reproducible-builds/diffoscope#323)
* Ensure we recommend apksigcopier. (Re: reproducible-builds/diffoscope!105)
* Make the code clearer around generating the Debian substvars and tidy
  generation of os_list.
* Update copyright years.

Changes in 227:

[ Chris Lamb ]
* Don't attempt to attach text-only differences notice if there are no
  differences to begin with. (Closes: #1024171, #1024349)
* Don't run Python decompiling tests on Python bytecode that both file(1)
  cannot yet detect and Python 3.11 cannot demarshall. (Closes: #1024335)

Revision 1.16 / (download) - annotate - [select for diffs], Wed Nov 9 22:10:20 2022 UTC (15 months, 1 week ago) by khorben
Branch: MAIN
CVS Tags: pkgsrc-2022Q4-base, pkgsrc-2022Q4
Changes since 1.15: +2 -2 lines
Diff to previous 1.15 (colored)

py-diffoscope: update to 226

Changes since 224:

[ Christopher Baines ]
* Add an lzip comparator with tests.

[ Chris Lamb ]
* Add support for comparing the "text" content of HTML files using html2text.
  (Closes: #1022209, reproducible-builds/diffoscope#318)
* Misc/test improvements:
  * Drop the ALLOWED_TEST_FILES test; it's mostly just annoying.
  * Drop other copyright notices from and
  * Use assert_diff helper in
  * Pylint tests/

[ Mattia Rizzolo ]
* Add lzip to debian dependencies.

[ Chris Lamb ]
* Add support for detecting ordering-only differences in XML files.
  (Closes: #1022146)
* Fix an issue with detecting ordering differences. (Closes: #1022145)
* Add support for ttx(1) from fonttools.
  (Re: reproducible-builds/diffoscope#315)
* Test improvements:
  - Tidy up the JSON tests and use assert_diff over get_data and manual
    assert in XML tests.
  - Rename order1.diff to json_expected_ordering_diff for consistency.
  - Temporarily allow the stable-po pipeline to fail in the CI.
* Use consistently capitalised "Ordering" everywhere we use the word in
  diffoscope's output.

Revision 1.15 / (download) - annotate - [select for diffs], Wed Nov 9 22:07:36 2022 UTC (15 months, 1 week ago) by khorben
Branch: MAIN
Changes since 1.14: +2 -3 lines
Diff to previous 1.14 (colored)

py-diffoscope: update to 224


[ Mattia Rizzolo ]
* Fix rlib test failure with LLVM 15. Thanks to Gianfranco Costamagna
  (locutusofborg) for the patch.

[ Chris Lamb ]
* The cbfstools utility is now provided in Debian via the coreboot-utils
  Debian package, so we can enable that functionality within Debian.
  (Closes: #1020630)

[ Mattia Rizzolo ]
* Also include coreboot-utils in Build-Depends and Test-Depends so it is
  available for the tests.

[ Jelle van der Waa ]
* Add support for file 5.43.

[ Mattia Rizzolo ]
* Use pep517 and pip to load the requirements. (Closes: #1020091)
* Remove old Breaks/Replaces in debian/control that have been obsoleted since

* Don't crash if we can open a PDF file with PyPDF but cannot parse the
  annotations within. (Closes: reproducible-builds/diffoscope#311)
* Depend on the dedicated xxd package, not vim-common.
* Update to reflect xxd/vim-common change.

* Support Haskell 9.x series files and update the test files to match. Thanks
  to Scott Talbert for the relevant info about the new format.
  (Closes: reproducible-builds/diffoscope#309)
* Fix a regression introduced in diffoscope version 207 where diffoscope
  would crash if one directory contained a directory that wasn't in the
  other. Thanks to Alderico Gallo for the report and the testcase.
  (Closes: reproducible-builds/diffoscope#310)

More at

Revision 1.14 / (download) - annotate - [select for diffs], Wed Jan 5 15:41:22 2022 UTC (2 years, 1 month ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1
Changes since 1.13: +4 -2 lines
Diff to previous 1.13 (colored)

python: add USE_PKG_RESOURCES flag

This flag should be set for packages that import pkg_resources
and thus need setuptools after the build step.

Set this flag for packages that need it and bump PKGREVISION.

Revision 1.13 / (download) - annotate - [select for diffs], Tue Jan 4 20:54:48 2022 UTC (2 years, 1 month ago) by wiz
Branch: MAIN
Changes since 1.12: +2 -1 lines
Diff to previous 1.12 (colored)

*: bump PKGREVISION for users

They now have a tool dependency on py-setuptools instead of a DEPENDS

Revision 1.12 / (download) - annotate - [select for diffs], Sat May 2 10:44:10 2020 UTC (3 years, 9 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2
Changes since 1.11: +1 -8 lines
Diff to previous 1.11 (colored)

sysutils/py-diffoscope: remove no-op SUBST block

diffoscope has switched to libarchive instead of depending on an external

Revision 1.11 / (download) - annotate - [select for diffs], Tue Dec 31 00:32:01 2019 UTC (4 years, 1 month ago) by ng0
Branch: MAIN
CVS Tags: pkgsrc-2020Q1-base, pkgsrc-2020Q1
Changes since 1.10: +4 -4 lines
Diff to previous 1.10 (colored)

sysutils/py-diffoscope: Update to 134


diffoscope (134) unstable; urgency=medium

  [ Chris Lamb ]
  * Ensure that autopkgtests are run with our pyproject.toml present for the
    correct "black" source code formatter settings. (Closes: #945993)
  * Tidy some unnecessary boolean logic in the ISO9660 tests.
  * Rename the "text_option_with_stdiout" to "text_option_with_stdout".
  * Include the libarchive file listing for ISO images to ensure that
    timestamps (not just dates) are visible in any difference.
    (Closes: reproducible-builds/diffoscope#81)

  [ Eli Schwartz ]
  * Fix an exception in the progressbar handler.

  [ Vagrant Cascadian ]
  * Add an external tool reference for zstd on GNU Guix.

 -- Chris Lamb <>  Fri, 27 Dec 2019 19:17:16 +0000

diffoscope (133) unstable; urgency=medium

  * Correct the substitution/filtering of paths in ELF output to avoid
    unnecessary differences depending on the path name provided on the
    commandline. (Closes: #945572)
  * Silence/correct a SyntaxWarning message due to incorrectly comparing an
    integer by identity (is) over equality (==). (Closes: #945531)

 -- Chris Lamb <>  Thu, 28 Nov 2019 10:03:33 +0000

diffoscope (132) unstable; urgency=medium

  * Allow all possible .zip variations to return with non-zero exit codes, not
    just known types we can explicitly identify (eg. Java .jmod and .jar
    files). (Closes: reproducible-builds/diffoscope#78)
  * Also permit UTF-8 encoded .dsc and .changes files.
    (Re: reproducible-builds/diffoscope#78)
  * Rework a long string of "or" statements into a loop with a "break".

 -- Chris Lamb <>  Tue, 26 Nov 2019 10:31:44 +0000

diffoscope (131) unstable; urgency=medium

  * Clarify in the HTML and text outputs that the limits are per output format,
    not global. (Closes: #944882, reproducible-builds/diffoscope#76)
    - Bump the previous "max_page_size" limit from 400 kB to 4 MB.
  * Update an Android manifest test to reflect that parsed XML attributes are
    returned in a sorted or otherwise novel manner under Python 3.8.
  * Update code to reflect version 19.10b0 of the black source code
    reformatter and don't run our self-test for versions earlier than this as
    it will generate different results and thus fail.
  * Limit .dsc and .buildinfo matching; don't attempt to compare them as
    ELF sections or similar. (Closes: reproducible-builds/diffoscope#77)
  * Add a comment that the text_ascii{1,2} test fixture files are used in
    multiple places so are not trivial to generate on the fly.

 -- Chris Lamb <>  Sat, 23 Nov 2019 15:22:51 -0500

diffoscope (130) unstable; urgency=medium

  [ Chris Lamb ]
  * debian/tests/basic-command-line:
    Move from deprecated ADTTMP to AUTOPKGTEST_TMP.
  * Correct the matching of R .rds files by also detecting newer versions
    of this file format.
  * Drop unused BASE_DIR global in the tests.
  * Try and ensure that new test data files are generated dynamically, ie.
    at least no new ones are added without "good" reasons.
  * Truncate the tcpdump expected diff to 8KB (from ~600KB).
  * Refresh OCaml test fixtures to support OCaml >= 4.08.1.  Closes: #944709
  * Correct reference to the ".rdx" extension in a comment.
  * Update XML test for Python 3.8+.
  * Don't use line-base dbuffering when communucating with subprocesses
    in binary mode. (Closes: reproducible-builds/diffoscope#75)

  [ Jelle van der Waa ]
  * Add support for comparing .zst files are created by zstd.
    (Closes: reproducible-builds/diffoscope!34)

 -- Mattia Rizzolo <>  Thu, 14 Nov 2019 11:22:20 +0100

diffoscope (129) unstable; urgency=medium

  * Call R's "deparse" function to ensure that we do not error out and revert
    to a binary diff when processing .rdb files with internal "vector" types as
    they do not automatically coerce to strings.
  * Add the ability to pass Python bytestrings to external commands and
    pass our long script to parse R .rdb files using this new method over a
    long command-line argument
  * Use Rscript's --vanilla option over --no-environ as this also enables
    --no-save, --no-restore, --no-site-file and --no-init-file.
  * Improve command-line error messages:
    - Split out formatting into a separate utility function.
    - Truncate very long lines when displaying them as an external source
      of data.
    - When printing an error from a command, format the command for the user.
  * Use "exit code" over "return code" when referring to UNIX error codes in
    displayed differences.

 -- Chris Lamb <>  Mon, 28 Oct 2019 11:15:18 +0000

diffoscope (128) unstable; urgency=medium

  * Query the container for the full path of the parallel R .rdx file for a
    .rdb file as well as looking in the same directory. This ensures that
    comparing two .deb/.changes files shows a varying path introduced in
    version 127.

 -- Chris Lamb <>  Fri, 25 Oct 2019 09:21:40 +0100

diffoscope (127) unstable; urgency=medium

  [ Chris Lamb ]
  * Move build-dependency on python-argcomplete to the Python 3.x version to
    facilitate Python 2.x removal. (Closes: #942967)
  * Overhaul the handling of GNU R .rdb files:
    - Rework and refactor the handling of .rdb files specifically with respect
      to locating the parallel .rdx file prior to inspecting the file to ensure
      that we do not add files to the user's filesystem in the case of directly
      comparing two .rdb files or, worse, overwriting a file in is place.
    - Use a ("""-formatted) docstring for our internal R script to dump
    - Mask/hide standard errors; R will often produce noisy output that is not
      useful to us.
    - Don't include a useless and misleading "NULL".
    - Include all R object names are displayed, including ones beginning with a
      fullstop (".").
    - Sort package fields when dumping data for output stability.
    - Format package contents as "foo = bar" rather than using ugly and
      misleading brackets.
    - Include the object's type when dumping package contents.
    - Never read the site or user's R location environment configuration to
      ensure output stability.
    - Expose absolute paths in the semantic/human-readable output, preventing
      falling back to a useless hexdump.
  * Improve the formatting of command lines:
    - Ensure newlines and other metacharacters appear escaped as "\n", etc.
    - Use the newline (etc.) escaped version of the commandline being executed in
      logging/debug output.
    - When displaying standard error, ensure use the escaped version too.
  * Add support for easily masking the standard error of commands and use this
    in the ffprobe comparator.
  * To match the libarchive container, raise a KeyError exception if we request
    an invalid member from a directory container.
  * Correct string representation output in the traceback when we cannot locate
    a specific item in a container.

  [ Mattia Rizzolo ]
  * Run Debian autopkgtests against all Python versions.

 -- Chris Lamb <>  Thu, 24 Oct 2019 15:59:34 +0100

diffoscope (126) unstable; urgency=medium

  [ Chris Lamb ]
  * Track and report on missing Python modules.
    (Closes: reproducible-builds/diffoscope#72)
  * Drop some unnecessary control flow.
  * Drop explicit inheriting from 'object' class; unnecessary in Python 3.
  * Bump Standards-Version to 4.4.1.

  [ Mattia Rizzolo ]
  * Exit with 2 instead of 1 in case of no disk space.

 -- Chris Lamb <>  Mon, 14 Oct 2019 12:29:47 -0700

diffoscope (125) unstable; urgency=medium

  * The test_libmix_differences ELF test requires xxd. (Closes: #940645)

 -- Chris Lamb <>  Wed, 18 Sep 2019 11:44:57 +0200

diffoscope (124) unstable; urgency=medium

  [ Chris Lamb ]
  * Also conditionally skip the identification and "no differences" tests as we
    require the Ocaml compiler to be present when building the test files
    themselves. (Closes: #940471)

  [ Mattia Rizzolo ]
  * Permit all sorts of version suffixes when checking the Debian package
    version matches, not just for backports. (Closes: #939387)

  [ Vagrant Cascadian ]
  * Add external tools on GNU Guix for odt2txt, sng and pgpdump.

  [ Marc Herbert ]
  * Remove StaticLibFile in the ELF comparator -- ArFile.compare_details() is
    superior. (Closes: reproducible-builds/diffoscope#64)

 -- Chris Lamb <>  Tue, 17 Sep 2019 12:19:07 +0200

diffoscope (123) unstable; urgency=medium

  [ Chris Lamb ]
  * Build OCaml test input files on-demand rather than shipping them with the
    package in order to prevent test failures with OCaml 4.08.
    (Closes: #939386)
  * Update test skipping messages:
    - When skipping tests due to the lack of installed tool, print the package
      that may provide it.
    - Update "requires foo module" messages to clarify that they are regarding
      Python modules, not packages.
  * Rebuild the test squashfs images to exclude the character device as they
    requires root or fakeroot to extract. (reproducible-builds/diffoscope#65)
  * Remove accidentally-committed test fixture generation code from tests.
  * Set long_description_content_type to 'text/x-rst' in to appease
    the linter.

  [ Mattia Rizzolo ]
  * Don't crash when the progress is requested but the Python module is
    missing. (Closes: #939085)

  [ Vagrant Cascadian ]
  * Add external tools for gifbuild, javap and kbxutil in GNU Guix.

  [ Marc Herbert ]
  * In the cbfs tests, add a "Comp" column test to support Coreboot
    utils > 4.6.

 -- Chris Lamb <>  Sat, 07 Sep 2019 14:16:31 +0100

diffoscope (122) unstable; urgency=medium

  [ Chris Lamb ]
  * Apply patch from László Böszörményi to update the squashfs test output and
    bump the required version for the test itself. (Closes: #935684)
  * Skip calls to unsquashfs when we are not root or fakeroot.
    (Re: reproducible-builds/diffoscope#63)
  * Include either standard error or standard output (and not just the latter)
    if/when an external command fails.
  * Fix a few unicode/bytes issues:
    - Avoid a possible traceback caused by a str/bytes confusion when handling
      the output of failing external commands.
    - Ensure that all of our artificially-created subprocess.CalledProcessError
      instances have `output` instances that are bytes objects, not str.
  * Improve debugging output:
    * Add the containing module name to the (eg.) "Using StaticLibFile for ..."
    * Improve and condense output when creating our Comparator object types.
  * Correct a reference to `parser.diff` as `diff` in this context is a Python
    function in the module, not the actual output returned from diff(1).
  * Add the "wabt" Debian package to the test dependencies so that we run the
    wasm tests.

  [ Mattia Rizzolo ]
  * Now that we test-require wabt, expect that its tools to be available during

 -- Chris Lamb <>  Fri, 30 Aug 2019 08:52:25 +0100

diffoscope (121) unstable; urgency=medium

  * Don't fallback to a (useless) raw hexdump when readelf(1) reports an minor
    issue in a section in an ELF binary. For example, when the "frames" section
    is of the "NOBITS" type, its contents are apparently "unreliable" and thus
    readelf(1) exits with a returncode of 1. (Closes: #849407, #931962)
  * Add support to Difference.from_command_exc and friends to optionally ignore
    specified returncodes from the called program and treat them as "no"
  * Simplify the parsing of the optional "command_args" argument to the
    from_command and from_command_exc methods in the Difference class.

 -- Chris Lamb <>  Fri, 16 Aug 2019 09:49:07 -0700

diffoscope (120) unstable; urgency=medium

  * No-change sourceful after accidentally uploading binaries in order to
    migration to testing.

 -- Chris Lamb <>  Mon, 29 Jul 2019 17:17:46 -0300

diffoscope (119) unstable; urgency=medium

  [ Chris Lamb ]
  * If a command fails to execute but does not print anything to standard
    error, try and include the first line of standard output in the message we
    include in the diff. This was motivated by readelf(1) returning its error
    messages on stdout. (Closes: #931963)
  * Add support for Java ".jmod" modules. Not all versions of file(1) support
    detection of Jmod files yet, so we perform a manual comparison instead.
    (Closes: #933308)
  * Re-add "return code" noun to "Command `foo` exited with X" error messages.
  * Factor out the ability to ignore the exit codes of "zipinfo" and
    "zipinfo -v" in the presence of non-standard headers.
  * Only override the exit code from our special-cased calls to zipinfo(1) if
    they are 1 or 2 to avoid potentially masking real errors.
  * Also add missing textual description entries for ZipFile and
    MozillaZipFile file types.
  * Skip extra newline in "Output:\n<none>".
  * Cease ignoring test failures in stable-backports.
  * Bump debhelper compat level to 12.

  [ Marc Herbert ]
  * Catch failures to disassemble and rescue all other differences.
    (Closes: reproducible-builds/diffoscope!29)

 -- Chris Lamb <>  Mon, 29 Jul 2019 15:22:24 -0300

diffoscope (118) unstable; urgency=medium

  * Don't fail in autopkgtests when, for example, we do not have sufficiently
    newer or older version of file. (Closes: #931881)
  * Also include python3-tlsh in test dependencies.
    - Merge two previously-overlapping environment variables.
    - Use repr(..)-style output when printing test status.
    - Add some explicit return values to appease pylint.

 -- Chris Lamb <>  Sat, 13 Jul 2019 10:23:29 -0300

diffoscope (117) unstable; urgency=medium

  [ Chris Lamb ]
  * Add support for file 5.37. Thanks again to Christoph Biedl for the heads-up
    in advance. (Closes: reproducible-builds/diffoscope/#57)
  * Apply patch from Gianfranco Costamagna to fix autopkgtest failures in
    Debian. (Closes: #931709)

  [ Holger Levsen ]
  * debian/control: Bump Standards-Version to 4.4.0.

 -- Chris Lamb <>  Tue, 09 Jul 2019 10:24:54 -0300

diffoscope (116) unstable; urgency=medium

  [ Chris Lamb ]
  * Upload to unstable after the release of Debian "buster".
  * README.rst & manual page generation:
    - Strip out manpage-only parts of the README rather than using "only"
      reStructuredText directives in order to support the demands of the latest
      PyPI website.
    - Use "real" reStructuredText comments instead of using the "raw" directive.
  * Dockerfile:
    - Build the Docker image from the current Git checkout, not the Debian
      archive. (reproducible-builds/diffoscope#56)
    - Use the ENTRYPOINT directive with the JSON syntax instead so we pass all
      arguments to the underlying diffoscope executable.
  * Document that run_diffoscope should not be considered a stable API.

  [ Mattia Rizzolo ]
  * Rename a test function to prevent shadowing a previous one with the
    same name.
  * Add ffmpeg to the list of Debian build-dependencies for the testsuite.

  [ Vagrant Cascadian ]
  * Add support for known external tools in GNU Guix.

 -- Chris Lamb <>  Sun, 07 Jul 2019 11:54:29 -0300

diffoscope (115) experimental; urgency=medium

  [ Chris Lamb ]
  * Fix execution of symbolic links that point to the "bin/diffoscope" entry
    point by fully resolving the location.
  * Add a Dockerfile.
  * Update contributing messages with instructions regarding the Docker image.

  [ Mattia Rizzolo ]
  * tests:
    + Allow specifying which tools are known missing using
    + With DIFFOSCOPE_TESTS_FAIL_ON_MISSING_TOOLS=1, actually fail only tests
      that are missing the required tools.
  * debian:
    + Add black to the test dependencies.
    + Enforce the "fail on missing tools" only when testing with all the
      recommended packages.
    + Ack some missing tools during autopkgtest.
    + Reinstate oggvideotools and procyon-decompiler test dependencies,
      now that are not buggy anymore.

 -- Mattia Rizzolo <>  Tue, 21 May 2019 16:02:02 +0200

diffoscope (114) experimental; urgency=medium

  [ Chris Lamb ]
  * Add support for GnuPG "keybox" files. Thanks to Daniel Kahn Gillmor for the
    suggestion. (Closes: #871244, reproducible-builds/diffoscope#23)
  * Always warn if tlsh module is not available (not just if a specific
    fuzziness threshold is specified) to match the epilog of the --help output.
    This prevents missing support for file rename detection.
    (Closes: #888237, reproducible-builds/diffoscope#29)
  * Treat missing tools on Debian autopkgtests as individual test failures by
    checking whether a new DIFFOSCOPE_TESTS_FAIL_ON_MISSING_TOOLS environment
    variable is exported. (Closes: #905885, reproducible-builds/diffoscope#35)
  * Require that "-" is explicitly specified to read a single diff from
    standard input to avoid non-intuitive behaviour when diffoscope is called
    without any arguments. (Closes: reproducible-builds/diffoscope#54)
  * Make --use-dbgsym a ternary operator to make it easier to totally disable.
    Thanks to Mattia Rizzolo for the suggestion.
  * Consolidate on "e" as the aliased exception name.

  [ Milena Boselli Rosa ]
  * Various fixes to the HTML markup to prevent validation warnings/errors:
    - Prevent empty values for the "name" attribute name on HTML anchor tags,
      and add an "id" to its parent "div" container.
    - Fix "table column x established by element 'col' has no cells beginning
      in it" warnings.
    - Fix "Text run is not in Unicode Normalization Form C".
    - Remove the "type" HTML attribute from <style> elements.

  [ Vibhu ]
  * Fail more gracefully when running out of diskspace. (Closes: #874582)

 -- Chris Lamb <>  Sun, 28 Apr 2019 17:21:46 +0100

diffoscope (113) unstable; urgency=medium

  * Replace over 8 MB of Android boot ROM test suite fixtures with 14 KB
    equivalents. (Closes: #894334, reproducible-builds/diffoscope#13)
  * Compare .asc PGP signatures as text, not as a hexdump. (Closes: #908991,
  * Improve the displayed comment when falling back to a binary diff to include
    the file type. (Closes: reproducible-builds/diffoscope#49)
  * Explicitly mention when the guestfs module is missing at runtime and we are
    falling back to a binary diff. (Closes: reproducible-builds/diffoscope#45)
  * Provide explicit help when the libarchive system package is missing or
    "incomplete". (Closes: reproducible-builds/diffoscope#50)
  * Improve the --help outout:
    * Indent and wrap the list of supported file formats.
    * Include links to the diffoscope homepage and bug tracker.
    * Refer to the Debian package names when indicating how to obtain the tlsh
      and argcomplete modules.
  * Drop "DOS/MBR" source string test.
  * Correct a "recurse" typo.
  * Adopt the "black" <> source code formatter:
    - Add an initial configuration in a PEP 518 pyproject.toml file and update to include pyproject.toml in future release tarballs.
    - Run the formatter against the source.
    - Test that the source code satisfies the formatter.

 -- Chris Lamb <>  Mon, 04 Mar 2019 23:00:38 +0100

diffoscope (112) unstable; urgency=medium

  [ Chris Lamb ]
  * New features:
    - Add a --exclude-directory-metadata=recursive option to support ignoring
      timestamp differences (etc.) in nested archives/containers.
      (Closes: #907600, reproducible-builds/diffoscope#36)
    - Add support for comparing metadata in MP3 files.
      (Closes: reproducible-builds/diffoscope#43)
    - Add support for comparing .crx Chrome browser extensions.
      (Closes: reproducible-builds/diffoscope#41)

  * Bug fixes:
    - Catch tracebacks when mounting invalid filesystem images under guestfs.
    - Ensure both WASM test data files are actually unique.
      (Closes: reproducible-builds/diffoscope#42)
    - Replace literal xxd(1) output in tests/data/hello.wasm with its binary
      equivalent. (Closes: reproducible-builds/diffoscope#47)

  * Misc improvements:
    - Rework and comment logic determining a default for
    - Fix a number of Ghostscript-related test issues regarding the update of
      this package from 9.20 to 9.26 in Debian "stable".

  [ Mattia Rizzolo ]
  * Make test_ps.test_text_diff pass with ghostscript 9.26.

  [ Ed Maste ]
  * Include relocation information in objdump disassembly.
    (Closes: reproducible-builds/diffoscope#48)

  [ Graham Christensen ]
  * Clarify notice if no file-specific diff caused fallback. (MR: !19)

 -- Chris Lamb <>  Tue, 19 Feb 2019 09:56:29 +0100

diffoscope (111) unstable; urgency=medium

  * Fix a regression introduced via #920701 where we stopped using the -dbgsym
    packages when comparing .buildinfo or .changes files. (Closes:

 -- Chris Lamb <>  Sun, 10 Feb 2019 13:09:26 +0100

diffoscope (110) unstable; urgency=medium

  [ Chris Lamb ]
  * Don't look for adjacent -dbgsym package files automatically anymore to
    align better with default user expectations. The existing behaviour can be
    re-enabled by specifying the new `--use-dbgsym` flag. (Closes: #920701)
  * Don't crash with if we were unable to successfully extract a
    "guestfs"-based file. (Closes: #901982)
  * Avoid clumsy profiling title length calculations by moving to Markdown
    syntax, from reStructuredText.
  * Drop printing out dpkg-query output when running tests: it's rather noisy
    and has not helped yet in reproducing an error.
  * Re-enable gnumeric as a Build-Depends.
  * debian/rules: Use str.format over "+" for string concatenation.

  [ Jelle van der Waa ]
  * comparators.wasm: Remove an unused "re" import. (MR: !18)

  [ Mattia Rizzolo ]
  * comparators/elf: Apply flake8.

 -- Chris Lamb <>  Wed, 06 Feb 2019 17:33:09 +0100

Revision 1.10 / (download) - annotate - [select for diffs], Fri Apr 26 13:14:15 2019 UTC (4 years, 9 months ago) by maya
Branch: MAIN
CVS Tags: pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

Omit mentions of python 34 and 35, after those were removed.

- Includes some whitespace changes, to be handled in a separate commit.

Revision 1.9 / (download) - annotate - [select for diffs], Sat Apr 6 17:53:53 2019 UTC (4 years, 10 months ago) by maya
Branch: MAIN
Changes since 1.8: +3 -1 lines
Diff to previous 1.8 (colored)

py-diffoscope: needs py-curses, bump PKGREVISION

Revision 1.8 / (download) - annotate - [select for diffs], Sat Feb 9 14:13:25 2019 UTC (5 years ago) by khorben
Branch: MAIN
CVS Tags: pkgsrc-2019Q1-base, pkgsrc-2019Q1
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)

Update sysutils/py-diffoscope to version 110

The list of changes since version 94 are:

diffoscope 110:

  [ Chris Lamb ]
  * Don't look for adjacent -dbgsym package files automatically anymore to
    align better with default user expectations. The existing behaviour can be
    re-enabled by specifying the new `--use-dbgsym` flag. (Closes: #920701)
  * Don't crash with if we were unable to successfully extract a
    "guestfs"-based file. (Closes: #901982)
  * Avoid clumsy profiling title length calculations by moving to Markdown
    syntax, from reStructuredText.
  * Drop printing out dpkg-query output when running tests: it's rather noisy
    and has not helped yet in reproducing an error.
  * Re-enable gnumeric as a Build-Depends.
  * debian/rules: Use str.format over "+" for string concatenation.

  [ Jelle van der Waa ]
  * comparators.wasm: Remove an unused "re" import. (MR: !18)

  [ Mattia Rizzolo ]
  * comparators/elf: Apply flake8.

diffoscope 108:

  [ Chris Lamb ]
  * test_icc: Calculate the path to a test .icc file using data() rather than
    using the pytest fixture itself to avoid a "Fixtures are not meant to be
    called directly" warning/error. (Closes: #916226)
  * Fix a test_mozzip_compressed_files test failure under Alpine Linux.
    (Closes: #916353, MR: !8)
  * Output improvements:
    * Prefer to comment that files are identical rather than having a
      "fuzziness score" of zero.
    * Expand the padding/spacing for "N calls" in the profiling output; having
      99,999+ calls to cmp(1) is not uncommon for ISOs.
    * Add a note to the "Files similar despite different names" comment to
      clarify that a lower score is more similar.
  * Use File.file_header to tidy JSON matching in the json, ppu and wasm
  * Drop debbindiff Breaks/Replaces; was removed in 2015, never part of a
    stable release, etc.
  * Correct a "positives" typo.

  [ Joachim Breitner ]
  * Add support for comparing WebAssembly modules. (MR: !17)

  [ Holger Levsen ]
  * Bump Standards-Version to 4.3.0
  * Clarify that (upstream) issues should be reported via the
    issue tracker on

  [ Mattia Rizzolo ]
  * Try matching for MozillaZipFile before ZipFile.

diffoscope 107:

  * Compare .zip file comments with zipnote. (Closes: #901757)
  * Don't emit a large number of warnings if getfacl(1) is not available. This
    makes the behaviour consistent with if lsattr(1) is unavailable.
    (Closes: #902369)

diffoscope 106:

  [ Chris Lamb ]
  * comparators:
    + elf: Don't assume all files called ".a" are ELF binaries.  Closes: #903446
    + pdf:
      - Display the reason when cannot extract metadata from PDF files.
      - Prevent tracebacks when obtaining PDF metadata from files with multiple
        PDF dictionary definition entries.  Closes: #913315

  [ Marius Gedminas ]
  * Add a python_requires to

  [ Mattia Rizzolo ]
  * debian:
    + Disable depends on gnumeric and procyon as they are RC buggy.
    + Override the new lintian's public-upstream-key-in-native-package.

diffoscope 105:

  [ Chris Lamb ]
  * tests:
    + Prevent test failures when running under stretch-backports by checking
      the ocaml version number.  Closes: #911846

  [ Mattia Rizzolo ]
  * debian: Reinstate apktool Build-Depends and Test-Depends.
  * Fix some flake8 and deprecation warnings.

  [ Daniel Shahaf ]
  * comparators/pcap:
    + Fix recognition with the upcoming file(1) 5.35.  Closes: #912756
      Thanks to Christoph Biedl for the heads-up in advance.

  [ Will Thompson ]
  * Add a new command line flag --list-missing-tools.  MR: !14

diffoscope 104:

  [ Chris Lamb ]
  * comparators:
    + macho: Prevent a traceback if the filename cannot be found on the line.
      Closes: #910540
    + ocaml New comparator OCaml files using ocamlobjinfo.  Closes: #910542
    + pdf: Add support for comparing metadata using PyPDF2.  Closes: #911446
  * debian/tests/ Add note on how to regenerate this file.

  [ Mattia Rizzolo ]
  * d/control:
    + Build-Depend on linux-image-amd64 [amd64] to allow squashfs tests to run.
    + Add a Build-Conflicts against graphicsmagick-imagemagick-compat.
      See: #910652
  * Move the list of optional python packages from d/rules into, and
    have dh_python3 check the generated requires.txt.
  * Also add the optional python modules to the autopkgtest dependencies.
  * Temporarily drop Build-Depends and Test-Depends on apktool and
    oggvideotools, as they are not available in buster at the moment.
  * comparators:
    + java:
      - Rename the tool procyon-decompiler to procyon.
      - Properly fall back from procyon to javap also when procyon exists
        but doesn't return any output.
  * Declare in that diffoscope is good to go with Python 3.7.

  [ Marek Marczykowski-Górecki ]
  * comparators:
    + fsimage: Handle FAT filesystems.  MR: !13

diffoscope 103:

  [ Mattia Rizzolo ]
  * In Debian, list liblz4-tool as an alternative to the lz4 package.
    stretch only has the former.

  [ Chris Lamb ]
  * Strip trailing whitespace from ssconvert(1) output to support
    gnumeric 1.12.43.

diffoscope 102:

  [ Chris Lamb ]
  * Fix tests under colord >= 1.4.3.  Closes: #908900

  [ Xavier Briand ]
  * Add an "Add a comparator" section in CONTRIBUTING.  MR: !9

  [ Mattia Rizzolo ]
  * debian: Use the new debhelper-compat(=11) build dep and drop d/compat.

  [ Marek Marczykowski-Górecki ]
  * comparators/json: Try fuzzy matching for non-text files too.
    This avoids loading very large file just to discover they aren't JSON.
    Closes: #909122

diffoscope 101:

  * Fix testsuite under LLVM >= 7.0. (Closes: #908074)
  * Substvar generation:
    - Ensure Debian substvar generation is deterministic regardless of
      installed packages. (Closes: #908072)
    - Clarify distinction between tools (eg. gpg) and packages (eg. gnupg) when
      generating Debian substvars.
    - Revert updating generated debian/tests/control made in diffoscope 100.
  * Disable binwalk's own user configuration for predictable results and to
    ensure it does not create unnecessary directories. (Closes: #903444)
  * Ensure we return "bytes" objects from Command.filter to avoid a
    "TypeError: Unicode-objects must be encoded before hashing" traceback.
  * Don't print GPG output in diffoscope.changes.

diffoscope 100:

  [ Alexis Murzeau ]
  * Correct matching of .deb archive members. (Closes: #903565)

  [ Chris Lamb ]
  * Support .deb archives that contain an uncompressed control.tar and data.tar
    Thanks to Roderich Schupp <>.
    (Closes: #903391, #903401)
  * Wrap jsondiff calls with try-except to prevent fatal errors.
    (Closes: #903447, #903449)
  * Don't include the filename in llvm-bcanalyzer results. (Closes: #905598)
  * Update generated debian/tests/control.
  * Bump Standards-Version to 4.2.1.

  [ Daniel Kahn Gillmor ]
  * Avoid line eraser error on dumb terminals. (Closes: #906967)
  * Correct spelling of ereser to eraser.

  [ Mattia Rizzolo ]
  * On Debian, do not require apktool on ppc64el and s390x, ogvideotools on
    s390x and fp-utils on ppc64el and s390x as they are not installable there.
  * Explicitly add `file` to the dependencies of autopkgtest to have the tests
    triggered whenever `file` changes

  [ Ricardo Gaviria ]
  * Handle errors with encrypted archive files. (Closes: #904685)

diffoscope 99:

  [ Xavier Briand ]
  * Add lz4 comparator.  Closes: #901548; !4

  [ Paul Wise ]
  * Clear the progress bar after completion.  Closes: #901758
    Handle terminals that do not support erasing the line by filling the
    terminal with spaces.  Ignore output devices that are not terminals.
  * Do not delete the current terminal line for every progress bar update.
    The erasure was also causing the progress bar to flicker.

  [ Mattia Rizzolo ]
  * Add a gitlab CI script.  !8
  * tempfiles:
    + Set the base directory only if the caller didn't specify one already.
    + Do not append '_diffoscope' to the temporary file names, as they are now
      all in their namespaced directory already.
    + Empty the list of known tempfiles after removing them.  Closes: #902709
  * external_tools:
    + Fix package name, s/xmlutils/xmlbeans/.
  * tests/test_tools: fix test if /sbin contains a directory.  MR: !2
    Thanks to Chris Lamb <> for the patch.
  * logging:
    + Move the computation of the terminal line eraser into
    + Always clean the line before printing a log message
  * main:
    + Clean the terminal line before printing a traceback.
    + Be sure to print 'Keyboard Interrupt' if that happens.
  * comparators:
    + Do not shadow the original import errors.  MR: !7
  * d/control:
    + Bump Standards-Version to 4.1.5, no changes needed.
    + Add Build-Dependency on procyon-decompiler, to run the tests.
  * d/tests:
    + Autogenerate d/tests/control with all the recommends listed as
      dependencies, so autopkgtest is appropriately triggered whenever one of
      those packages changes.  Closes: #902920

  [ anthraxx ]
  * comparators.utils:libarchive:
    + Add compatibility code for python-libarchive >= 2.8.  MR: !6

diffoscope 98:

  * Fix compatibility with Python 3.7. (Closes: #902650)

diffoscope 97:

  * Create all temporary directories within a top-level dir. (Closes: #902627)
  * tests/ Fix compatibility with pytest 3.6.2-1, currently in
    Debian experimental.

diffoscope 96:

  [ Chris Lamb ]
  * Drop dependency on pdftk as it relies on GCJ, relying on the pdftotext
    fallback. (Closes: #893702)
  * Change the "No file format specific differences found inside, yet data
    differs" message to be clearer that diffoscope "knows" about this file
    format yet could not be helpful in this case.
  * Don't append a rather useless "(data)" suffix from file(1).
  * Comply with a number of PEP8 recommendations:
    - E226 - Add missing whitespaces around operators.
    - E241 - Fix extraneous whitespaces around keywords.
    - E251 - Remove whitespace around parameter '=' signs.
    - E302 - Add missing 2 blank lines.
    - E501 - Try to make lines fit to length.
    - E502 - Remove extraneous escape of newline.
    - E731 - Don't assign lambda expressions.
    - E121, E122, E126, E128 - Fix badly indented lines.

  [ Xavier Briand ]
  * Add merge request details to contributing documentation.

diffoscope 95:

  [ Mattia Rizzolo ]
  * tests:
    + test_binary: Don't capture unused output from subprocess.
    + test_git: Fix test failure on FreeBSD.  Closes: #872826
      Thanks to Ximin Luo <> for the initial patch
  * Fix handling of filesnames with non-unicode chars.  Closes: #898022
  * diff: Use bytes as much as possible, to prevent possible encoding issues.
  * d/control: Make the dependency on python3-distutils an alternative on the
    previous versions of libpython3.*-stdlib that used to ship it.
    Closes: #898683
  * d/watch: Update URL to the new archive.

  [ Chris Lamb ]
  * The Git repository has been migrated to salsa, update all the references.
  * Drop extra whitespace in supported file format output.

Revision 1.7 / (download) - annotate - [select for diffs], Wed May 16 06:54:51 2018 UTC (5 years, 9 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2
Changes since 1.6: +4 -3 lines
Diff to previous 1.6 (colored)

py-diffoscope: updated to 94

Bug fixes.

Revision 1.6 / (download) - annotate - [select for diffs], Fri Dec 1 09:02:07 2017 UTC (6 years, 2 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

py-diffoscope: updated to 88:

bug fixes.

Revision 1.5 / (download) - annotate - [select for diffs], Tue Oct 17 08:35:34 2017 UTC (6 years, 4 months ago) by wiz
Branch: MAIN
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)

py-diffoscope: needs python-3.5 or newer

Revision 1.4 / (download) - annotate - [select for diffs], Mon Oct 16 09:53:42 2017 UTC (6 years, 4 months ago) by adam
Branch: MAIN
Changes since 1.3: +6 -7 lines
Diff to previous 1.3 (colored)

py-diffoscope: update to 87

Bug fixes.

Revision 1.3 / (download) - annotate - [select for diffs], Tue Dec 13 15:44:59 2016 UTC (7 years, 2 months ago) by khorben
Branch: MAIN
CVS Tags: pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4
Changes since 1.2: +3 -2 lines
Diff to previous 1.2 (colored)

Update diffoscope to version 63

This adds a dependency on devel/colordiff.

Changelog for this version:

  * Greatly improve speed for large archives by fixing O(n^2) complexity for
    archive member lookup.
    - There is still O(n^2) complexity for archive member extraction, but this
      is less noticeable for various reasons and would require more complexity
      to fix, so for now is left as a task for the future.
  * Text output: add coloured diff support via colordiff(1).
  * Html-dir output: add +/- buttons to fold sub-diffs (i.e. toggle their
    visibility) as well as the whole diff itself. As with similar features in
    other programs, the effect affects all descendants if you shift-click.

The complete list of changes between version 44 and 63 can be found at

Revision 1.2 / (download) - annotate - [select for diffs], Sun Aug 28 15:48:34 2016 UTC (7 years, 5 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2016Q3-base, pkgsrc-2016Q3
Changes since 1.1: +1 -3 lines
Diff to previous 1.1 (colored)

Remove unnecessary PLIST_SUBST and FILES_SUBST that are now provided
by the infrastructure.

Mark a couple more packages as not ready for python-3.x.

Revision 1.1 / (download) - annotate - [select for diffs], Sun Dec 27 15:43:59 2015 UTC (8 years, 1 month ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1

Import py-diffoscope-44 as sysutils/py-diffoscope.

diffoscope will try to get to the bottom of what makes files or
directories different. It will recursively unpack archives of many kinds
and transform various binary formats into more human readable form to
compare them. It can compare two tarballs, ISO images, or PDF just as

It can be scripted through error codes, and a report can be produced
with the detected differences. The report can be text or HTML.
When no type of report has been selected, diffoscope defaults
to write a text report on the standard output.

diffoscope will exit with 0 if there's no differences and 1 if there
are. An HTML report can be produced with the detected differences.

diffoscope is developed as part of the "reproducible builds" Debian
It is meant to be able to quickly understand why two builds of the same
package produce different outputs. diffoscope was previously named

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

CVSweb <>