From d2645d7ccb64c79705bc06d1d741c91850ea48b5 Mon Sep 17 00:00:00 2001 From: Tadas Giniotis Date: Thu, 7 Apr 2022 23:49:33 +0300 Subject: [PATCH 1/3] nightly preparation --- element.sh => element-nightly.sh | 2 +- im.riot.Riot.desktop | 6 +- im.riot.Riot.metainfo.xml | 130 +------------------------------ im.riot.Riot.yaml | 24 +++--- 4 files changed, 19 insertions(+), 143 deletions(-) rename element.sh => element-nightly.sh (74%) diff --git a/element.sh b/element-nightly.sh similarity index 74% rename from element.sh rename to element-nightly.sh index 2e99154..57fe6c9 100644 --- a/element.sh +++ b/element-nightly.sh @@ -7,4 +7,4 @@ then FLAGS="$FLAGS --disable-gpu-sandbox" fi -env TMPDIR="$XDG_RUNTIME_DIR/app/${FLATPAK_ID:-im.riot.Riot}" zypak-wrapper /app/Element/element-desktop $FLAGS "$@" \ No newline at end of file +env TMPDIR="$XDG_RUNTIME_DIR/app/${FLATPAK_ID:-im.riot.Riot}" zypak-wrapper /app/Element-Nightly/element-desktop-nightly $FLAGS "$@" \ No newline at end of file diff --git a/im.riot.Riot.desktop b/im.riot.Riot.desktop index 41be791..a802282 100644 --- a/im.riot.Riot.desktop +++ b/im.riot.Riot.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Application -Name=Element +Name=Element Nightly Icon=im.riot.Riot -Exec=/app/bin/element %U +Exec=/app/bin/element-nightly %U Categories=Network;InstantMessaging;Chat;VideoConference; MimeType=x-scheme-handler/element; -StartupWMClass=element +StartupWMClass=element-nightly Keywords=Matrix;matrix.org;chat;irc;communications;talk;riot;vector; diff --git a/im.riot.Riot.metainfo.xml b/im.riot.Riot.metainfo.xml index eaf8274..60a39c0 100644 --- a/im.riot.Riot.metainfo.xml +++ b/im.riot.Riot.metainfo.xml @@ -1,7 +1,7 @@ im.riot.Riot.desktop - Element + Element Nightly Apache-2.0 New Vector Ltd Create, share, communicate, chat and call securely, and bridge to other apps @@ -30,133 +30,7 @@ - - - - - - - - - - - - - - - -

Fix for buffer overflow in libolm and matrix-js-sdk

-

Fix a crash on logout

- - - CVE-2021-44538 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + none diff --git a/im.riot.Riot.yaml b/im.riot.Riot.yaml index dbccc17..653e103 100644 --- a/im.riot.Riot.yaml +++ b/im.riot.Riot.yaml @@ -4,8 +4,8 @@ base-version: '21.08' runtime: org.freedesktop.Platform runtime-version: '21.08' sdk: org.freedesktop.Sdk -command: element -rename-icon: element-desktop +command: element-nightly +rename-icon: element-desktop-nightly copy-icon: true separate-locales: false finish-args: @@ -34,6 +34,8 @@ finish-args: - --own-name=org.kde.StatusNotifierItem-2-1 # Required for advanced input methods e.g. writing CJK languages - --talk-name=org.freedesktop.portal.Fcitx + # Required to store access tokens (persistent logins) + - --filesystem=xdg-run/keyring # Required for experimental wayland support - --filesystem=xdg-run/pipewire-0 cleanup: @@ -83,30 +85,30 @@ modules: - name: riot buildsystem: simple build-commands: - - ar x element-desktop_*.deb - - rm element-desktop_*.deb + - ar x element-nightly_*.deb + - rm element-nightly_*.deb - tar xf data.tar.xz - - cp -r 'opt/Element' /app/Element + - cp -r 'opt/Element-Nightly' /app/Element-Nightly - mkdir -p /app/share/icons/hicolor - cp -r usr/share/icons/hicolor/* /app/share/icons/hicolor - - chmod -R a-s,go+rX,go-w "/app/Element" - - install element.sh /app/bin/element + - chmod -R a-s,go+rX,go-w "/app/Element-Nightly" + - install element-nightly.sh /app/bin/element-nightly - install -Dm644 im.riot.Riot.desktop /app/share/applications/im.riot.Riot.desktop - install -Dm644 im.riot.Riot.metainfo.xml /app/share/metainfo/im.riot.Riot.metainfo.xml sources: - type: file only-arches: - x86_64 - url: https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.10.11_amd64.deb - sha256: 3dc99c588f45e5b6aa60129ddd8b9bf6b338f23933e1109cc303a8a2126ecd33 + url: https://packages.element.io/debian/pool/main/e/element-nightly/element-nightly_2022040701_amd64.deb + sha256: 869e341244c2259d7b604cb768e6836f0903e650800e203895de7a21fe73c4ca x-checker-data: type: debian-repo - package-name: element-desktop + package-name: element-nightly root: https://packages.element.io/debian dist: sid component: main - type: file - path: element.sh + path: element-nightly.sh - type: file path: im.riot.Riot.metainfo.xml - type: file From 824607071faef6efce15390931ca3c55671670a6 Mon Sep 17 00:00:00 2001 From: Tadas Giniotis Date: Tue, 26 Apr 2022 01:27:47 +0300 Subject: [PATCH 2/3] Update element-nightly_2022040701_amd64.deb to 2022042501 --- im.riot.Riot.metainfo.xml | 1 + im.riot.Riot.yaml | 4 ++-- shared-modules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/im.riot.Riot.metainfo.xml b/im.riot.Riot.metainfo.xml index 60a39c0..2f13fd7 100644 --- a/im.riot.Riot.metainfo.xml +++ b/im.riot.Riot.metainfo.xml @@ -30,6 +30,7 @@ + diff --git a/im.riot.Riot.yaml b/im.riot.Riot.yaml index 653e103..4fcd8bd 100644 --- a/im.riot.Riot.yaml +++ b/im.riot.Riot.yaml @@ -99,8 +99,8 @@ modules: - type: file only-arches: - x86_64 - url: https://packages.element.io/debian/pool/main/e/element-nightly/element-nightly_2022040701_amd64.deb - sha256: 869e341244c2259d7b604cb768e6836f0903e650800e203895de7a21fe73c4ca + url: https://packages.element.io/debian/pool/main/e/element-nightly/element-nightly_2022042501_amd64.deb + sha256: f2d9d9381986ffd305f333406b0c37323440bb9946b447da2d3125c95a4372f7 x-checker-data: type: debian-repo package-name: element-nightly diff --git a/shared-modules b/shared-modules index 977feac..716f642 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit 977feac6610e324a44e38fc2946b3d333e170a7b +Subproject commit 716f6422376daad30d8135617aa20d87531b31b6 From 4bb25ae24aee5cb1c9a867b10daf4baf9e9677fd Mon Sep 17 00:00:00 2001 From: Tadas Giniotis Date: Sat, 30 Apr 2022 14:30:12 +0300 Subject: [PATCH 3/3] Update element-nightly_2022042501_amd64.deb to 2022043001 --- im.riot.Riot.metainfo.xml | 1 + im.riot.Riot.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/im.riot.Riot.metainfo.xml b/im.riot.Riot.metainfo.xml index 2f13fd7..c96403c 100644 --- a/im.riot.Riot.metainfo.xml +++ b/im.riot.Riot.metainfo.xml @@ -30,6 +30,7 @@ + diff --git a/im.riot.Riot.yaml b/im.riot.Riot.yaml index 4fcd8bd..a6443f0 100644 --- a/im.riot.Riot.yaml +++ b/im.riot.Riot.yaml @@ -99,8 +99,8 @@ modules: - type: file only-arches: - x86_64 - url: https://packages.element.io/debian/pool/main/e/element-nightly/element-nightly_2022042501_amd64.deb - sha256: f2d9d9381986ffd305f333406b0c37323440bb9946b447da2d3125c95a4372f7 + url: https://packages.element.io/debian/pool/main/e/element-nightly/element-nightly_2022043001_amd64.deb + sha256: ef9698f7f18b29b61a4689b0384a983dadb448527d997bfbbb4b3b78585b227b x-checker-data: type: debian-repo package-name: element-nightly