Re: [PR PATCH] [Updated] synapse: update to 1.36.0

[AluminumTank <AluminumTank@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There is an updated pull request by AluminumTank against master on the void-packages repository

https://github.com/AluminumTank/void-packages synapse
https://github.com/void-linux/void-packages/pull/31263

synapse: update to 1.36.0
<!-- Mark items with [x] where applicable -->
New dependency `python3-ijson` needed.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31263.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-31263.patch --]
[-- Type: text/x-diff, Size: 8091 bytes --]

From f3a1a44d525fc09df1be171987a1356d9d09c6f4 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@thebeckmeyers.xyz>
Date: Wed, 2 Jun 2021 13:03:05 -0400
Subject: [PATCH 1/3] synapse: update to 1.35.0

---
 srcpkgs/synapse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 24dd39948aa5..96896eeb98d2 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.33.2
+version=1.35.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,14 +12,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-attrs python3-netaddr python3-setuptools python3-bleach
  python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq
  python3-txacme python3-macaroons python3-sortedcontainers
- python3-typing_extensions"
+ python3-typing_extensions python3-ijson"
 short_desc="Matrix reference homeserver"
 maintainer="Pete <pete@port22.co.uk>"
 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=5e0a934dba5994ec102e94ba323e88746b9aec6ccaae03ba2c94780a6dbfeb97
+checksum=2c83e5eb66639608e0e0a642692fb43eb78918fbad858d8b5d2b18c785438d25
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From c8cc083445dff143938f13edfb8b2537fbd01280 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@thebeckmeyers.xyz>
Date: Wed, 2 Jun 2021 13:28:39 -0400
Subject: [PATCH 2/3] New package: python3-ijson-3.1.4_1

---
 srcpkgs/python3-ijson/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-ijson/template

diff --git a/srcpkgs/python3-ijson/template b/srcpkgs/python3-ijson/template
new file mode 100644
index 000000000000..7d3dea67a261
--- /dev/null
+++ b/srcpkgs/python3-ijson/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-ijson'
+pkgname=python3-ijson
+version=3.1.4
+revision=1
+wrksrc="ijson-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="yajl-devel python3-devel"
+depends="python3 yajl"
+checkdepends="python3-cffi"
+short_desc="Iterative JSON parser with Pythonic interfaces"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/ICRAR/ijson"
+distfiles="${PYPI_SITE}/i/ijson/ijson-${version}.tar.gz"
+checksum=1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 6c20d0faef96d6b7536c58d200ec4a582fa9ba03 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Thu, 3 Jun 2021 10:41:44 -0400
Subject: [PATCH 3/3] synapse: update to 1.36.0

---
 .../patches/remove-yajl-backend-test.patch    | 18 ++++++
 .../patches/remove-yajl-backend.patch         | 62 +++++++++++++++++++
 srcpkgs/synapse/files/synapse/log/run         |  1 +
 srcpkgs/synapse/template                      |  4 +-
 4 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch
 create mode 100644 srcpkgs/python3-ijson/patches/remove-yajl-backend.patch
 create mode 120000 srcpkgs/synapse/files/synapse/log/run

diff --git a/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch b/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch
new file mode 100644
index 000000000000..dac39071df98
--- /dev/null
+++ b/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch
@@ -0,0 +1,18 @@
+--- test/test_base.py.orig	2021-06-16 17:26:14.845716697 -0400
++++ test/test_base.py	2021-06-16 17:28:18.354837169 -0400
+@@ -593,7 +593,7 @@
+ 
+ def generate_backend_specific_tests(module, classname_prefix, method_suffix,
+                                     *bases, **kwargs):
+-    for backend in ['python', 'yajl', 'yajl2', 'yajl2_cffi', 'yajl2_c']:
++    for backend in ['python', 'yajl2', 'yajl2_cffi', 'yajl2_c']:
+         try:
+             classname = '%s%sTests' % (
+                 ''.join(p.capitalize() for p in backend.split('_')),
+@@ -628,4 +628,4 @@
+             'handles_incomplete_json_tokens': name != 'yajl'
+         }
+         return generate_backend_specific_tests(module, classname, method_suffix,
+-                                               members=members, *_bases)
+\ No newline at end of file
++                                               members=members, *_bases)
diff --git a/srcpkgs/python3-ijson/patches/remove-yajl-backend.patch b/srcpkgs/python3-ijson/patches/remove-yajl-backend.patch
new file mode 100644
index 000000000000..60d71d3901f8
--- /dev/null
+++ b/srcpkgs/python3-ijson/patches/remove-yajl-backend.patch
@@ -0,0 +1,62 @@
+--- ijson/backends/yajl.py.orig	2021-03-02 05:04:56.000000000 -0500
++++ ijson/backends/yajl.py	2021-06-16 17:37:48.983634006 -0400
+@@ -1,59 +0,0 @@
+-'''
+-Wrapper for YAJL C library version 1.x.
+-'''
+-
+-from ctypes import Structure, c_uint, byref
+-
+-from ijson import common, utils
+-from ijson.backends import _yajl2_ctypes_common
+-
+-
+-yajl = _yajl2_ctypes_common.get_yajl(1)
+-
+-class Config(Structure):
+-    _fields_ = [
+-        ("allowComments", c_uint),
+-        ("checkUTF8", c_uint)
+-    ]
+-
+-
+-@utils.coroutine
+-def basic_parse_basecoro(target, allow_comments=False, multiple_values=False,
+-                         use_float=False):
+-    '''
+-    Iterator yielding unprefixed events.
+-
+-    Parameters:
+-
+-    - f: a readable file-like object with JSON input
+-    - allow_comments: tells parser to allow comments in JSON input
+-    - check_utf8: if True, parser will cause an error if input is invalid utf-8
+-    - buf_size: a size of an input buffer
+-    '''
+-    if multiple_values:
+-        raise ValueError("yajl backend doesn't support multiple_values")
+-    callbacks = _yajl2_ctypes_common.make_callbaks(target.send, use_float, 1)
+-    config = Config(allow_comments, True)
+-    handle = yajl.yajl_alloc(byref(callbacks), byref(config), None, None)
+-    try:
+-        while True:
+-            try:
+-                buffer = (yield)
+-            except GeneratorExit:
+-                buffer = b''
+-            if buffer:
+-                result = yajl.yajl_parse(handle, buffer, len(buffer))
+-            else:
+-                result = yajl.yajl_parse_complete(handle)
+-            if result == _yajl2_ctypes_common.YAJL_ERROR:
+-                error = _yajl2_ctypes_common.yajl_get_error(yajl, handle, buffer)
+-                raise common.JSONError(error)
+-            elif not buffer:
+-                if result == _yajl2_ctypes_common.YAJL_INSUFFICIENT_DATA:
+-                    raise common.IncompleteJSONError('Incomplete JSON data')
+-                break
+-    finally:
+-        yajl.yajl_free(handle)
+-
+-
+-common.enrich_backend(globals())
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/synapse/files/synapse/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 96896eeb98d2..2df4e6fb3485 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.35.0
+version=1.36.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ 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=2c83e5eb66639608e0e0a642692fb43eb78918fbad858d8b5d2b18c785438d25
+checksum=056e2982a8685e7693a7b52a0947f512a8f864acd7b6be859c9b0b6c564d52ed
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"