From b54a6d570e98d4bc709e6b9693e1089314360921 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 13 Dec 2021 14:59:13 +0000 Subject: [PATCH 1/5] update olm to 3.2.8 (#7347) --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 81c4b594b2..54b725a416 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "@babel/preset-typescript": "^7.12.7", "@babel/register": "^7.12.10", "@babel/traverse": "^7.12.12", - "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz", + "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz", "@peculiar/webcrypto": "^1.1.4", "@sentry/types": "^6.10.0", "@sinonjs/fake-timers": "^7.0.2", diff --git a/yarn.lock b/yarn.lock index 49c8bb2403..6053979047 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1306,9 +1306,9 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz": - version "3.2.3" - resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz#cc332fdd25c08ef0e40f4d33fc3f822a0f98b6f4" +"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz": + version "3.2.8" + resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz#8d53636d045e1776e2a2ec6613e57330dd9ce856" "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3": version "2.1.8-no-fsevents.3" From 2ceed006aab95fed4d9169ef6dc83f339500e16a Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 13 Dec 2021 14:59:36 +0000 Subject: [PATCH 2/5] Fix CallPreview `room is null` (#7265) (#7348) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/voip/CallPreview.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx index 1c667e4229..79a7d8c0e1 100644 --- a/src/components/views/voip/CallPreview.tsx +++ b/src/components/views/voip/CallPreview.tsx @@ -133,7 +133,9 @@ export default class CallPreview extends React.Component { dis.unregister(this.dispatcherRef); SettingsStore.unwatchSetting(this.settingsWatcherRef); const room = MatrixClientPeg.get().getRoom(this.state.roomId); - WidgetLayoutStore.instance.off(WidgetLayoutStore.emissionForRoom(room), this.updateCalls); + if (room) { + WidgetLayoutStore.instance.off(WidgetLayoutStore.emissionForRoom(room), this.updateCalls); + } } private onRoomViewStoreUpdate = () => { From 72bdd6140765faeb7e9ad0bf5c936a049c539d47 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 13 Dec 2021 15:25:24 +0000 Subject: [PATCH 3/5] Upgrade matrix-js-sdk to 15.2.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 54b725a416..af0a058b29 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "katex": "^0.12.0", "linkifyjs": "^2.1.9", "lodash": "^4.17.20", - "matrix-js-sdk": "15.2.0", + "matrix-js-sdk": "15.2.1", "matrix-widget-api": "^0.1.0-beta.17", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index 6053979047..69259c079f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5869,10 +5869,10 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@15.2.0: - version "15.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.2.0.tgz#1f04fe938f951af8af4b78dff8ff697db5981428" - integrity sha512-jZOM8Fn86oNvU3zVQcc+JTKKrtYq4ADN6rPZs4Mwxj/X/GDP+2YIP5176GtviF0GM6VO1dcnPZY73ykl8DayjA== +matrix-js-sdk@15.2.1: + version "15.2.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.2.1.tgz#61e9742ccacfe486231415372e12cb13607b5d7c" + integrity sha512-e0/NE6LUfDLKLdWNFyH5OGt2QHybandrC0x9qgj7P1/fe+zgLGGd8W4XGDa5CMHjjqm/OoLMam44+0+FafojlQ== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From f94ec6dfbd2d911b123ad0bf81f51ebb8299a213 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 13 Dec 2021 15:27:01 +0000 Subject: [PATCH 4/5] Prepare changelog for v3.36.1 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0938203e9a..682bce111c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [3.36.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.36.1) (2021-12-13) +===================================================================================================== + + * Security release with updated version of Olm to fix https://matrix.org/blog/2021/12/03/pre-disclosure-upcoming-security-release-of-libolm-and-matrix-js-sdk + * Fix a crash on logout + Changes in [3.36.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.36.0) (2021-12-06) ===================================================================================================== From b693ecffb8a0aa9756b50f47e1b102d92f5a8d62 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 13 Dec 2021 15:27:02 +0000 Subject: [PATCH 5/5] v3.36.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index af0a058b29..4785183dd2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.36.0", + "version": "3.36.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {