Fri Oct 28 13:07:21 2022 UTC ()
chat/matrix-synapse: MESSAGE exorcism

This had MESSAGE to given an example config generation command (which
probably follows upstream docs), and to warn about the deficient
sqlite in NetBSD base.  Move them to files/ and install as
documentation.  Add a caution to the Makefile near the sqlite include.

(It remains to actually fix the sqlite issue.)


(gdt)
diff -r1.3 -r0 pkgsrc/chat/matrix-synapse/MESSAGE
diff -r1.62 -r1.63 pkgsrc/chat/matrix-synapse/Makefile
diff -r1.32 -r1.33 pkgsrc/chat/matrix-synapse/PLIST
File Deleted: pkgsrc/chat/matrix-synapse/Attic/MESSAGE
cvs diff -r1.62 -r1.63 pkgsrc/chat/matrix-synapse/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/matrix-synapse/Makefile 2022/10/19 14:25:18 1.62
+++ pkgsrc/chat/matrix-synapse/Makefile 2022/10/28 13:07:21 1.63
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.62 2022/10/19 14:25:18 nia Exp $ 1# $NetBSD: Makefile,v 1.63 2022/10/28 13:07:21 gdt Exp $
2 2
3DISTNAME= matrix-synapse-1.67.0 3DISTNAME= matrix-synapse-1.67.0
 4PKGREVISION= 1
4CATEGORIES= chat 5CATEGORIES= chat
5MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/}
6GITHUB_PROJECT= synapse 7GITHUB_PROJECT= synapse
7GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
8 9
9MAINTAINER= gdt@NetBSD.org 10MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= https://github.com/matrix-org/synapse/ 11HOMEPAGE= https://github.com/matrix-org/synapse/
11COMMENT= Reference homeserver for the Matrix decentralised comms protocol 12COMMENT= Reference homeserver for the Matrix decentralised comms protocol
12LICENSE= apache-2.0 13LICENSE= apache-2.0
13 14
14# Build tools: 15# Build tools:
15TOOL_DEPENDS+= ${PYPKGPREFIX}-poetry-[0-9]*:../../devel/py-poetry 16TOOL_DEPENDS+= ${PYPKGPREFIX}-poetry-[0-9]*:../../devel/py-poetry
16 17
@@ -32,51 +33,56 @@ DEPENDS+= ${PYPKGPREFIX}-jsonschema>=3.0 @@ -32,51 +33,56 @@ DEPENDS+= ${PYPKGPREFIX}-jsonschema>=3.0
32DEPENDS+= ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml 33DEPENDS+= ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
33DEPENDS+= ${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons 34DEPENDS+= ${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons
34DEPENDS+= ${PYPKGPREFIX}-matrix-common>=1.2.0:../../chat/py-matrix-common 35DEPENDS+= ${PYPKGPREFIX}-matrix-common>=1.2.0:../../chat/py-matrix-common
35DEPENDS+= ${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack 36DEPENDS+= ${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack
36DEPENDS+= ${PYPKGPREFIX}-nacl>=1.2.1:../../security/py-nacl 37DEPENDS+= ${PYPKGPREFIX}-nacl>=1.2.1:../../security/py-nacl
37DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr 38DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr
38DEPENDS+= ${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers 39DEPENDS+= ${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers
39DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow 40DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
40DEPENDS+= ${PYPKGPREFIX}-prometheus_client>=0.4.0:../../net/py-prometheus_client 41DEPENDS+= ${PYPKGPREFIX}-prometheus_client>=0.4.0:../../net/py-prometheus_client
41DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.7:../../databases/py-psycopg2 42DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.7:../../databases/py-psycopg2
42DEPENDS+= ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity 43DEPENDS+= ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity
43DEPENDS+= ${PYPKGPREFIX}-signedjson>=1.1.0:../../security/py-signedjson 44DEPENDS+= ${PYPKGPREFIX}-signedjson>=1.1.0:../../security/py-signedjson
44DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers 45DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers
 46# NB: synapse needs features missing in NetBSD base system sqlite, and probably
 47# missing in other builds.
45DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 48DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
46DEPENDS+= ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq 49DEPENDS+= ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq
47DEPENDS+= ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted 50DEPENDS+= ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted
48DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.10.0:../../devel/py-typing-extensions 51DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.10.0:../../devel/py-typing-extensions
49DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64 52DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64
50DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml 53DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
51TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized 54TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized
52TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 55TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
53 56
54PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-unpaddedbase64 57PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-unpaddedbase64
55 58
56USE_PKG_RESOURCES= yes 59USE_PKG_RESOURCES= yes
57 60
58USE_LANGUAGES= # none 61USE_LANGUAGES= # none
59 62
60REPLACE_PYTHON+= synapse/_scripts/*.py 63REPLACE_PYTHON+= synapse/_scripts/*.py
61 64
62USE_TOOLS+= perl:run 65USE_TOOLS+= perl:run
63REPLACE_PERL+= scripts/sync_room_to_group.pl 66REPLACE_PERL+= scripts/sync_room_to_group.pl
64 67
65PKG_SYSCONFSUBDIR= matrix-synapse 68# Avoid the pyNN- prefix in config, doc, and so on.
 69HUMAN_PKGNAME= matrix-synapse
 70PKG_SYSCONFSUBDIR= ${HUMAN_PKGNAME}
 71DOCDIR= ${PREFIX}/share/doc/${HUMAN_PKGNAME}
66 72
67SYNAPSE_USER?= synapse 73SYNAPSE_USER?= synapse
68SYNAPSE_GROUP?= ${SYNAPSE_USER} 74SYNAPSE_GROUP?= ${SYNAPSE_USER}
69SYNAPSE_DATA?= ${VARBASE}/db/matrix-synapse 75SYNAPSE_DATA?= ${VARBASE}/db/${HUMAN_PKGNAME}
70BUILD_DEFS+= SYNAPSE_USER SYNAPSE_GROUP SYNAPSE_DATA VARBASE 76BUILD_DEFS+= SYNAPSE_USER SYNAPSE_GROUP SYNAPSE_DATA VARBASE
71 77
72OWN_DIRS_PERMS+= ${SYNAPSE_DATA} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0770 78OWN_DIRS_PERMS+= ${SYNAPSE_DATA} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0770
73 79
74PKG_USERS_VARS= SYNAPSE_USER 80PKG_USERS_VARS= SYNAPSE_USER
75PKG_GROUPS_VARS= SYNAPSE_GROUP 81PKG_GROUPS_VARS= SYNAPSE_GROUP
76PKG_GROUPS= ${SYNAPSE_GROUP} 82PKG_GROUPS= ${SYNAPSE_GROUP}
77PKG_USERS= ${SYNAPSE_USER}:${SYNAPSE_GROUP} 83PKG_USERS= ${SYNAPSE_USER}:${SYNAPSE_GROUP}
78PKG_GECOS.${SYNAPSE_USER}= Synapse daemon user 84PKG_GECOS.${SYNAPSE_USER}= Synapse daemon user
79PKG_HOME.${SYNAPSE_USER}= ${SYNAPSE_DATA} 85PKG_HOME.${SYNAPSE_USER}= ${SYNAPSE_DATA}
80PKG_SHELL.${SYNAPSE_USER}= ${NOLOGIN} 86PKG_SHELL.${SYNAPSE_USER}= ${NOLOGIN}
81 87
82RCD_SCRIPTS= matrix-synapse 88RCD_SCRIPTS= matrix-synapse
@@ -89,24 +95,29 @@ MESSAGE_SUBST+= SYNAPSE_DATA=${SYNAPSE_D @@ -89,24 +95,29 @@ MESSAGE_SUBST+= SYNAPSE_DATA=${SYNAPSE_D
89 95
90SYNAPSE_DEFAULT_CREATOR_PL?= 100 96SYNAPSE_DEFAULT_CREATOR_PL?= 100
91SUBST_CLASSES+= pl 97SUBST_CLASSES+= pl
92SUBST_STAGE.pl= post-patch 98SUBST_STAGE.pl= post-patch
93SUBST_FILES.pl= synapse/handlers/room.py 99SUBST_FILES.pl= synapse/handlers/room.py
94SUBST_VARS.pl= SYNAPSE_DEFAULT_CREATOR_PL 100SUBST_VARS.pl= SYNAPSE_DEFAULT_CREATOR_PL
95 101
96BUILD_DEFS+= SYNAPSE_DEFAULT_CREATOR_PL 102BUILD_DEFS+= SYNAPSE_DEFAULT_CREATOR_PL
97 103
98post-patch: 104post-patch:
99 # Otherwise, this file is installed and pollutes PLIST. 105 # Otherwise, this file is installed and pollutes PLIST.
100 rm ${WRKSRC}/synapse/handlers/room.py.orig 106 rm ${WRKSRC}/synapse/handlers/room.py.orig
101 107
 108post-install:
 109 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 110 ${INSTALL_DATA} files/README.pkgsrc.txt ${DESTDIR}${DOCDIR}
 111 ${INSTALL_DATA} files/README.pkgsrc.NetBSD.txt ${DESTDIR}${DOCDIR}
 112
102# \todo Grok upstream's new test scheme and port to it. 113# \todo Grok upstream's new test scheme and port to it.
103# test status as of 1.51.0 114# test status as of 1.51.0
104# 51 warnings, 1 error 115# 51 warnings, 1 error
105do-test: 116do-test:
106 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} pytest-${PYVERSSUFFIX} 117 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} pytest-${PYVERSSUFFIX}
107 118
108.include "../../lang/python/application.mk" 119.include "../../lang/python/application.mk"
109.include "../../lang/python/wheel.mk" 120.include "../../lang/python/wheel.mk"
110PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL 121PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL
111.include "../../lang/python/versioned_dependencies.mk" 122.include "../../lang/python/versioned_dependencies.mk"
112.include "../../mk/bsd.pkg.mk" 123.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32 -r1.33 pkgsrc/chat/matrix-synapse/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/matrix-synapse/PLIST 2022/10/06 13:57:53 1.32
+++ pkgsrc/chat/matrix-synapse/PLIST 2022/10/28 13:07:21 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.32 2022/10/06 13:57:53 gdt Exp $ 1@comment $NetBSD: PLIST,v 1.33 2022/10/28 13:07:21 gdt Exp $
2bin/export_signing_key 2bin/export_signing_key
3bin/generate_config 3bin/generate_config
4bin/generate_log_config 4bin/generate_log_config
5bin/generate_signing_key 5bin/generate_signing_key
6bin/hash_password 6bin/hash_password
7bin/register_new_matrix_user 7bin/register_new_matrix_user
8bin/synapse_homeserver 8bin/synapse_homeserver
9bin/synapse_port_db 9bin/synapse_port_db
10bin/synapse_review_recent_signups 10bin/synapse_review_recent_signups
11bin/synapse_worker 11bin/synapse_worker
12bin/synctl 12bin/synctl
13bin/update_synapse_database 13bin/update_synapse_database
14${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER 14${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
@@ -1379,13 +1379,15 @@ ${PYSITELIB}/synapse/util/retryutils.py @@ -1379,13 +1379,15 @@ ${PYSITELIB}/synapse/util/retryutils.py
1379${PYSITELIB}/synapse/util/retryutils.pyc 1379${PYSITELIB}/synapse/util/retryutils.pyc
1380${PYSITELIB}/synapse/util/rlimit.py 1380${PYSITELIB}/synapse/util/rlimit.py
1381${PYSITELIB}/synapse/util/rlimit.pyc 1381${PYSITELIB}/synapse/util/rlimit.pyc
1382${PYSITELIB}/synapse/util/stringutils.py 1382${PYSITELIB}/synapse/util/stringutils.py
1383${PYSITELIB}/synapse/util/stringutils.pyc 1383${PYSITELIB}/synapse/util/stringutils.pyc
1384${PYSITELIB}/synapse/util/templates.py 1384${PYSITELIB}/synapse/util/templates.py
1385${PYSITELIB}/synapse/util/templates.pyc 1385${PYSITELIB}/synapse/util/templates.pyc
1386${PYSITELIB}/synapse/util/threepids.py 1386${PYSITELIB}/synapse/util/threepids.py
1387${PYSITELIB}/synapse/util/threepids.pyc 1387${PYSITELIB}/synapse/util/threepids.pyc
1388${PYSITELIB}/synapse/util/wheel_timer.py 1388${PYSITELIB}/synapse/util/wheel_timer.py
1389${PYSITELIB}/synapse/util/wheel_timer.pyc 1389${PYSITELIB}/synapse/util/wheel_timer.pyc
1390${PYSITELIB}/synapse/visibility.py 1390${PYSITELIB}/synapse/visibility.py
1391${PYSITELIB}/synapse/visibility.pyc 1391${PYSITELIB}/synapse/visibility.pyc
 1392share/doc/matrix-synapse/README.pkgsrc.txt
 1393share/doc/matrix-synapse/README.pkgsrc.NetBSD.txt