From 1881b34462a8d90ac0ca4e34945d41e222faf05d Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 23 Mar 2020 20:09:51 +0100
Subject: [PATCH 1/3] matrix-synapse: 1.11.1 -> 1.12.0

(cherry picked from commit 425efa54ef5a01a2d4b6af7aeac846d0cde6e2b6)
---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 20081e25d431c..39ad39b96b9a2 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -23,11 +23,11 @@ let
 
 in buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xd4bxsmk67r6pfj5lh0hn36r8z51mxsl39fjfrfdidvl1qqbxnk";
+    sha256 = "18wavnb47w4hfh8dc7g77bfhz03zh1xzl58mxlfi0000qsbkz680";
   };
 
   patches = [

From 2015db31ae499e8c6efa338eae8b0330a4649442 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Mar 2020 18:57:25 +0100
Subject: [PATCH 2/3] python3Packages.twisted: fix CVE-2020-10109

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 pkgs/development/python-modules/twisted/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 249ddb4be8638..44e5aa91e1d65 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -13,6 +13,7 @@
 , service-identity
 , setuptools
 , idna
+, fetchpatch
 }:
 buildPythonPackage rec {
   pname = "Twisted";
@@ -24,6 +25,13 @@ buildPythonPackage rec {
     sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/python-twisted/raw/9248b58fc9b22a159f50759ab4959619dfa04a04/f/0001-Fix-several-request-smuggling-attacks.patch";
+      sha256 = "14xx96hiyp5d3w287rpxls8wz49akr4fb1jp5am511j4g9vckb8b";
+    })
+  ];
+
   propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ];
 
   passthru.extras.tls = [ pyopenssl service-identity idna ];

From a8639dff979038731c8ae77a995b0fc424dbefa8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Mar 2020 21:54:52 +0200
Subject: [PATCH 3/3] python3Packages.pysaml2: fix tests

---
 pkgs/development/python-modules/pysaml2/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 1528623aa0ecb..73f195af3035b 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -4,7 +4,7 @@
 , substituteAll
 , xmlsec
 , cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six
-, mock, pyasn1, pymongo, pytest, responses
+, mock, pyasn1, pymongo, pytest, responses, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -24,6 +24,11 @@ buildPythonPackage rec {
       src = ./hardcode-xmlsec1-path.patch;
       inherit xmlsec;
     })
+    (fetchpatch {
+      name = "fix-test-dates.patch";
+      url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch";
+      sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p";
+    })
   ];
 
   propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];