Wed Apr 28 23:44:57 2021 UTC ()
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.


(js)
diff -r1.21 -r1.22 pkgsrc/chat/matrix-synapse/Makefile
diff -r1.14 -r1.15 pkgsrc/chat/matrix-synapse/distinfo
diff -r0 -r1.1 pkgsrc/chat/matrix-synapse/patches/patch-synapse_python_dependencies.py
cvs diff -r1.21 -r1.22 pkgsrc/chat/matrix-synapse/Makefile (switch to unified diff)

--- pkgsrc/chat/matrix-synapse/Makefile 2021/04/28 21:25:57 1.21
+++ pkgsrc/chat/matrix-synapse/Makefile 2021/04/28 23:44:56 1.22
@@ -1,79 +1,80 @@ @@ -1,79 +1,80 @@
1# $NetBSD: Makefile,v 1.21 2021/04/28 21:25:57 js Exp $ 1# $NetBSD: Makefile,v 1.22 2021/04/28 23:44:56 js Exp $
2 2
3DISTNAME= matrix-synapse-1.32.2 3DISTNAME= matrix-synapse-1.32.2
 4PKGREVISION= 1
4CATEGORIES= chat 5CATEGORIES= chat
5MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/}
6EGG_NAME= matrix_synapse-${PKGVERSION_NOREV} 7EGG_NAME= matrix_synapse-${PKGVERSION_NOREV}
7GITHUB_PROJECT= synapse 8GITHUB_PROJECT= synapse
8GITHUB_TAG= v${PKGVERSION_NOREV} 9GITHUB_TAG= v${PKGVERSION_NOREV}
9 10
10MAINTAINER= js@pkgsrc.org 11MAINTAINER= js@pkgsrc.org
11HOMEPAGE= https://github.com/matrix-org/synapse/ 12HOMEPAGE= https://github.com/matrix-org/synapse/
12COMMENT= Reference homeserver for the Matrix decentralised comms protocol 13COMMENT= Reference homeserver for the Matrix decentralised comms protocol
13LICENSE= apache-2.0 14LICENSE= apache-2.0
14 15
15DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 16DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
16DEPENDS+= ${PYPKGPREFIX}-jsonschema>=2.5.1:../../textproc/py-jsonschema 17DEPENDS+= ${PYPKGPREFIX}-jsonschema>=2.5.1:../../textproc/py-jsonschema
17DEPENDS+= ${PYPKGPREFIX}-frozendict>=1:../../devel/py-frozendict 18DEPENDS+= ${PYPKGPREFIX}-frozendict>=1:../../devel/py-frozendict
18DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64 19DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64
19DEPENDS+= ${PYPKGPREFIX}-canonicaljson>=1.4.0:../../devel/py-canonicaljson 20DEPENDS+= ${PYPKGPREFIX}-canonicaljson>=1.4.0:../../devel/py-canonicaljson
20DEPENDS+= ${PYPKGPREFIX}-signedjson>=1.1.0:../../security/py-signedjson 21DEPENDS+= ${PYPKGPREFIX}-signedjson>=1.1.0:../../security/py-signedjson
21DEPENDS+= ${PYPKGPREFIX}-nacl>=1.2.1:../../security/py-nacl 22DEPENDS+= ${PYPKGPREFIX}-nacl>=1.2.1:../../security/py-nacl
22DEPENDS+= ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna 23DEPENDS+= ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
23DEPENDS+= ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity 24DEPENDS+= ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity
24DEPENDS+= ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted 25DEPENDS+= ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted
25DEPENDS+= ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq 26DEPENDS+= ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq
26DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL 27DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL
27DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml 28DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
28DEPENDS+= ${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1 29DEPENDS+= ${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
29DEPENDS+= ${PYPKGPREFIX}-asn1-modules>=0.0.7:../../security/py-asn1-modules 30DEPENDS+= ${PYPKGPREFIX}-asn1-modules>=0.0.7:../../security/py-asn1-modules
30DEPENDS+= ${PYPKGPREFIX}-daemonize>=2.3.1:../../devel/py-daemonize 31DEPENDS+= ${PYPKGPREFIX}-daemonize>=2.3.1:../../devel/py-daemonize
31DEPENDS+= ${PYPKGPREFIX}-bcrypt>=3.1.0:../../security/py-bcrypt 32DEPENDS+= ${PYPKGPREFIX}-bcrypt>=3.1.0:../../security/py-bcrypt
32DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers 33DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers
33DEPENDS+= ${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons 34DEPENDS+= ${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons
34DEPENDS+= ${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack 35DEPENDS+= ${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack
35DEPENDS+= ${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers 36DEPENDS+= ${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers
36DEPENDS+= ${PYPKGPREFIX}-six>=1.10:../../lang/py-six 37DEPENDS+= ${PYPKGPREFIX}-six>=1.10:../../lang/py-six
37DEPENDS+= ${PYPKGPREFIX}-prometheus_client>=0.8.0:../../net/py-prometheus_client 38DEPENDS+= ${PYPKGPREFIX}-prometheus_client>=0.8.0:../../net/py-prometheus_client
38DEPENDS+= ${PYPKGPREFIX}-attrs>=19.1.0:../../devel/py-attrs 39DEPENDS+= ${PYPKGPREFIX}-attrs>=19.1.0:../../devel/py-attrs
39DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr 40DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr
40DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.9:../../textproc/py-jinja2 41DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.9:../../textproc/py-jinja2
41DEPENDS+= ${PYPKGPREFIX}-bleach>=1.4.3:../../www/py-bleach 42DEPENDS+= ${PYPKGPREFIX}-bleach>=1.4.3:../../www/py-bleach
42DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.7.4:../../devel/py-typing-extensions 43DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.7.4:../../devel/py-typing-extensions
43DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.7:../../databases/py-psycopg2 44DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.7:../../databases/py-psycopg2
44DEPENDS+= ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml 45DEPENDS+= ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
45 46
46PYTHON_VERSIONED_DEPENDENCIES= Pillow 47PYTHON_VERSIONED_DEPENDENCIES= Pillow
47 48
48USE_LANGUAGES= # none 49USE_LANGUAGES= # none
49USE_TOOLS+= perl:run 50USE_TOOLS+= perl:run
50REPLACE_PERL+= scripts/sync_room_to_group.pl 51REPLACE_PERL+= scripts/sync_room_to_group.pl
51 52
52PKG_SYSCONFSUBDIR= matrix-synapse 53PKG_SYSCONFSUBDIR= matrix-synapse
53 54
54SYNAPSE_USER?= synapse 55SYNAPSE_USER?= synapse
55SYNAPSE_GROUP?= ${SYNAPSE_USER} 56SYNAPSE_GROUP?= ${SYNAPSE_USER}
56SYNAPSE_DATA?= ${VARBASE}/db/matrix-synapse 57SYNAPSE_DATA?= ${VARBASE}/db/matrix-synapse
57BUILD_DEFS+= SYNAPSE_USER SYNAPSE_GROUP SYNAPSE_DATA VARBASE 58BUILD_DEFS+= SYNAPSE_USER SYNAPSE_GROUP SYNAPSE_DATA VARBASE
58 59
59OWN_DIRS_PERMS+= ${SYNAPSE_DATA} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0770 60OWN_DIRS_PERMS+= ${SYNAPSE_DATA} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0770
60 61
61PKG_USERS_VARS= SYNAPSE_USER 62PKG_USERS_VARS= SYNAPSE_USER
62PKG_GROUPS_VARS= SYNAPSE_GROUP 63PKG_GROUPS_VARS= SYNAPSE_GROUP
63PKG_GROUPS= ${SYNAPSE_GROUP} 64PKG_GROUPS= ${SYNAPSE_GROUP}
64PKG_USERS= ${SYNAPSE_USER}:${SYNAPSE_GROUP} 65PKG_USERS= ${SYNAPSE_USER}:${SYNAPSE_GROUP}
65PKG_GECOS.${SYNAPSE_USER}= Synapse daemon user 66PKG_GECOS.${SYNAPSE_USER}= Synapse daemon user
66PKG_HOME.${SYNAPSE_USER}= ${SYNAPSE_DATA} 67PKG_HOME.${SYNAPSE_USER}= ${SYNAPSE_DATA}
67PKG_SHELL.${SYNAPSE_USER}= ${NOLOGIN} 68PKG_SHELL.${SYNAPSE_USER}= ${NOLOGIN}
68 69
69RCD_SCRIPTS= matrix-synapse 70RCD_SCRIPTS= matrix-synapse
70 71
71FILES_SUBST+= SYNAPSE_DATA=${SYNAPSE_DATA:Q} 72FILES_SUBST+= SYNAPSE_DATA=${SYNAPSE_DATA:Q}
72FILES_SUBST+= SYNAPSE_USER=${SYNAPSE_USER:Q} 73FILES_SUBST+= SYNAPSE_USER=${SYNAPSE_USER:Q}
73FILES_SUBST+= SYNAPSE_GROUP=${SYNAPSE_GROUP:Q} 74FILES_SUBST+= SYNAPSE_GROUP=${SYNAPSE_GROUP:Q}
74MESSAGE_SUBST+= PYTHONBIN=${PYTHONBIN:Q} 75MESSAGE_SUBST+= PYTHONBIN=${PYTHONBIN:Q}
75MESSAGE_SUBST+= SYNAPSE_DATA=${SYNAPSE_DATA:Q} 76MESSAGE_SUBST+= SYNAPSE_DATA=${SYNAPSE_DATA:Q}
76 77
77.include "../../lang/python/egg.mk" 78.include "../../lang/python/egg.mk"
78.include "../../lang/python/versioned_dependencies.mk" 79.include "../../lang/python/versioned_dependencies.mk"
79.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/chat/matrix-synapse/distinfo (switch to unified diff)

--- pkgsrc/chat/matrix-synapse/distinfo 2021/04/28 21:25:57 1.14
+++ pkgsrc/chat/matrix-synapse/distinfo 2021/04/28 23:44:56 1.15
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.14 2021/04/28 21:25:57 js Exp $ 1$NetBSD: distinfo,v 1.15 2021/04/28 23:44:56 js Exp $
2 2
3SHA1 (matrix-synapse-1.32.2.tar.gz) = caa85c36988695132053d193f3ed1284e27c9011 3SHA1 (matrix-synapse-1.32.2.tar.gz) = caa85c36988695132053d193f3ed1284e27c9011
4RMD160 (matrix-synapse-1.32.2.tar.gz) = ec8ec6bc81dd875de924c413f10d9437436ba47a 4RMD160 (matrix-synapse-1.32.2.tar.gz) = ec8ec6bc81dd875de924c413f10d9437436ba47a
5SHA512 (matrix-synapse-1.32.2.tar.gz) = 123a419558763df84f48a4f7cd66beb67ee1bb20ed9cbbb8138d3e9162247bd17bbf81c7360cc49637fa670e0554a39a4666dab81aa473e8fbf82e70590b45f0 5SHA512 (matrix-synapse-1.32.2.tar.gz) = 123a419558763df84f48a4f7cd66beb67ee1bb20ed9cbbb8138d3e9162247bd17bbf81c7360cc49637fa670e0554a39a4666dab81aa473e8fbf82e70590b45f0
6Size (matrix-synapse-1.32.2.tar.gz) = 7258293 bytes 6Size (matrix-synapse-1.32.2.tar.gz) = 7258293 bytes
 7SHA1 (patch-synapse_python_dependencies.py) = 1b58769d30514900266f828f0e60fb5bcce7240c
File Added: pkgsrc/chat/matrix-synapse/patches/Attic/patch-synapse_python_dependencies.py
$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 = {