mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 03:09:51 +03:00
testing/element-desktop: security upgrade to 1.11.103
https://github.com/matrix-org/matrix-rust-sdk/security/advisories/GHSA-x958-rvg6-956w
This commit is contained in:
parent
ed6522472e
commit
0aee46b160
2 changed files with 4 additions and 58 deletions
|
@ -1,8 +1,8 @@
|
|||
# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
|
||||
maintainer="lauren n. liberda <lauren@selfisekai.rocks>"
|
||||
pkgname=element-desktop
|
||||
pkgver=1.11.100
|
||||
pkgrel=1
|
||||
pkgver=1.11.103
|
||||
pkgrel=0
|
||||
pkgdesc="Secure and independent communication, connected via Matrix"
|
||||
url="https://element.io/"
|
||||
arch="aarch64 x86_64" # same as electron
|
||||
|
@ -37,7 +37,6 @@ source="
|
|||
add-alpine-targets.patch
|
||||
use-system-headers.patch
|
||||
tasje-one-hak.patch
|
||||
tasje-no-fuses.patch
|
||||
no-source-maps.patch.web
|
||||
use-system-fonts.patch.web
|
||||
|
||||
|
@ -159,12 +158,11 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
a8ac5180df3b204fb1947ecaa4786c9c5fdd53ffe705f4dfe97a0b051fa371fd9102c41a898e8783cf25f732674da2d987ef315f2facc7b18b20ef214ea0f81d element-desktop-1.11.100.tar.gz
|
||||
e3e50fd867f9b7388eb22778ccb97d6504a480ab4e2aa9eba10fd0f4d0324a1525c2afe6c80181567d8e554f03086a9e0994a6221cfcb0ca29700754c8f31cac element-web-1.11.100.tar.gz
|
||||
c502b6bdbd783d719bc5594d56478ce533c484a5c6531f2573c83eb60e7d28da4033b24b8a19af7dacfc45973ce0d981101620a09a4d20a2c16c779e4be784d0 element-desktop-1.11.103.tar.gz
|
||||
01559b02aed0f3c5fa3f70c6a15fb3e59cd7b54897d297dca77f2606ce188202b7290b751c6ea23fb205be3194ce83dbd085fbf85a804e974e29d43b2b901c01 element-web-1.11.103.tar.gz
|
||||
4747893ed3e43d3074e9afe1cdd668a6be0de073d439205fe8c38c5e0f4091cc76e3cd15d98818bea5139add29501d8d07e83c58e9da230a4ce5bb538d388f80 add-alpine-targets.patch
|
||||
755b17f7b828eb6920c06a6950ad4e14c32c99d22e9c05fcef7a081b5d2034adb03db3958aa5209c99fb7201f4d888c2383fc9864c5e743dd33f8b5c4925acd7 use-system-headers.patch
|
||||
92e69817fdc71f60c5c7dcbd3c7b13428cc18141cf5f27720326390f6817bec85fb1c60f8016b3a8fa275f601b16f646cda12b5e379a349368eef2f801b4de7a tasje-one-hak.patch
|
||||
a1399662bdbe5e7256d31f7bdc05070e7009d70113699856b025a1d5ab1d9b8bf1020072a08255d4eddab0874044131dec296f98a91ba5c12ca61948b1d18dbe tasje-no-fuses.patch
|
||||
ec635fde026f7fce8e8cc57960b5b9dcec4418416d4867ed47711422d48f068bb58a3c9ceb7715efc9c177beca3788da6b0babc9b689ea8c0724a0395f2b85f8 no-source-maps.patch.web
|
||||
aaf46476bac403aa5204aa265fcf0654fad4c149fd74d0ec4273c051a5549943384cae3cdd62c5b78fdedfed55c11ecceb898b886e44165cbe7e30953a095cf9 use-system-fonts.patch.web
|
||||
afc588311dc3b566a754e3e7fe6b37b99a06d47b8bbce0ed9acca8ef308fdab0bd1d41b406199e5cbdd86bdce695ff847cd8668857a235cbdc292ad8b899c063 element-desktop
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
we can't do fuses because we ship one binary in the electron package.
|
||||
and we can't import them here, since they are in devDependencies, which are uninstalled at this stage.
|
||||
|
||||
--- ./electron-builder.ts.orig
|
||||
+++ ./electron-builder.ts
|
||||
@@ -2,8 +2,7 @@
|
||||
import * as fs from "node:fs";
|
||||
import * as path from "node:path";
|
||||
import * as plist from "plist";
|
||||
-import { AfterPackContext, Arch, Configuration as BaseConfiguration, Platform } from "electron-builder";
|
||||
-import { computeData } from "app-builder-lib/out/asar/integrity";
|
||||
+import { Configuration as BaseConfiguration } from "electron-builder";
|
||||
import { readFile, writeFile } from "node:fs/promises";
|
||||
|
||||
/**
|
||||
@@ -46,26 +45,6 @@
|
||||
} & BaseConfiguration["deb"];
|
||||
}
|
||||
|
||||
-async function injectAsarIntegrity(context: AfterPackContext) {
|
||||
- const packager = context.packager;
|
||||
-
|
||||
- // We only need to re-generate asar on universal Mac builds, due to https://github.com/electron/universal/issues/116
|
||||
- if (packager.platform !== Platform.MAC || context.arch !== Arch.universal) return;
|
||||
-
|
||||
- const resourcesPath = packager.getResourcesDir(context.appOutDir);
|
||||
- const asarIntegrity = await computeData({
|
||||
- resourcesPath,
|
||||
- resourcesRelativePath: "Resources",
|
||||
- resourcesDestinationPath: resourcesPath,
|
||||
- extraResourceMatchers: [],
|
||||
- });
|
||||
-
|
||||
- const plistPath = path.join(resourcesPath, "..", "Info.plist");
|
||||
- const data = plist.parse(await readFile(plistPath, "utf8")) as unknown as Writable<plist.PlistObject>;
|
||||
- data["ElectronAsarIntegrity"] = asarIntegrity as unknown as Writable<plist.PlistValue>;
|
||||
- await writeFile(plistPath, plist.build(data));
|
||||
-}
|
||||
-
|
||||
/**
|
||||
* @type {import('electron-builder').Configuration}
|
||||
* @see https://www.electron.build/configuration/configuration
|
||||
@@ -89,9 +68,6 @@
|
||||
|
||||
loadBrowserProcessSpecificV8Snapshot: false,
|
||||
enableEmbeddedAsarIntegrityValidation: true,
|
||||
- },
|
||||
- afterPack: async (context: AfterPackContext) => {
|
||||
- await injectAsarIntegrity(context);
|
||||
},
|
||||
files: [
|
||||
"package.json",
|
Loading…
Add table
Add a link
Reference in a new issue