py-diffoscope: update to 253. Changes: 253: - 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. 252: - 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 setup.py (for PyPI.org). Whatever diffoscope is, at least, not "alpha" anymore. 251: - 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. 250: - Fix compatibility with file 5.45. (Closes: reproducible-builds/diffoscope#351) - Add external tool references for GNU Guix (for html2text and ttx). 249: - 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/utils.py. 248: - Merge Docker "RUN" commands into single layer. 247: - Fix compataibility with file(1) version 5.45. - Use assert_diff in test_uimage and test_cpio. - xb-tool has moved in Debian bookworm. 246: - Add support for LLVM 16. 245: - 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. 244: - 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. 243: - Drop Jenkins build reference in README.rst. - Update FreeBSD package names - Improve the documentation on to produce that binary blob that in the arsc comparator. 242: - If the binwalk Python module is not available, ensure the user knows they may be missing more differences in, for example, concatenated .cpio archives. - Factor out routine to generate a human-readable comments when Python modules are missing. 241: - Add a missing 'raise' statement dropped in 2d95ae41e. Thanks, Mattia! - document sending out an email upon release 240: - 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 prebuilt. - Add Lintian override for very long lines for debian/tests/control. - Re-add two Lintian overrides about (well-known) source-is-missing instances. - Drop the use of include_package_data=True in setup.py. 239: - Fix compatibility with pypdf 3.x, and correctly restore test data. (Closes: reproducible-builds/diffoscope#335) - Rework PDF annotations processing into a separate method. 238: - autopkgtest: fix tool name in the skippable list. 237: - 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). 236: - 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. 235: - 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) 234: - test_text_proper_indentation requires at least file version 5.44. (Closes: reproducible-builds/diffoscope#329) pkgsrc changes: - Convert to wheel.mk.diff -r1.20 -r1.21 pkgsrc/sysutils/py-diffoscope/Makefile
(schmonz)
@@ -1,35 +1,32 @@ | @@ -1,35 +1,32 @@ | |||
1 | # $NetBSD: Makefile,v 1.20 2023/10/23 06:37:52 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2024/01/15 20:03:39 schmonz Exp $ | |
2 | 2 | |||
3 | DISTNAME= diffoscope-233 | 3 | DISTNAME= diffoscope-253 | |
4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= sysutils python | 5 | CATEGORIES= sysutils python | |
7 | MASTER_SITES= ${MASTER_SITE_PYPI:=d/diffoscope/} | 6 | MASTER_SITES= ${MASTER_SITE_PYPI:=d/diffoscope/} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://diffoscope.org/ | 9 | HOMEPAGE= https://diffoscope.org/ | |
11 | COMMENT= In-depth comparison of files, archives, and directories | 10 | COMMENT= In-depth comparison of files, archives, and directories | |
12 | LICENSE= gnu-gpl-v3 | 11 | LICENSE= gnu-gpl-v3 | |
13 | 12 | |||
14 | DEPENDS+= ${PYPKGPREFIX}-libarchive-c-[0-9]*:../../archivers/py-libarchive-c | 13 | DEPENDS+= ${PYPKGPREFIX}-libarchive-c-[0-9]*:../../archivers/py-libarchive-c | |
15 | DEPENDS+= ${PYPKGPREFIX}-magic-[0-9]*:../../sysutils/py-magic | 14 | DEPENDS+= ${PYPKGPREFIX}-magic-[0-9]*:../../sysutils/py-magic | |
16 | DEPENDS+= ${PYPKGPREFIX}-tlsh-[0-9]*:../../devel/py-tlsh | 15 | DEPENDS+= ${PYPKGPREFIX}-tlsh-[0-9]*:../../devel/py-tlsh | |
17 | DEPENDS+= colordiff-[0-9]*:../../devel/colordiff | 16 | DEPENDS+= colordiff-[0-9]*:../../devel/colordiff | |
18 | # for xxd | 17 | # for xxd | |
19 | DEPENDS+= vim-[0-9]*:../../editors/vim | 18 | DEPENDS+= vim-[0-9]*:../../editors/vim | |
20 | 19 | |||
21 | USE_LANGUAGES= c # for tests | 20 | USE_LANGUAGES= c # for tests | |
22 | USE_TOOLS+= bzip2:run gtar:run xz:run | 21 | USE_TOOLS+= bzip2:run gtar:run xz:run | |
23 | 22 | |||
24 | # Only Python 3 is supported. | 23 | # Only Python 3 is supported. | |
25 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | 24 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | |
26 | 25 | |||
27 | USE_PKG_RESOURCES= yes | |||
28 | ||||
29 | post-install: | 26 | post-install: | |
30 | cd ${DESTDIR}${PREFIX}/bin && \ | 27 | cd ${DESTDIR}${PREFIX}/bin && \ | |
31 | ${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE} | 28 | ${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE} | |
32 | 29 | |||
33 | .include "../../lang/python/batteries-included.mk" | 30 | .include "../../lang/python/batteries-included.mk" | |
34 | .include "../../lang/python/egg.mk" | 31 | .include "../../lang/python/wheel.mk" | |
35 | .include "../../mk/bsd.pkg.mk" | 32 | .include "../../mk/bsd.pkg.mk" |
@@ -1,39 +1,45 @@ | @@ -1,39 +1,45 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.9 2022/11/09 22:10:20 khorben Exp $ | 1 | @comment $NetBSD: PLIST,v 1.10 2024/01/15 20:03:39 schmonz Exp $ | |
2 | bin/diffoscope-${PYVERSSUFFIX} | 2 | bin/diffoscope-${PYVERSSUFFIX} | |
3 | ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO | 3 | ${PYSITELIB}/${WHEEL_INFODIR}/COPYING | |
4 | ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt | 4 | ${PYSITELIB}/${WHEEL_INFODIR}/METADATA | |
5 | ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt | 5 | ${PYSITELIB}/${WHEEL_INFODIR}/RECORD | |
6 | ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt | 6 | ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL | |
7 | ${PYSITELIB}/${EGG_INFODIR}/requires.txt | 7 | ${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt | |
8 | ${PYSITELIB}/${EGG_INFODIR}/top_level.txt | 8 | ${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt | |
9 | ${PYSITELIB}/diffoscope/__init__.py | 9 | ${PYSITELIB}/diffoscope/__init__.py | |
10 | ${PYSITELIB}/diffoscope/__init__.pyc | 10 | ${PYSITELIB}/diffoscope/__init__.pyc | |
11 | ${PYSITELIB}/diffoscope/__init__.pyo | 11 | ${PYSITELIB}/diffoscope/__init__.pyo | |
12 | ${PYSITELIB}/diffoscope/changes.py | 12 | ${PYSITELIB}/diffoscope/changes.py | |
13 | ${PYSITELIB}/diffoscope/changes.pyc | 13 | ${PYSITELIB}/diffoscope/changes.pyc | |
14 | ${PYSITELIB}/diffoscope/changes.pyo | 14 | ${PYSITELIB}/diffoscope/changes.pyo | |
15 | ${PYSITELIB}/diffoscope/comparators/7z.py | |||
16 | ${PYSITELIB}/diffoscope/comparators/7z.pyc | |||
17 | ${PYSITELIB}/diffoscope/comparators/7z.pyo | |||
15 | ${PYSITELIB}/diffoscope/comparators/__init__.py | 18 | ${PYSITELIB}/diffoscope/comparators/__init__.py | |
16 | ${PYSITELIB}/diffoscope/comparators/__init__.pyc | 19 | ${PYSITELIB}/diffoscope/comparators/__init__.pyc | |
17 | ${PYSITELIB}/diffoscope/comparators/__init__.pyo | 20 | ${PYSITELIB}/diffoscope/comparators/__init__.pyo | |
18 | ${PYSITELIB}/diffoscope/comparators/android.py | 21 | ${PYSITELIB}/diffoscope/comparators/android.py | |
19 | ${PYSITELIB}/diffoscope/comparators/android.pyc | 22 | ${PYSITELIB}/diffoscope/comparators/android.pyc | |
20 | ${PYSITELIB}/diffoscope/comparators/android.pyo | 23 | ${PYSITELIB}/diffoscope/comparators/android.pyo | |
21 | ${PYSITELIB}/diffoscope/comparators/apk.py | 24 | ${PYSITELIB}/diffoscope/comparators/apk.py | |
22 | ${PYSITELIB}/diffoscope/comparators/apk.pyc | 25 | ${PYSITELIB}/diffoscope/comparators/apk.pyc | |
23 | ${PYSITELIB}/diffoscope/comparators/apk.pyo | 26 | ${PYSITELIB}/diffoscope/comparators/apk.pyo | |
24 | ${PYSITELIB}/diffoscope/comparators/ar.py | 27 | ${PYSITELIB}/diffoscope/comparators/ar.py | |
25 | ${PYSITELIB}/diffoscope/comparators/ar.pyc | 28 | ${PYSITELIB}/diffoscope/comparators/ar.pyc | |
26 | ${PYSITELIB}/diffoscope/comparators/ar.pyo | 29 | ${PYSITELIB}/diffoscope/comparators/ar.pyo | |
30 | ${PYSITELIB}/diffoscope/comparators/arsc.py | |||
31 | ${PYSITELIB}/diffoscope/comparators/arsc.pyc | |||
32 | ${PYSITELIB}/diffoscope/comparators/arsc.pyo | |||
27 | ${PYSITELIB}/diffoscope/comparators/berkeley_db.py | 33 | ${PYSITELIB}/diffoscope/comparators/berkeley_db.py | |
28 | ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyc | 34 | ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyc | |
29 | ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyo | 35 | ${PYSITELIB}/diffoscope/comparators/berkeley_db.pyo | |
30 | ${PYSITELIB}/diffoscope/comparators/binary.py | 36 | ${PYSITELIB}/diffoscope/comparators/binary.py | |
31 | ${PYSITELIB}/diffoscope/comparators/binary.pyc | 37 | ${PYSITELIB}/diffoscope/comparators/binary.pyc | |
32 | ${PYSITELIB}/diffoscope/comparators/binary.pyo | 38 | ${PYSITELIB}/diffoscope/comparators/binary.pyo | |
33 | ${PYSITELIB}/diffoscope/comparators/binwalk.py | 39 | ${PYSITELIB}/diffoscope/comparators/binwalk.py | |
34 | ${PYSITELIB}/diffoscope/comparators/binwalk.pyc | 40 | ${PYSITELIB}/diffoscope/comparators/binwalk.pyc | |
35 | ${PYSITELIB}/diffoscope/comparators/binwalk.pyo | 41 | ${PYSITELIB}/diffoscope/comparators/binwalk.pyo | |
36 | ${PYSITELIB}/diffoscope/comparators/bzip2.py | 42 | ${PYSITELIB}/diffoscope/comparators/bzip2.py | |
37 | ${PYSITELIB}/diffoscope/comparators/bzip2.pyc | 43 | ${PYSITELIB}/diffoscope/comparators/bzip2.pyc | |
38 | ${PYSITELIB}/diffoscope/comparators/bzip2.pyo | 44 | ${PYSITELIB}/diffoscope/comparators/bzip2.pyo | |
39 | ${PYSITELIB}/diffoscope/comparators/cbfs.py | 45 | ${PYSITELIB}/diffoscope/comparators/cbfs.py |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2023/01/28 00:50:28 khorben Exp $ | 1 | $NetBSD: distinfo,v 1.16 2024/01/15 20:03:39 schmonz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (diffoscope-233.tar.gz) = 2bd508c06dce2d84e92ab664d50c17671de1addcf31b8d292f883de58df9300e | 3 | BLAKE2s (diffoscope-253.tar.gz) = 70c291e35c9232ecbef31bfef40e0fa956c15da93b05aab27f496276ce151f3e | |
4 | SHA512 (diffoscope-233.tar.gz) = ae750c3aeb3e4fb40f6bd2becdb5d148af0b369cb5dea8083a0c16d2f11b7995b7ef32a42bd1c248f14782cc792daa68e3e7838789ff4bd4c2dbb532940ef480 | 4 | SHA512 (diffoscope-253.tar.gz) = a850618dc09c0dcafdda14c9bcd0e01bcb8684a8c325b41052650aa90801343fd7cb6085f2dc98b6b7529e81b294c73ec02b87deb805d4072075130bad67199b | |
5 | Size (diffoscope-233.tar.gz) = 3164944 bytes | 5 | Size (diffoscope-253.tar.gz) = 3169582 bytes |