[PR PATCH] element-desktop: update to 1.9.7

[PR PATCH] element-desktop: update to 1.9.7

[foxlet]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

There is a new pull request by foxlet against master on the void-packages repository

https://github.com/foxlet/void-packages element-security
https://github.com/void-linux/void-packages/pull/34545

element-desktop: update to 1.9.7
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This is part of a security update for Element's E2EE library.


A patch file from https://github.com/void-linux/void-packages/pull/34545.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-security-34545.patch --]
[-- Type: text/x-diff, Size: 1254 bytes --]

From 80d2c97f3f1540f6463dda92237c63ee63c39471 Mon Sep 17 00:00:00 2001
From: Foxlet <foxlet@furcode.co>
Date: Tue, 14 Dec 2021 20:04:23 -0500
Subject: [PATCH] element-desktop: update to 1.9.7

---
 srcpkgs/element-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9f6a02244ffc..303b5bcbe1fc 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.9.6
+version=1.9.7
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="420ac62f306a522170aede01b807aa4b406c7f1e1377165f455851b220c32f7b
- 07c5575c79a5ddb2a3750528286cfe90ceeb32d985a88eb2b55452d7902e351e"
+checksum="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
+ b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
 
 patch_args="-Np1 -d ../${pkgname}-${version}"
 

Re: element-desktop: update to 1.9.7

[paper42]

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34545#issuecomment-994785088

Comment:
Can we switch to using vsed instead of sed in this template? It will help us catch mistakes in the future.

Re: [PR PATCH] [Updated] element-desktop: update to 1.9.7

[foxlet]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

There is an updated pull request by foxlet against master on the void-packages repository

https://github.com/foxlet/void-packages element-security
https://github.com/void-linux/void-packages/pull/34545

element-desktop: update to 1.9.7
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This is part of a security update for Element's E2EE library.


A patch file from https://github.com/void-linux/void-packages/pull/34545.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-element-security-34545.patch --]
[-- Type: text/x-diff, Size: 1703 bytes --]

From e57cf4cc83bac784110375d9cc1999f81262887a Mon Sep 17 00:00:00 2001
From: Foxlet <foxlet@furcode.co>
Date: Tue, 14 Dec 2021 20:04:23 -0500
Subject: [PATCH] element-desktop: update to 1.9.7

---
 srcpkgs/element-desktop/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 9f6a02244ffc..a25edc04f31a 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
-version=1.9.6
+version=1.9.7
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
 _archive="archive/v${version}.tar.gz"
 distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
  ${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="420ac62f306a522170aede01b807aa4b406c7f1e1377165f455851b220c32f7b
- 07c5575c79a5ddb2a3750528286cfe90ceeb32d985a88eb2b55452d7902e351e"
+checksum="1ee24d8c1f894ed66766d67dd5b6a5c2b1e6dcd1f866c9c49a4fd0108fd7a9e2
+ b3892acf206f866b571e2eb3dcc01c72c315d737c9d040d72405c066077d9e4c"
 
 patch_args="-Np1 -d ../${pkgname}-${version}"
 
@@ -45,8 +45,8 @@ pre_build() {
 	cd ../element-desktop-${version}
 
 	# Disable auto-updating
-	sed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
-	sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+	vsed -i 's@https://packages.riot.im/desktop/update/@null@g' element.io/release/config.json
+	vsed -i 's/"target": "deb"/"target": "dir"/g' package.json
 	npm_config_arch=$carch yarn install
 }
 

Re: [PR PATCH] [Merged]: element-desktop: update to 1.9.7

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 385 bytes --]

There's a merged pull request on the void-packages repository

element-desktop: update to 1.9.7
https://github.com/void-linux/void-packages/pull/34545

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This is part of a security update for Element's E2EE library.