View | Details | Raw Unified | Return to bug 245663 | Differences between
and this patch

Collapse All | Expand All

(-)sysutils/py-diffoscope/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	diffoscope
4
PORTNAME=	diffoscope
5
PORTVERSION=	136
5
PORTVERSION=	141
6
PORTREVISION=	1
7
CATEGORIES=	sysutils python
6
CATEGORIES=	sysutils python
8
MASTER_SITES=	CHEESESHOP
7
MASTER_SITES=	CHEESESHOP
9
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
(-)sysutils/py-diffoscope/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1581919566
1
TIMESTAMP = 1587030059
2
SHA256 (diffoscope-136.tar.gz) = 0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15
2
SHA256 (diffoscope-141.tar.gz) = 66a8d066f8f5ac18d02aa5148ada7c6f4ab094cd64d29e72b319c5e7df151fc0
3
SIZE (diffoscope-136.tar.gz) = 1557070
3
SIZE (diffoscope-141.tar.gz) = 1575158
(-)sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py (-28 lines)
Lines 1-28 Link Here
1
# Non-portable regression caused by 25fee28c/#879011
2
# https://lists.reproducible-builds.org/pipermail/diffoscope/2020-March/002632.html
3
# TODO: Upstream
4
5
--- diffoscope/comparators/zip.py.orig	2020-03-12 13:23:59 UTC
6
+++ diffoscope/comparators/zip.py
7
@@ -38,10 +38,7 @@ from .utils.command import Command
8
 class Zipinfo(Command):
9
     @tool_required('zipinfo')
10
     def cmdline(self):
11
-        # zipinfo (without -v) puts warning messages (some of which contain
12
-        # $path) into stdin when stderr is not a tty, see #879011 for details.
13
-        # to work around it, we run it on /dev/stdin instead, seems to work ok.
14
-        return ['zipinfo', '/dev/stdin']
15
+        return ['zipinfo', self.path]
16
 
17
     @property
18
     def returncode(self):
19
@@ -54,9 +51,6 @@ class Zipinfo(Command):
20
             returncode = 0
21
 
22
         return returncode
23
-
24
-    def stdin(self):
25
-        return open(self.path, 'rb')
26
 
27
     def filter(self, line):
28
         # we don't care about the archive file path

Return to bug 245663