Attachment 213458 Details for Bug 245663 – Patch against /usr/ports

[patch] Patch against /usr/ports

py-diffoscope-141.patch (text/plain), 2.64 KB, created by Michael Osipov on 2020-04-16 09:48:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2020-04-16 09:48:27 UTC

Size: 2.64 KB

patch

obsolete

>Index: sysutils/py-diffoscope/Makefile
>===================================================================
>--- sysutils/py-diffoscope/Makefile	(revision 531834)
>+++ sysutils/py-diffoscope/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	diffoscope
>-PORTVERSION=	136
>-PORTREVISION=	1
>+PORTVERSION=	141
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: sysutils/py-diffoscope/distinfo
>===================================================================
>--- sysutils/py-diffoscope/distinfo	(revision 531834)
>+++ sysutils/py-diffoscope/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1581919566
>-SHA256 (diffoscope-136.tar.gz) = 0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15
>-SIZE (diffoscope-136.tar.gz) = 1557070
>+TIMESTAMP = 1587030059
>+SHA256 (diffoscope-141.tar.gz) = 66a8d066f8f5ac18d02aa5148ada7c6f4ab094cd64d29e72b319c5e7df151fc0
>+SIZE (diffoscope-141.tar.gz) = 1575158
>Index: sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
>===================================================================
>--- sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(revision 531834)
>+++ sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py	(nonexistent)
>@@ -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
>
>Property changes on: sysutils/py-diffoscope/files/patch-diffoscope_comparators_zip.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 245663: 213458 | 214584