From ef7ee136b765e904a9107e23995ca60cb409cfbf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 15 Jan 2025 08:09:17 -0500
Subject: [PATCH] synapse: update to 1.131.0.

---
 srcpkgs/synapse/patches/poetry-core.patch     | 13 +++++++
 .../twisted-24.11.0-test-failure.patch        | 35 +++++++++++++++++++
 srcpkgs/synapse/template                      |  6 ++--
 3 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/synapse/patches/poetry-core.patch
 create mode 100644 srcpkgs/synapse/patches/twisted-24.11.0-test-failure.patch

diff --git a/srcpkgs/synapse/patches/poetry-core.patch b/srcpkgs/synapse/patches/poetry-core.patch
new file mode 100644
index 00000000000..f37a11ad836
--- /dev/null
+++ b/srcpkgs/synapse/patches/poetry-core.patch
@@ -0,0 +1,13 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 2d982ea..289565b 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -370,7 +370,7 @@ tomli = ">=1.2.3"
+ # runtime errors caused by build system changes.
+ # We are happy to raise these upper bounds upon request,
+ # provided we check that it's safe to do so (i.e. that CI passes).
+-requires = ["poetry-core>=1.1.0,<=1.9.1", "setuptools_rust>=1.3,<=1.10.2"]
++requires = ["poetry-core>=1.1.0,<=2.0.1", "setuptools_rust>=1.3,<=1.11.1"]
+ build-backend = "poetry.core.masonry.api"
+ 
+ 
diff --git a/srcpkgs/synapse/patches/twisted-24.11.0-test-failure.patch b/srcpkgs/synapse/patches/twisted-24.11.0-test-failure.patch
new file mode 100644
index 00000000000..b90a704c23c
--- /dev/null
+++ b/srcpkgs/synapse/patches/twisted-24.11.0-test-failure.patch
@@ -0,0 +1,35 @@
+diff --git a/tests/storage/databases/main/test_events_worker.py b/tests/storage/databases/main/test_events_worker.py
+index 104d141..a172d2c 100644
+--- a/tests/storage/databases/main/test_events_worker.py
++++ b/tests/storage/databases/main/test_events_worker.py
+@@ -447,30 +447,6 @@ class DatabaseOutageTestCase(unittest.HomeserverTestCase):
+             )
+             self.assertEqual(str(failure.value), "Could not connect to the database.")
+ 
+-    def test_recovery(self) -> None:
+-        """Test that event fetchers recover after a database outage."""
+-        with self._outage():
+-            # Kick off a bunch of event fetches but do not pump the reactor
+-            event_deferreds = []
+-            for event_id in self.event_ids:
+-                event_deferreds.append(ensureDeferred(self.store.get_event(event_id)))
+-
+-            # We should have maxed out on event fetcher threads
+-            self.assertEqual(self.store._event_fetch_ongoing, EVENT_QUEUE_THREADS)
+-
+-            # All the event fetchers will fail
+-            self.pump()
+-            self.assertEqual(self.store._event_fetch_ongoing, 0)
+-
+-            for event_deferred in event_deferreds:
+-                failure = self.get_failure(event_deferred, Exception)
+-                self.assertEqual(
+-                    str(failure.value), "Could not connect to the database."
+-                )
+-
+-        # This next event fetch should succeed
+-        self.get_success(self.store.get_event(self.event_ids[0]))
+-
+ 
+ class GetEventCancellationTestCase(unittest.HomeserverTestCase):
+     """Test cancellation of `get_event` calls."""
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index ad75d9f934a..963c306f4a4 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.121.1
+version=1.131.0
 revision=1
 build_style=python3-pep517
 build_helper=rust
@@ -26,7 +26,7 @@ license="AGPL-3.0-or-later"
 homepage="https://element-hq.github.io/synapse"
 changelog="https://raw.githubusercontent.com/element-hq/synapse/develop/CHANGES.md"
 distfiles="https://github.com/element-hq/synapse/archive/refs/tags/v${version}.tar.gz"
-checksum=58beeacb5b61f87d791b808a3d1e0db3f4df55a731e652ac4ad86bd4145558da
+checksum=929be56bec346a667d24d1301c629c4052f8ecfec1667813a2662717dc4295a6
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -55,5 +55,5 @@ post_install() {
 	vsconf docs/sample_config.yaml homeserver.yaml
 	vsconf docs/sample_log_config.yaml log.yaml
 
-	vlicense LICENSE
+	vlicense LICENSE-AGPL-3.0
 }