diff options
| author | Andrej Shadura <andrewsh@debian.org> | 2021-12-14 17:42:02 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2021-12-14 17:42:02 +0100 |
| commit | 522b26015a1700725baaf37bce47f88682e76c89 (patch) | |
| tree | 40e224b1b6a5f20f5bba1a741c30e153e207aaa7 | |
| parent | f5c1239ef1fc825abf9d5a101432b96c65c06d0a (diff) | |
Refresh patchesdebian/1.49.0-1
| -rw-r--r-- | debian/patches/0001-change_instructions.patch | 6 | ||||
| -rw-r--r-- | debian/patches/0002-dont-bump-cryptography.patch | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/0001-change_instructions.patch b/debian/patches/0001-change_instructions.patch index 76581040..6ee026d6 100644 --- a/debian/patches/0001-change_instructions.patch +++ b/debian/patches/0001-change_instructions.patch @@ -7,10 +7,10 @@ Subject: Point users to dpkg-reconfigure when debconf-managed settings are missi 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py -index ba9cd63..3d17239 100644 +index 1265738..308e56f 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py -@@ -50,6 +50,11 @@ class ConfigError(Exception): +@@ -60,6 +60,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. @@ -22,7 +22,7 @@ index ba9cd63..3d17239 100644 """ MISSING_REPORT_STATS_SPIEL = """\ -@@ -64,6 +69,11 @@ Thank you. +@@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. diff --git a/debian/patches/0002-dont-bump-cryptography.patch b/debian/patches/0002-dont-bump-cryptography.patch index a138fb6b..bff8b889 100644 --- a/debian/patches/0002-dont-bump-cryptography.patch +++ b/debian/patches/0002-dont-bump-cryptography.patch @@ -8,10 +8,10 @@ In Debian, python3-cryptography doesn’t bundle openssl anyway. 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py -index 45a6b82..abd09ad 100644 +index 7d26954..7bf9aa9 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py -@@ -84,9 +84,7 @@ REQUIREMENTS = [ +@@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", @@ -19,6 +19,6 @@ index 45a6b82..abd09ad 100644 - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", - "ijson>=3.0", + "ijson>=3.1", ] |