Received: by mail.netbsd.org (Postfix, from userid 605) id 9BEE984DDD; Wed, 28 Apr 2021 23:44:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BB74384DDC for ; Wed, 28 Apr 2021 23:44:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id UzcpD7SWRpqy for ; Wed, 28 Apr 2021 23:44:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 23FFC84DDA for ; Wed, 28 Apr 2021 23:44:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1D9D2FA95; Wed, 28 Apr 2021 23:44:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161965349735690" MIME-Version: 1.0 Date: Wed, 28 Apr 2021 23:44:57 +0000 From: "Jonathan Schleifer" Subject: CVS commit: pkgsrc/chat/matrix-synapse To: pkgsrc-changes@NetBSD.org Reply-To: js@netbsd.org X-Mailer: log_accum Message-Id: <20210428234457.1D9D2FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161965349735690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: js Date: Wed Apr 28 23:44:57 UTC 2021 Modified Files: pkgsrc/chat/matrix-synapse: Makefile distinfo Added Files: pkgsrc/chat/matrix-synapse/patches: patch-synapse_python_dependencies.py Log Message: chat/matrix-synapse: Patch out py-cryptography check It doesn't need a version this high (which would require Rust) and it was added by upstream as an ugly hack to force a patched OpenSSL, in case it is linked statically. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/chat/matrix-synapse/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/chat/matrix-synapse/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161965349735690 Content-Disposition: inline Content-Length: 2498 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/matrix-synapse/Makefile diff -u pkgsrc/chat/matrix-synapse/Makefile:1.21 pkgsrc/chat/matrix-synapse/Makefile:1.22 --- pkgsrc/chat/matrix-synapse/Makefile:1.21 Wed Apr 28 21:25:57 2021 +++ pkgsrc/chat/matrix-synapse/Makefile Wed Apr 28 23:44:56 2021 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2021/04/28 21:25:57 js Exp $ +# $NetBSD: Makefile,v 1.22 2021/04/28 23:44:56 js Exp $ DISTNAME= matrix-synapse-1.32.2 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/} EGG_NAME= matrix_synapse-${PKGVERSION_NOREV} Index: pkgsrc/chat/matrix-synapse/distinfo diff -u pkgsrc/chat/matrix-synapse/distinfo:1.14 pkgsrc/chat/matrix-synapse/distinfo:1.15 --- pkgsrc/chat/matrix-synapse/distinfo:1.14 Wed Apr 28 21:25:57 2021 +++ pkgsrc/chat/matrix-synapse/distinfo Wed Apr 28 23:44:56 2021 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.14 2021/04/28 21:25:57 js Exp $ +$NetBSD: distinfo,v 1.15 2021/04/28 23:44:56 js Exp $ SHA1 (matrix-synapse-1.32.2.tar.gz) = caa85c36988695132053d193f3ed1284e27c9011 RMD160 (matrix-synapse-1.32.2.tar.gz) = ec8ec6bc81dd875de924c413f10d9437436ba47a SHA512 (matrix-synapse-1.32.2.tar.gz) = 123a419558763df84f48a4f7cd66beb67ee1bb20ed9cbbb8138d3e9162247bd17bbf81c7360cc49637fa670e0554a39a4666dab81aa473e8fbf82e70590b45f0 Size (matrix-synapse-1.32.2.tar.gz) = 7258293 bytes +SHA1 (patch-synapse_python_dependencies.py) = 1b58769d30514900266f828f0e60fb5bcce7240c Added files: Index: pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py diff -u /dev/null pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py:1.1 --- /dev/null Wed Apr 28 23:44:57 2021 +++ pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py Wed Apr 28 23:44:56 2021 @@ -0,0 +1,18 @@ +$NetBSD: patch-synapse_python_dependencies.py,v 1.1 2021/04/28 23:44:56 js Exp $ + +Patch out cryptography check: It doesn't need a version this high and it was +added by upstream as an ugly hack to force a patched OpenSSL, in case it is +linked statically. + +--- synapse/python_dependencies.py.orig 2021-04-22 10:09:31.000000000 +0000 ++++ synapse/python_dependencies.py +@@ -83,9 +83,6 @@ REQUIREMENTS = [ + "Jinja2>=2.9", + "bleach>=1.4.3", + "typing-extensions>=3.7.4", +- # We enforce that we have a `cryptography` version that bundles an `openssl` +- # with the latest security patches. +- "cryptography>=3.4.7;python_version>='3.6'", + ] + + CONDITIONAL_REQUIREMENTS = { --_----------=_161965349735690--