From 17f519e01c65d91df5ce7c6076030d09b0a92637 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 27 Mar 2024 12:20:18 +0100 Subject: [PATCH 1/3] prepare 1.12.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b57cc8ff..010020ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator cryptomator - 1.12.3 + 1.12.4 Cryptomator Desktop App From de4fa8c7b0281d4486046c38d32f0baf435cf012 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 27 Mar 2024 12:20:18 +0100 Subject: [PATCH 2/3] use latest WiX version fixes CVE-2024-29187 and CVE-2024-29188 --- .github/workflows/win-exe.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index d3720c76b..b869a5857 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -40,6 +40,9 @@ jobs: LOOPBACK_ALIAS: 'cryptomator-vault' WIN_CONSOLE_FLAG: '' steps: + - name: Upgrade WIX to latest version + run: choco install wixtoolset --version 3.14.1 + shell: pwsh - uses: actions/checkout@v4 - name: Setup Java uses: actions/setup-java@v4 From 7785bb8820dc6a1552bdb0cfe13dc73a23556408 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 27 Mar 2024 12:57:55 +0100 Subject: [PATCH 3/3] finalize 1.12.4 --- dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml index 578597243..39c4d092c 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -70,6 +70,9 @@ + + https://github.com/cryptomator/cryptomator/releases/1.12.4 + https://github.com/cryptomator/cryptomator/releases/1.12.3