diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile index 68ff416d30a9..8840142ef652 100644 --- a/sysutils/py-diffoscope/Makefile +++ b/sysutils/py-diffoscope/Makefile @@ -1,33 +1,32 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= diffoscope -PORTVERSION= 136 -PORTREVISION= 1 +PORTVERSION= 144 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= In-depth comparison of files, archives, and directories LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR} \ gdiff:textproc/diffutils TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ zipinfo:archivers/unzip \ isoinfo:sysutils/cdrkit \ rpm2cpio:archivers/rpm2cpio -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= .include diff --git a/sysutils/py-diffoscope/distinfo b/sysutils/py-diffoscope/distinfo index 046ea20e71c1..61f300a436c2 100644 --- a/sysutils/py-diffoscope/distinfo +++ b/sysutils/py-diffoscope/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581919566 -SHA256 (diffoscope-136.tar.gz) = 0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15 -SIZE (diffoscope-136.tar.gz) = 1557070 +TIMESTAMP = 1589766564 +SHA256 (diffoscope-144.tar.gz) = 9a45464b7b7184fa1ad2af9c52ebac8f00b3dd5dcf9e15dfc00c653c26fcc345 +SIZE (diffoscope-144.tar.gz) = 1569864 diff --git a/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py b/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py deleted file mode 100644 index 879ec7f9789c..000000000000 --- a/sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py +++ /dev/null @@ -1,28 +0,0 @@ -# Non-portable regression caused by 25fee28c/#879011 -# https://lists.reproducible-builds.org/pipermail/diffoscope/2020-March/002632.html -# TODO: Upstream - ---- diffoscope/comparators/zip.py.orig 2020-03-12 13:23:59 UTC -+++ diffoscope/comparators/zip.py -@@ -38,10 +38,7 @@ from .utils.command import Command - class Zipinfo(Command): - @tool_required('zipinfo') - def cmdline(self): -- # zipinfo (without -v) puts warning messages (some of which contain -- # $path) into stdin when stderr is not a tty, see #879011 for details. -- # to work around it, we run it on /dev/stdin instead, seems to work ok. -- return ['zipinfo', '/dev/stdin'] -+ return ['zipinfo', self.path] - - @property - def returncode(self): -@@ -54,9 +51,6 @@ class Zipinfo(Command): - returncode = 0 - - return returncode -- -- def stdin(self): -- return open(self.path, 'rb') - - def filter(self, line): - # we don't care about the archive file path