Don’t bump python3-cryptography

3 files changed, 31 insertions, 7 deletions

diff --git a/debian/patches/0002-change_instructions.patch b/debian/patches/0001-change_instructions.patch
index 98af631f..76581040 100644
--- a/debian/patches/0002-change_instructions.patch
+++ b/debian/patches/0001-change_instructions.patch
@@ -1,33 +1,33 @@
 From: Erik Johnston <erikj@matrix.org>
 Date: Fri, 10 Jun 2016 10:57:07 +0100
-Subject: change_instructions
+Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing
 
 ---
  synapse/config/_base.py | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 diff --git a/synapse/config/_base.py b/synapse/config/_base.py
-index 1ab5593..14052a9 100644
+index ba9cd63..3d17239 100644
 --- a/synapse/config/_base.py
 +++ b/synapse/config/_base.py
-@@ -32,6 +32,11 @@
+@@ -50,6 +50,11 @@ class ConfigError(Exception):
  MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\
  Please opt in or out of reporting anonymized homeserver usage statistics, by
  setting the `report_stats` key in your config file to either True or False.
 +
-+To set it run:
++To set it, run:
 +
 +    dpkg-reconfigure matrix-synapse
 +
  """
  
  MISSING_REPORT_STATS_SPIEL = """\
-@@ -46,6 +51,11 @@
+@@ -64,6 +69,11 @@ Thank you.
  
  MISSING_SERVER_NAME = """\
  Missing mandatory `server_name` config option.
 +
-+To set it run:
++To set it, run:
 +
 +    dpkg-reconfigure matrix-synapse
 +
diff --git a/debian/patches/0002-dont-bump-cryptography.patch b/debian/patches/0002-dont-bump-cryptography.patch
new file mode 100644
index 00000000..02f79f6e
--- /dev/null
+++ b/debian/patches/0002-dont-bump-cryptography.patch
@@ -0,0 +1,23 @@
+From: Andrej Shadura <andrewsh@debian.org>
+Date: Wed, 7 Apr 2021 13:48:48 +0200
+Subject: Drop a version bump unnecessary in Debian
+
+In Debian, python3-cryptography doesn’t bundle openssl anyway.
+---
+ synapse/python_dependencies.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
+index 2a1c925..0c99e37 100644
+--- a/synapse/python_dependencies.py
++++ b/synapse/python_dependencies.py
+@@ -83,9 +83,6 @@ REQUIREMENTS = [
+     "Jinja2>=2.9",
+     "bleach>=1.4.3",
+     "typing-extensions>=3.7.4",
+-    # We enforce that we have a `cryptography` version that bundles an `openssl`
+-    # with the latest security patches.
+-    "cryptography>=3.4.7;python_version>='3.6'",
+ ]
+ 
+ CONDITIONAL_REQUIREMENTS = {
diff --git a/debian/patches/series b/debian/patches/series
index 6839e69a..e35aaf80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0002-change_instructions.patch
+0001-change_instructions.patch
+0002-dont-bump-cryptography.patch