Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package element-desktop for openSUSE:Factory
checked in at 2021-12-13 20:45:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/element-desktop (Old)
and /work/SRC/openSUSE:Factory/.element-desktop.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "element-desktop"
Mon Dec 13 20:45:22 2021 rev:6 rq:940305 version:1.9.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/element-desktop/element-desktop.changes
2021-12-10 21:53:14.998915517 +0100
+++
/work/SRC/openSUSE:Factory/.element-desktop.new.2520/element-desktop.changes
2021-12-13 20:51:39.556683396 +0100
@@ -1,0 +2,7 @@
+Mon Dec 13 16:16:35 UTC 2021 - Dominik Heidler <dheid...@suse.de>
+
+- Version 1.9.7
+ * Security fix: buffer overflow in libolm and matrix-js-sdk
+
https://matrix.org/blog/2021/12/13/disclosure-buffer-overflow-in-libolm-and-matrix-js-sdk
+
+-------------------------------------------------------------------
Old:
----
element-desktop-1.9.6.tar.gz
element-web-1.9.6.tar.gz
New:
----
element-desktop-1.9.7.tar.gz
element-web-1.9.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ element-desktop.spec ++++++
--- /var/tmp/diff_new_pack.JELwkC/_old 2021-12-13 20:51:40.308683877 +0100
+++ /var/tmp/diff_new_pack.JELwkC/_new 2021-12-13 20:51:40.312683879 +0100
@@ -17,7 +17,7 @@
Name: element-desktop
-Version: 1.9.6
+Version: 1.9.7
Release: 0
Summary: A glossy Matrix collaboration client - desktop
License: Apache-2.0
++++++ dist.tar.gz ++++++
/work/SRC/openSUSE:Factory/element-desktop/dist.tar.gz
/work/SRC/openSUSE:Factory/.element-desktop.new.2520/dist.tar.gz differ: char
15, line 1
++++++ element-desktop-1.9.6.tar.gz -> element-desktop-1.9.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-desktop-1.9.6/CHANGELOG.md
new/element-desktop-1.9.7/CHANGELOG.md
--- old/element-desktop-1.9.6/CHANGELOG.md 2021-12-06 16:43:57.000000000
+0100
+++ new/element-desktop-1.9.7/CHANGELOG.md 2021-12-13 17:01:53.000000000
+0100
@@ -1,3 +1,9 @@
+Changes in
[1.9.7](https://github.com/vector-im/element-desktop/releases/tag/v1.9.7)
(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
[1.9.6](https://github.com/vector-im/element-desktop/releases/tag/v1.9.6)
(2021-12-06)
=================================================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-desktop-1.9.6/package.json
new/element-desktop-1.9.7/package.json
--- old/element-desktop-1.9.6/package.json 2021-12-06 16:43:57.000000000
+0100
+++ new/element-desktop-1.9.7/package.json 2021-12-13 17:01:53.000000000
+0100
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
- "version": "1.9.6",
+ "version": "1.9.7",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -83,7 +83,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "13.5.1",
+ "electronVersion": "13.5.2",
"files": [
"package.json",
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-desktop-1.9.6/src/protocol.ts
new/element-desktop-1.9.7/src/protocol.ts
--- old/element-desktop-1.9.6/src/protocol.ts 2021-12-06 16:43:57.000000000
+0100
+++ new/element-desktop-1.9.7/src/protocol.ts 2021-12-13 17:01:53.000000000
+0100
@@ -19,7 +19,7 @@
import path from "path";
import fs from "fs";
-const PROTOCOL = "element://";
+const PROTOCOL = "element:";
const SEARCH_PARAM = "element-desktop-ssoid";
const STORE_FILE_NAME = "sso-sessions.json";
@@ -28,8 +28,28 @@
function processUrl(url: string): void {
if (!global.mainWindow) return;
- console.log("Handling link: ", url);
- global.mainWindow.loadURL(url.replace(PROTOCOL, "vector://"));
+
+ const parsed = new URL(url);
+ // sanity check: we only register for the one protocol, so we shouldn't
+ // be getting anything else unless the user is forcing a URL to open
+ // with the Element app.
+ if (parsed.protocol !== PROTOCOL) {
+ console.log("Ignoring unexpected protocol: ", parsed.protocol);
+ return;
+ }
+
+ const urlToLoad = new URL("vector://vector/webapp/");
+ // ignore anything other than the search (used for SSO login redirect)
+ // and the hash (for general element deep links)
+ // There's no reason to allow anything else, particularly other paths,
+ // since this would allow things like the internal jitsi wrapper to
+ // be loaded, which would get the app stuck on that page and generally
+ // be a bit strange and confusing.
+ urlToLoad.search = parsed.search;
+ urlToLoad.hash = parsed.hash;
+
+ console.log("Opening URL: ", urlToLoad.href);
+ global.mainWindow.loadURL(urlToLoad.href);
}
function readStore(): object {
@@ -62,10 +82,10 @@
export function getProfileFromDeeplink(args): string | undefined {
// check if we are passed a profile in the SSO callback url
- const deeplinkUrl = args.find(arg => arg.startsWith('element://'));
+ const deeplinkUrl = args.find(arg => arg.startsWith(PROTOCOL + '//'));
if (deeplinkUrl && deeplinkUrl.includes(SEARCH_PARAM)) {
const parsedUrl = new URL(deeplinkUrl);
- if (parsedUrl.protocol === 'element:') {
+ if (parsedUrl.protocol === PROTOCOL) {
const ssoID = parsedUrl.searchParams.get(SEARCH_PARAM);
const store = readStore();
console.log("Forwarding to profile: ", store[ssoID]);
@@ -96,7 +116,7 @@
// Protocol handler for win32/Linux
app.on('second-instance', (ev, commandLine) => {
const url = commandLine[commandLine.length - 1];
- if (!url.startsWith(PROTOCOL)) return;
+ if (!url.startsWith(PROTOCOL + '//')) return;
processUrl(url);
});
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-desktop-1.9.6/yarn.lock
new/element-desktop-1.9.7/yarn.lock
--- old/element-desktop-1.9.6/yarn.lock 2021-12-06 16:43:57.000000000 +0100
+++ new/element-desktop-1.9.7/yarn.lock 2021-12-13 17:01:53.000000000 +0100
@@ -142,9 +142,9 @@
ajv-keywords "^3.4.1"
"@electron/get@^1.0.1":
- version "1.13.0"
- resolved
"https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c";
- integrity
sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ==
+ version "1.13.1"
+ resolved
"https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368";
+ integrity
sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
@@ -154,7 +154,7 @@
semver "^6.2.0"
sumchecker "^3.0.1"
optionalDependencies:
- global-agent "^2.0.2"
+ global-agent "^3.0.0"
global-tunnel-ng "^2.7.1"
"@electron/universal@1.0.5":
@@ -758,9 +758,9 @@
integrity
sha512-WiFf2izl01P1CpeY8WqFAeKWwByMueBEkND38EcN8N68qb0aDG3oIS1P5MhAX5kUdr469qRyqsY/MjanLjsFbQ==
"@types/node@^14.6.2":
- version "14.17.21"
- resolved
"https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz#6359d8cf73481e312a43886fa50afc70ce5592c6";
- integrity
sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA==
+ version "14.18.0"
+ resolved
"https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a";
+ integrity
sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==
"@types/plist@^3.0.1":
version "3.0.2"
@@ -1613,11 +1613,6 @@
resolved
"https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e";
integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-core-js@^3.6.5:
- version "3.18.2"
- resolved
"https://registry.yarnpkg.com/core-js/-/core-js-3.18.2.tgz#63a551e8a29f305cd4123754846e65896619ba5b";
- integrity
sha512-zNhPOUoSgoizoSQFdX1MeZO16ORRb9FFQLts8gSYbZU5FcgXhp24iMWMxnOQo5uIaIG7/6FA/IqJPwev1o9ZXQ==
-
core-util-is@1.0.2:
version "1.0.2"
resolved
"https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7";
@@ -1708,7 +1703,7 @@
dependencies:
mimic-fn "^3.0.0"
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
+debug@4, debug@^4.0.1, debug@^4.3.1, debug@^4.3.2:
version "4.3.2"
resolved
"https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b";
integrity
sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -1729,6 +1724,13 @@
dependencies:
ms "^2.1.1"
+debug@^4.1.0, debug@^4.1.1:
+ version "4.3.3"
+ resolved
"https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664";
+ integrity
sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+ dependencies:
+ ms "2.1.2"
+
decompress-response@^3.3.0:
version "3.3.0"
resolved
"https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3";
@@ -1961,9 +1963,9 @@
mkdirp "^0.5.1"
electron@13.5:
- version "13.5.1"
- resolved
"https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz#76c02c39be228532f886a170b472cbd3d93f0d0f";
- integrity
sha512-ZyxhIhmdaeE3xiIGObf0zqEyCyuIDqZQBv9NKX8w5FNzGm87j4qR0H1+GQg6vz+cA1Nnv1x175Zvimzc0/UwEQ==
+ version "13.5.2"
+ resolved
"https://registry.yarnpkg.com/electron/-/electron-13.5.2.tgz#5c5826e58a5e12bb5ca8047b789d07b45260ecbc";
+ integrity
sha512-CPakwDpy5m8dL0383F5uJboQcVtn9bT/+6/wdDKo8LuTUO9aER1TF41v7feZgZW2c+UwoGPWa814ElSQ3qta2A==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^14.6.2"
@@ -2499,13 +2501,12 @@
once "^1.3.0"
path-is-absolute "^1.0.0"
-global-agent@^2.0.2:
- version "2.2.0"
- resolved
"https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc";
- integrity
sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==
+global-agent@^3.0.0:
+ version "3.0.0"
+ resolved
"https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6";
+ integrity
sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
dependencies:
boolean "^3.0.1"
- core-js "^3.6.5"
es6-error "^4.1.1"
matcher "^3.0.0"
roarr "^2.15.3"
++++++ element-web-1.9.6.tar.gz -> element-web-1.9.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/CHANGELOG.md
new/element-web-1.9.7/CHANGELOG.md
--- old/element-web-1.9.6/CHANGELOG.md 2021-12-06 16:38:51.000000000 +0100
+++ new/element-web-1.9.7/CHANGELOG.md 2021-12-13 16:36:54.000000000 +0100
@@ -1,3 +1,9 @@
+Changes in
[1.9.7](https://github.com/vector-im/element-web/releases/tag/v1.9.7)
(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
[1.9.6](https://github.com/vector-im/element-web/releases/tag/v1.9.6)
(2021-12-06)
=============================================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/Dockerfile
new/element-web-1.9.7/Dockerfile
--- old/element-web-1.9.6/Dockerfile 2021-12-06 16:38:51.000000000 +0100
+++ new/element-web-1.9.7/Dockerfile 2021-12-13 16:36:54.000000000 +0100
@@ -16,15 +16,12 @@
COPY . /src
RUN dos2unix /src/scripts/docker-link-repos.sh && bash
/src/scripts/docker-link-repos.sh
RUN yarn --network-timeout=100000 install
-RUN yarn build
+
+RUN dos2unix /src/scripts/docker-package.sh && bash
/src/scripts/docker-package.sh
# Copy the config now so that we don't create another layer in the app image
RUN cp /src/config.sample.json /src/webapp/config.json
-# Ensure we populate the version file
-RUN dos2unix /src/scripts/docker-write-version.sh && bash
/src/scripts/docker-write-version.sh
-
-
# App
FROM nginx:alpine
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/package.json
new/element-web-1.9.7/package.json
--- old/element-web-1.9.6/package.json 2021-12-06 16:38:51.000000000 +0100
+++ new/element-web-1.9.7/package.json 2021-12-13 16:36:54.000000000 +0100
@@ -1,6 +1,6 @@
{
"name": "element-web",
- "version": "1.9.6",
+ "version": "1.9.7",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -55,13 +55,13 @@
"test": "jest"
},
"dependencies": {
- "@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";,
"browser-request": "^0.3.3",
"gfm.css": "^1.1.2",
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
- "matrix-js-sdk": "15.2.0",
- "matrix-react-sdk": "3.36.0",
+ "matrix-js-sdk": "15.2.1",
+ "matrix-react-sdk": "3.36.1",
"matrix-widget-api": "^0.1.0-beta.17",
"prop-types": "^15.7.2",
"react": "17.0.2",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/scripts/ci_package.sh
new/element-web-1.9.7/scripts/ci_package.sh
--- old/element-web-1.9.6/scripts/ci_package.sh 2021-12-06 16:38:51.000000000
+0100
+++ new/element-web-1.9.7/scripts/ci_package.sh 2021-12-13 16:36:54.000000000
+0100
@@ -1,17 +1,11 @@
#!/bin/bash
-# Runs package.sh setting the version to git hashes of the element-web,
-# react-sdk & js-sdk checkouts, for the case where these dependencies
-# are git checkouts.
+# Runs package.sh, passing DIST_VERSION determined by git
set -ex
rm dist/element-*.tar.gz || true # rm previous artifacts without failing if it
doesn't exist
-# Since the deps are fetched from git, we can rev-parse
-REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
-JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
+DIST_VERSION=`$(dirname $0)/get-version-from-git.sh`
-VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than
assume develop
-
-CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA
scripts/package.sh
+CI_PACKAGE=true DIST_VERSION=$DIST_VERSION scripts/package.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/scripts/docker-package.sh
new/element-web-1.9.7/scripts/docker-package.sh
--- old/element-web-1.9.6/scripts/docker-package.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/element-web-1.9.7/scripts/docker-package.sh 2021-12-13
16:36:54.000000000 +0100
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -ex
+
+TAG=$(git describe --tags)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+DIST_VERSION=$TAG
+
+# If the branch comes out as HEAD then we're probably checked out to a tag, so
if the thing is *not*
+# coming out as HEAD then we're on a branch. When we're on a branch, we want
to resolve ourselves to
+# a few SHAs rather than a version.
+# Docker Hub doesn't always check out the tag and sometimes checks out the
branch, so we should look
+# for an appropriately tagged branch as well (heads/v1.2.3).
+if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
+then
+ DIST_VERSION=`$(dirname $0)/get-version-from-git.sh`
+fi
+
+DIST_VERSION=`$(dirname $0)/normalize-version.sh ${DIST_VERSION}`
+VERSION=$DIST_VERSION yarn build
+echo $DIST_VERSION > /src/webapp/version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/scripts/docker-write-version.sh
new/element-web-1.9.7/scripts/docker-write-version.sh
--- old/element-web-1.9.6/scripts/docker-write-version.sh 2021-12-06
16:38:51.000000000 +0100
+++ new/element-web-1.9.7/scripts/docker-write-version.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-TAG=$(git describe --tags)
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
-DIST_VERSION=$TAG
-
-# If the branch comes out as HEAD then we're probably checked out to a tag, so
if the thing is *not*
-# coming out as HEAD then we're on a branch. When we're on a branch, we want
to resolve ourselves to
-# a few SHAs rather than a version.
-# Docker Hub doesn't always check out the tag and sometimes checks out the
branch, so we should look
-# for an appropriately tagged branch as well (heads/v1.2.3).
-if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
-then
- REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12
HEAD)
- JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
- VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather
than assume develop
- DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA
-fi
-
-echo $DIST_VERSION > /src/webapp/version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/scripts/get-version-from-git.sh
new/element-web-1.9.7/scripts/get-version-from-git.sh
--- old/element-web-1.9.6/scripts/get-version-from-git.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/element-web-1.9.7/scripts/get-version-from-git.sh 2021-12-13
16:36:54.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Echoes a version based on the git hashes of the element-web, react-sdk &
js-sdk checkouts, for the case where
+# these dependencies are git checkouts.
+
+# Since the deps are fetched from git, we can rev-parse
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
+VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than
assume develop
+echo $VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/scripts/normalize-version.sh
new/element-web-1.9.7/scripts/normalize-version.sh
--- old/element-web-1.9.6/scripts/normalize-version.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/element-web-1.9.7/scripts/normalize-version.sh 2021-12-13
16:36:54.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# If $1 looks like v1.2.3 or v1.2.3-foo, strip the leading v, then print it to
stdout
+if [[ $1 =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
+ echo ${1:1}
+else
+ echo $1
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/scripts/package.sh
new/element-web-1.9.7/scripts/package.sh
--- old/element-web-1.9.6/scripts/package.sh 2021-12-06 16:38:51.000000000
+0100
+++ new/element-web-1.9.7/scripts/package.sh 2021-12-13 16:36:54.000000000
+0100
@@ -21,12 +21,7 @@
# Just in case you have a local config, remove it before packaging
rm element-$version/config.json || true
-# if $version looks like semver with leading v, strip it before writing to file
-if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
- echo ${version:1} > element-$version/version
-else
- echo ${version} > element-$version/version
-fi
+$(dirname $0)/normalize-version.sh ${version} > element-$version/version
tar chvzf dist/element-$version.tar.gz element-$version
rm -r element-$version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/src/vector/platform/WebPlatform.ts
new/element-web-1.9.7/src/vector/platform/WebPlatform.ts
--- old/element-web-1.9.6/src/vector/platform/WebPlatform.ts 2021-12-06
16:38:51.000000000 +0100
+++ new/element-web-1.9.7/src/vector/platform/WebPlatform.ts 2021-12-13
16:36:54.000000000 +0100
@@ -107,7 +107,7 @@
// presence of intermediate caching proxies), but still: we're trying
// to tell the user that there is a new version.
- return new Promise(function(resolve, reject) {
+ return new Promise((resolve, reject) => {
request(
{
method: "GET",
@@ -121,27 +121,24 @@
return;
}
- const ver = body.trim();
- resolve(ver);
+ resolve(this.getNormalizedAppVersion(body.trim()));
},
);
});
}
- getNormalizedAppVersion(): string {
- let ver = process.env.VERSION;
-
+ getNormalizedAppVersion(version: string): string {
// if version looks like semver with leading v, strip it
- // (matches scripts/package.sh)
+ // (matches scripts/normalize-version.sh)
const semVerRegex = new RegExp("^v[0-9]+.[0-9]+.[0-9]+(-.+)?$");
- if (semVerRegex.test(process.env.VERSION)) {
- ver = process.env.VERSION.substr(1);
+ if (semVerRegex.test(version)) {
+ return version.substr(1);
}
- return ver;
+ return version;
}
getAppVersion(): Promise<string> {
- return Promise.resolve(this.getNormalizedAppVersion());
+ return
Promise.resolve(this.getNormalizedAppVersion(process.env.VERSION));
}
startUpdater() {
@@ -155,7 +152,7 @@
pollForUpdate = () => {
return this.getMostRecentVersion().then((mostRecentVersion) => {
- const currentVersion = this.getNormalizedAppVersion();
+ const currentVersion =
this.getNormalizedAppVersion(process.env.VERSION);
if (currentVersion !== mostRecentVersion) {
if (this.shouldShowUpdate(mostRecentVersion)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/element-web-1.9.6/yarn.lock
new/element-web-1.9.7/yarn.lock
--- old/element-web-1.9.6/yarn.lock 2021-12-06 16:38:51.000000000 +0100
+++ new/element-web-1.9.7/yarn.lock 2021-12-13 16:36:54.000000000 +0100
@@ -1306,9 +1306,9 @@
"@types/yargs" "^16.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";
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
@@ -7854,10 +7854,10 @@
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"
@@ -7878,10 +7878,10 @@
bluebird "^3.5.0"
expect "^1.20.2"
-matrix-react-sdk@3.36.0:
- version "3.36.0"
- resolved
"https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.36.0.tgz#70a07944bd217e8d52e7b818d215d6d7e1b9c3f2";
- integrity
sha512-/Mc+4PrySGs2LHN15LQk9bUauAHk2dW7SrG04wEnjNSA+yudH5wiHYZ/4p1ZHjOLW/NsDoGpIYN+Yqkr9aKuHA==
+matrix-react-sdk@3.36.1:
+ version "3.36.1"
+ resolved
"https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.36.1.tgz#0970b5e707e5dfc07dd708a3e30f7050296fcc31";
+ integrity
sha512-5L6SoMt3S1gjvB4AviR1Duc6sSVqf1hSq7aW8JH1houF3N7cYlNDJL5RXQ+G3iFqMlE+QpEUOApfN45WjLA+Bw==
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"
@@ -7912,7 +7912,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"
