From 85934a8339c68052c7190c9da8416c2ded3823f6f96e75046f9c8601cc57a68a Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Tue, 11 May 2021 14:14:47 +0000
Subject: [PATCH] Accepting request 892256 from home:darix:apps

- Update to 1.33.2
  Due to the security issue highlighted below, server
  administrators are encouraged to update Synapse. We are not aware
  of these vulnerabilities being exploited in the wild.
  Security advisory
  This release fixes a denial of service attack (CVE-2021-29471)
  against Synapse's push rules implementation. Server admins are
  encouraged to upgrade.
  - Internal Changes
    - Unpin attrs dependency. (#9946)

OBS-URL: https://build.opensuse.org/request/show/892256
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=176
---
 _service                      |  2 +-
 matrix-synapse-1.33.1.obscpio |  3 ---
 matrix-synapse-1.33.2.obscpio |  3 +++
 matrix-synapse-test.spec      |  2 +-
 matrix-synapse.changes        | 16 ++++++++++++++++
 matrix-synapse.obsinfo        |  6 +++---
 matrix-synapse.spec           |  4 ++--
 7 files changed, 26 insertions(+), 10 deletions(-)
 delete mode 100644 matrix-synapse-1.33.1.obscpio
 create mode 100644 matrix-synapse-1.33.2.obscpio

diff --git a/_service b/_service
index bade60a..b1c84d6 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="url">https://github.com/matrix-org/synapse.git</param>
     <param name="scm">git</param>
-    <param name="revision">v1.33.1</param>
+    <param name="revision">v1.33.2</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <!--
diff --git a/matrix-synapse-1.33.1.obscpio b/matrix-synapse-1.33.1.obscpio
deleted file mode 100644
index 71df0a2..0000000
--- a/matrix-synapse-1.33.1.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1383a9491e44c5730b8f487cdf44eaaa9029d90d9b0f9d010beb80500689510a
-size 30060045
diff --git a/matrix-synapse-1.33.2.obscpio b/matrix-synapse-1.33.2.obscpio
new file mode 100644
index 0000000..964a1be
--- /dev/null
+++ b/matrix-synapse-1.33.2.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5177d693f414c3a6812f9e1c24c646c638ebc1fdd701c0857441f7d051cdfd06
+size 30069261
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index 37517f8..0a8f106 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -27,7 +27,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.33.1
+Version:        1.33.2
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        Apache-2.0
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index 2574d1a..c9ccc33 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue May 11 13:46:25 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 1.33.2
+  Due to the security issue highlighted below, server
+  administrators are encouraged to update Synapse. We are not aware
+  of these vulnerabilities being exploited in the wild.
+
+  Security advisory
+  This release fixes a denial of service attack (CVE-2021-29471)
+  against Synapse's push rules implementation. Server admins are
+  encouraged to upgrade.
+
+  - Internal Changes
+    - Unpin attrs dependency. (#9946)
+
 -------------------------------------------------------------------
 Thu May  6 14:44:02 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index ad7d02a..24c681d 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,5 +1,5 @@
 name: matrix-synapse
-version: 1.33.1
-mtime: 1620306398
-commit: ac88aca7f7acc2ce909db230682f93bb4e2ff73b
+version: 1.33.2
+mtime: 1620738586
+commit: d1473f7362e9b146dbd256076c8e3c7d163e7d94
 
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 43cea87..85defbb 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -45,7 +45,7 @@
 %define         pkgname matrix-synapse
 %define         eggname matrix_synapse
 Name:           %{pkgname}
-Version:        1.33.1
+Version:        1.33.2
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        Apache-2.0
@@ -84,7 +84,7 @@ BuildRequires:  python3-PyYAML >= 3.11
 %requires_eq    python3-PyYAML
 BuildRequires:  python3-Twisted >= 20.3.0
 %requires_eq    python3-Twisted
-BuildRequires:  (python3-attrs >= 19.1.0 with python3-attrs < 21.1.0)
+BuildRequires:  ((python3-attrs >= 19.1.0 with python3-attrs < 21.1.0) or python3-attrs > 21.1.0)
 %requires_eq    python3-attrs
 BuildRequires:  python3-bcrypt >= 3.2.0
 %requires_eq    python3-bcrypt