From b02f6409cb2ce5c2bf85efb49096006febe0f6d1 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 9 Jun 2023 22:28:05 +0530
Subject: [PATCH] Version 1.68.2

---
 CHANGELOG.md           |  5 +++++
 CloudronManifest.json  |  4 ++--
 test/package-lock.json | 28 ++++++++++++++--------------
 test/package.json      |  4 ++--
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c32497..2bbc40b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -964,3 +964,8 @@
 * [Full changelog](https://github.com/matrix-org/synapse/releases/tag/v1.85.1)
 * Fix bug in schema delta that broke upgrades for some deployments. Introduced in v1.85.0. (#15738, #15739)
 
+[1.68.2]
+* Update Synapse to 1.85.2
+* [Full changelog](https://github.com/matrix-org/synapse/releases/tag/v1.85.2)
+* Fix regression where using TLS for HTTP replication between workers did not work. Introduced in v1.85.0. (#15746)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 7c0c59a..5cee925 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Secure & decentralized communication",
-  "version": "1.68.1",
-  "upstreamVersion": "1.85.1",
+  "version": "1.68.2",
+  "upstreamVersion": "1.85.2",
   "healthCheckPath": "/",
   "httpPort": 8008,
   "memoryLimit": 536870912,
diff --git a/test/package-lock.json b/test/package-lock.json
index 13f51c7..ffa6fcd 100644
--- a/test/package-lock.json
+++ b/test/package-lock.json
@@ -9,10 +9,10 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^113.0.0",
+        "chromedriver": "^114.0.1",
         "expect.js": "^0.3.1",
         "mocha": "^10.2.0",
-        "selenium-webdriver": "^4.9.2",
+        "selenium-webdriver": "^4.10.0",
         "superagent": "^8.0.9"
       }
     },
@@ -236,9 +236,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "113.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-113.0.0.tgz",
-      "integrity": "sha512-UnQlt2kPicYXVNHPzy9HfcWvEbKJjjKAEaatdcnP/lCIRwuSoZFVLH0HVDAGdbraXp3dNVhfE2Qx7gw8TnHnPw==",
+      "version": "114.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-114.0.1.tgz",
+      "integrity": "sha512-Srkyt7xv+RL9aSNVkmARm0tAfw84fIBKge9c1MCTiHfW0tjuNFdhKVlgD0TmPmwSKOeFJrTdd1Flf2hGWWKsUw==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.3",
@@ -1166,9 +1166,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.2.tgz",
-      "integrity": "sha512-0gDswAgVn6qbCYckZetQQvQK9tWW1r7LaumhiqY1/Wl/7JEWG0JANsTbZKnmGc3+cUU76zAi5/p0P8LUweXlig==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.10.0.tgz",
+      "integrity": "sha512-hSQPw6jgc+ej/UEcdQPG/iBwwMeCEgZr9HByY/J8ToyXztEqXzU9aLsIyrlj1BywBcStO4JQK/zMUWWrV8+riA==",
       "dependencies": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",
@@ -1633,9 +1633,9 @@
       }
     },
     "chromedriver": {
-      "version": "113.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-113.0.0.tgz",
-      "integrity": "sha512-UnQlt2kPicYXVNHPzy9HfcWvEbKJjjKAEaatdcnP/lCIRwuSoZFVLH0HVDAGdbraXp3dNVhfE2Qx7gw8TnHnPw==",
+      "version": "114.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-114.0.1.tgz",
+      "integrity": "sha512-Srkyt7xv+RL9aSNVkmARm0tAfw84fIBKge9c1MCTiHfW0tjuNFdhKVlgD0TmPmwSKOeFJrTdd1Flf2hGWWKsUw==",
       "requires": {
         "@testim/chrome-version": "^1.1.3",
         "axios": "^1.2.1",
@@ -2300,9 +2300,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "selenium-webdriver": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.2.tgz",
-      "integrity": "sha512-0gDswAgVn6qbCYckZetQQvQK9tWW1r7LaumhiqY1/Wl/7JEWG0JANsTbZKnmGc3+cUU76zAi5/p0P8LUweXlig==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.10.0.tgz",
+      "integrity": "sha512-hSQPw6jgc+ej/UEcdQPG/iBwwMeCEgZr9HByY/J8ToyXztEqXzU9aLsIyrlj1BywBcStO4JQK/zMUWWrV8+riA==",
       "requires": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.1",
diff --git a/test/package.json b/test/package.json
index 29ac320..a5d2443 100644
--- a/test/package.json
+++ b/test/package.json
@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^113.0.0",
+    "chromedriver": "^114.0.1",
     "expect.js": "^0.3.1",
     "mocha": "^10.2.0",
-    "selenium-webdriver": "^4.9.2",
+    "selenium-webdriver": "^4.10.0",
     "superagent": "^8.0.9"
   }
 }