From 3e29ea649832c0bc5c439a6f0ec1237f92574557 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 12 Jan 2022 09:42:17 -0500 Subject: [PATCH 1/4] python3-phonenumbers: update to 8.12.41. --- srcpkgs/python3-phonenumbers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template index 332733bb9810..878740201726 100644 --- a/srcpkgs/python3-phonenumbers/template +++ b/srcpkgs/python3-phonenumbers/template @@ -1,6 +1,6 @@ # Template file for 'python3-phonenumbers' pkgname=python3-phonenumbers -version=8.12.39 +version=8.12.41 revision=1 wrksrc="phonenumbers-${version}" build_style=python3-module @@ -12,4 +12,4 @@ license="Apache-2.0" homepage="https://github.com/daviddrysdale/python-phonenumbers" changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md" distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz" -checksum=0f7745e1f108654db347d885e814cbb5f225b8c5f5ce336024b193c79291ddaa +checksum=f477da623a51cba084567d6a67b1882a8aaaf3e7beadad655f8613a8f887ac62 From 276e67d85e0d89349707aad3f46b71385880bc0c Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Sun, 9 Jan 2022 14:23:46 -0500 Subject: [PATCH 2/4] New package: python3-matrix-common-1.0.0 --- srcpkgs/python3-matrix-common/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-matrix-common/template diff --git a/srcpkgs/python3-matrix-common/template b/srcpkgs/python3-matrix-common/template new file mode 100644 index 000000000000..7ab481c67720 --- /dev/null +++ b/srcpkgs/python3-matrix-common/template @@ -0,0 +1,16 @@ +# Template file for 'python3-matrix-common' +pkgname=python3-matrix-common +version=1.0.0 +revision=1 +wrksrc="matrix-python-common-${version}" +build_style=python3-pep517 +make_install_target="matrix_common-${version}-*-*-*.whl" +hostmakedepends="python3-setuptools python3-wheel" +depends="python3-attrs" +short_desc="Common code for Synapse, Sydent and Sygnal" +maintainer="Joel Beckmeyer " +license="Apache-2.0" +homepage="https://github.com/matrix-org/matrix-python-common" +distfiles="https://github.com/matrix-org/matrix-python-common/archive/v${version}.tar.gz" +checksum=d610357a78caf5141814f055e8b3facabf4dd4863db8594030d58c81b2b2b7fd +make_check=no # requires unpackaged python3 module aiounittest From fcc74faf7df808542e9ba504f4bd8b258a71551f Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 12 Jan 2022 09:50:52 -0500 Subject: [PATCH 3/4] New package: python3-txredisapi-1.4.7 --- srcpkgs/python3-txredisapi/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/python3-txredisapi/template diff --git a/srcpkgs/python3-txredisapi/template b/srcpkgs/python3-txredisapi/template new file mode 100644 index 000000000000..b3db1c07c64c --- /dev/null +++ b/srcpkgs/python3-txredisapi/template @@ -0,0 +1,23 @@ +# Template file for 'python3-txredisapi' +pkgname=python3-txredisapi +version=1.4.7 +revision=1 +wrksrc="txredisapi-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-Twisted python3-six" +checkdepends="$depends redis python3-pytest python3-mock" +short_desc="Non-blocking redis client for python" +maintainer="Joel Beckmeyer " +license="Apache-2.0" +homepage="https://github.com/IlyaSkriblovsky/txredisapi" +changelog="https://raw.githubusercontent.com/IlyaSkriblovsky/txredisapi/master/CHANGELOG.md" +distfiles="https://github.com/IlyaSkriblovsky/txredisapi/archive/refs/tags/${version}.tar.gz" +checksum=dfaf204ab547eeddfcf54c81734a8a06dadbbf079fd01d9c27a788c7d770376e + +do_check() { + redis-server & + python3 -m pytest --ignore tests/test_unix_connection.py + redis-cli flushall + redis-cli shutdown +} From b81867fb31402b55bb6cf4d7832d2cc6b96e69e6 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 31 Dec 2021 09:45:03 +0100 Subject: [PATCH 4/4] synapse: update to 1.50.2. - Switch to python3-pytest for running tests (@paper42) - remove logging process. By default synapse only logs to stderr when there is a problem with configuration. For this we don't need a process running that won't do anything for 99% of the time. Logging to runsvdir should be enough. - make service configurable. That way one can set desired locale and path to config file. - remove patches to sample config. - create directory for config. Improvements contributed by David Flatz . --- srcpkgs/synapse/files/synapse/log/run | 1 - srcpkgs/synapse/files/synapse/run | 4 +- srcpkgs/synapse/patches/sample_config.patch | 88 ------------------- .../synapse/patches/sample_log_config.patch | 13 --- srcpkgs/synapse/template | 14 ++- 5 files changed, 8 insertions(+), 112 deletions(-) delete mode 120000 srcpkgs/synapse/files/synapse/log/run delete mode 100644 srcpkgs/synapse/patches/sample_config.patch delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run deleted file mode 120000 index 3a5b4a586051..000000000000 --- a/srcpkgs/synapse/files/synapse/log/run +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run index 1ab3a5a8d54b..0778d6317328 100644 --- a/srcpkgs/synapse/files/synapse/run +++ b/srcpkgs/synapse/files/synapse/run @@ -1,4 +1,4 @@ #!/bin/sh +[ -r ./conf ] && . ./conf cd /var/lib/synapse -exec 2>&1 -exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml +exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml} diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch deleted file mode 100644 index 15954e0cd782..000000000000 --- a/srcpkgs/synapse/patches/sample_config.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml -index 6696ed5d1..f17661fff 100644 ---- a/docs/sample_config.yaml -+++ b/docs/sample_config.yaml -@@ -68,11 +68,11 @@ modules: - # lowercase and may contain an explicit port. - # Examples: matrix.org, localhost:8080 - # --server_name: "SERVERNAME" -+#server_name: "SERVERNAME" - - # When running as a daemon, the file to store the pid in - # --pid_file: DATADIR/homeserver.pid -+#pid_file: /var/lib/synapse/homeserver.pid - - # The absolute URL to the web client which /_matrix/client will redirect - # to if 'webclient' is configured under the 'listeners' configuration. -@@ -370,8 +370,8 @@ manhole_settings: - # If these are left unset, then hardcoded and non-secret keys are used, - # which could allow traffic to be intercepted if sent over a public network. - # -- #ssh_priv_key_path: CONFDIR/id_rsa -- #ssh_pub_key_path: CONFDIR/id_rsa.pub -+ #ssh_priv_key_path: /etc/synapse/id_rsa -+ #ssh_pub_key_path: /etc/synapse/id_rsa.pub - - # Forward extremities can build up in a room due to networking delays between - # homeservers. Once this happens in a large room, calculation of the state of -@@ -614,11 +614,11 @@ retention: - # any intermediate certificates (for instance, if using certbot, use - # `fullchain.pem` as your certificate, not `cert.pem`). - # --#tls_certificate_path: "CONFDIR/SERVERNAME.tls.crt" -+#tls_certificate_path: "/etc/synapse/SERVERNAME.tls.crt" - - # PEM-encoded private key for TLS - # --#tls_private_key_path: "CONFDIR/SERVERNAME.tls.key" -+#tls_private_key_path: "/etc/synapse/SERVERNAME.tls.key" - - # Whether to verify TLS server certificates for outbound federation requests. - # -@@ -808,7 +808,7 @@ caches: - database: - name: sqlite3 - args: -- database: DATADIR/homeserver.db -+ database: /var/lib/synapse/homeserver.db - - - ## Logging ## -@@ -816,7 +816,7 @@ database: - # A yaml python logging config file as described by - # https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema - # --log_config: "CONFDIR/SERVERNAME.log.config" -+log_config: "/etc/synapse/log.yaml" - - - ## Ratelimiting ## -@@ -942,7 +942,7 @@ log_config: "CONFDIR/SERVERNAME.log.config" - - # Directory where uploaded images and attachments are stored. - # --media_store_path: "DATADIR/media_store" -+media_store_path: "/var/lib/synapse/media_store" - - # Media storage providers allow media to be stored in different - # locations. -@@ -1531,7 +1531,7 @@ room_prejoin_state: - - # Path to the signing key to sign messages with - # --signing_key_path: "CONFDIR/SERVERNAME.signing.key" -+signing_key_path: "/etc/synapse/SERVERNAME.signing.key" - - # The keys that the server used to sign messages with but won't use - # to sign new messages. -@@ -1710,7 +1710,7 @@ saml2_config: - # Instead of putting the config inline as above, you can specify a - # separate pysaml2 configuration file: - # -- #config_path: "CONFDIR/sp_conf.py" -+ #config_path: "/etc/synapse/sp_conf.py" - - # The lifetime of a SAML session. This defines how long a user has to - # complete the authentication process, if allow_unsolicited is unset. diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch deleted file mode 100644 index e4196a446456..000000000000 --- a/srcpkgs/synapse/patches/sample_log_config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml -index 2485ad25e..71465726b 100644 ---- a/docs/sample_log_config.yaml -+++ b/docs/sample_log_config.yaml -@@ -19,7 +19,7 @@ handlers: - file: - class: logging.handlers.TimedRotatingFileHandler - formatter: precise -- filename: /var/log/matrix-synapse/homeserver.log -+ filename: /var/log/synapse/homeserver.log - when: midnight - backupCount: 3 # Does not include the current log file. - encoding: utf8 diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index abdb2e314e62..f2d50a1fdb97 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,8 +1,9 @@ # Template file for 'synapse' pkgname=synapse -version=1.49.2 +version=1.50.2 revision=1 build_style=python3-module +make_check_target=tests hostmakedepends="python3-setuptools" depends="python3-jsonschema python3-frozendict python3-canonicaljson python3-signedjson python3-pynacl python3-service_identity python3-Twisted @@ -11,27 +12,24 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson python3-phonenumbers python3-prometheus_client python3-attrs python3-netaddr python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq python3-macaroons python3-sortedcontainers - python3-typing_extensions python3-ijson" -checkdepends="$depends python3-parameterized python3-mock" + python3-typing_extensions python3-ijson python3-matrix-common" +checkdepends="$depends python3-parameterized python3-pytest" short_desc="Matrix reference homeserver" maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=f5b0017e9d77db94fac853fbefbcb4538d879cb80f404b02003930c76f5cafab +checksum=0e8f52d8a14c5994addda13332c67c6cb8604d090be0dc8f459645f6d1fb48cb system_accounts="synapse" synapse_homedir="/var/lib/synapse" make_dirs=" /var/lib/synapse 0700 synapse synapse + /etc/synapse 755 synapse synapse /var/log/synapse 0755 synapse synapse" -do_check() { - PYTHONPATH="." trial3 ${makejobs} tests -} - post_install() { vsv synapse