From 0fa46ec2169fe2f2c5dd51578f1cdb6c98f635eddb1ee8f8c94e7db8bc36fc3c Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Wed, 4 Mar 2020 14:48:28 +0000
Subject: [PATCH] Accepting request 781565 from home:darix:apps

- Update to 1.11.1
  This release includes a security fix impacting installations
  using Single Sign-On (i.e. SAML2 or CAS) for authentication.
  Administrators of such installations are encouraged to upgrade as
  soon as possible.
  - Bugfixes
    - Add a confirmation step to the SSO login flow before
      redirecting users to the redirect URL.
      ([b2bd54a2](https://github.com/matrix-org/synapse/commit/b2bd54a2e31d9a248f73fadb184ae9b4cbdb49f9),
      [65c73cdf](https://github.com/matrix-org/synapse/commit/65c73cdfec1876a9fec2fd2c3a74923cd146fe0b),
      [a0178df1](https://github.com/matrix-org/synapse/commit/a0178df10422a76fd403b82d2b2a4ed28a9a9d1e))
    - Fixed set a user as an admin with the admin API `PUT
      /_synapse/admin/v2/users/<user_id>`. Contributed by
      @dklimpel.
      ([\#6910](https://github.com/matrix-org/synapse/issues/6910))
    - Fix bug introduced in Synapse 1.11.0 which sometimes caused
      errors when joining rooms over federation, with `'coroutine'
      object has no attribute 'event_id'`.
      ([\#6996](https://github.com/matrix-org/synapse/issues/6996))

- track series file to make updating patches easier

OBS-URL: https://build.opensuse.org/request/show/781565
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=119
---
 _service                      |  2 +-
 matrix-synapse-1.11.0.obscpio |  3 ---
 matrix-synapse-1.11.1.obscpio |  3 +++
 matrix-synapse-test.spec      |  2 +-
 matrix-synapse.changes        | 29 +++++++++++++++++++++++++++++
 matrix-synapse.obsinfo        |  6 +++---
 matrix-synapse.spec           |  6 +++++-
 series                        |  1 +
 8 files changed, 43 insertions(+), 9 deletions(-)
 delete mode 100644 matrix-synapse-1.11.0.obscpio
 create mode 100644 matrix-synapse-1.11.1.obscpio
 create mode 100644 series

diff --git a/_service b/_service
index baa4111..040f53b 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.11.0</param>
+    <param name="revision">v1.11.1</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <!--
     <param name="versionrewrite-pattern">v([\.\d]+)(rc.*)</param>
diff --git a/matrix-synapse-1.11.0.obscpio b/matrix-synapse-1.11.0.obscpio
deleted file mode 100644
index c5ede14..0000000
--- a/matrix-synapse-1.11.0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86d8c966947e26f57b9126c23ed30cb9b99c19ed795f2a219dbac8c7c673d02e
-size 26527245
diff --git a/matrix-synapse-1.11.1.obscpio b/matrix-synapse-1.11.1.obscpio
new file mode 100644
index 0000000..fad61ba
--- /dev/null
+++ b/matrix-synapse-1.11.1.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ac262ab6ee74268659529697ae41be6fb64efae2a5171060718bace41ef1653
+size 26549261
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index 0703b65..15df0fc 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -32,7 +32,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.11.0
+Version:        1.11.1
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        Apache-2.0
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index b47605f..350a264 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue Mar  3 21:43:02 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 1.11.1 
+  This release includes a security fix impacting installations
+  using Single Sign-On (i.e. SAML2 or CAS) for authentication.
+  Administrators of such installations are encouraged to upgrade as
+  soon as possible.
+
+  - Bugfixes
+    - Add a confirmation step to the SSO login flow before
+      redirecting users to the redirect URL.
+      ([b2bd54a2](https://github.com/matrix-org/synapse/commit/b2bd54a2e31d9a248f73fadb184ae9b4cbdb49f9),
+      [65c73cdf](https://github.com/matrix-org/synapse/commit/65c73cdfec1876a9fec2fd2c3a74923cd146fe0b),
+      [a0178df1](https://github.com/matrix-org/synapse/commit/a0178df10422a76fd403b82d2b2a4ed28a9a9d1e))
+    - Fixed set a user as an admin with the admin API `PUT
+      /_synapse/admin/v2/users/<user_id>`. Contributed by
+      @dklimpel.
+      ([\#6910](https://github.com/matrix-org/synapse/issues/6910))
+    - Fix bug introduced in Synapse 1.11.0 which sometimes caused
+      errors when joining rooms over federation, with `'coroutine'
+      object has no attribute 'event_id'`.
+      ([\#6996](https://github.com/matrix-org/synapse/issues/6996))
+
+-------------------------------------------------------------------
+Fri Feb 21 15:12:49 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
+
+- track series file to make updating patches easier
+
 -------------------------------------------------------------------
 Fri Feb 21 12:58:18 UTC 2020 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index f5faa0b..11f90d3 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,5 +1,5 @@
 name: matrix-synapse
-version: 1.11.0
-mtime: 1582275364
-commit: 9c1b83b0078aa9cc1bb902e14d3f7302625ba099
+version: 1.11.1
+mtime: 1583247703
+commit: 6b0ef34706e32121ff6f802d62b3eb8545785afe
 
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 5454bf9..ad42776 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -46,7 +46,7 @@
 %define         modname synapse
 %define         pkgname matrix-synapse
 Name:           %{pkgname}
-Version:        1.11.0
+Version:        1.11.1
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        Apache-2.0
@@ -57,6 +57,10 @@ Source48:       README.SUSE
 Source49:       matrix-synapse.tmpfiles.d
 Source50:       %{pkgname}.service
 Source51:       matrix-synapse-generate-config.sh
+# track series file so we can easily use quilt
+# cd synapse ; ln -s .. patches ; quilt push -a
+# to clean up your working copy afterwards: git reset --hard ; rm -rv .pc patches
+Source99:       series
 Patch:          matrix-synapse-1.4.1-paths.patch
 BuildRequires:  %{python_module base}
 BuildRequires:  %{python_module psutil >= 2.0.0}
diff --git a/series b/series
new file mode 100644
index 0000000..2b23912
--- /dev/null
+++ b/series
@@ -0,0 +1 @@
+matrix-synapse-1.4.1-paths.patch