From 39c3396e00bd00aabb9ea16488492b07c7a57319 Mon Sep 17 00:00:00 2001 From: Stefan Fleckenstein Date: Thu, 26 Mar 2026 14:14:22 +0000 Subject: [PATCH 1/5] fix: set current stackablectl release to 1.4.0 --- docs/modules/stackablectl/pages/installation.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/modules/stackablectl/pages/installation.adoc b/docs/modules/stackablectl/pages/installation.adoc index 7166b474..199a0599 100644 --- a/docs/modules/stackablectl/pages/installation.adoc +++ b/docs/modules/stackablectl/pages/installation.adoc @@ -1,7 +1,7 @@ = Installation :page-aliases: stable@stackablectl::installation.adoc -:latest-release: https://github.com/stackabletech/stackable-cockpit/releases/tag/stackablectl-1.2.1 +:latest-release: https://github.com/stackabletech/stackable-cockpit/releases/tag/stackablectl-1.4.0 :fish-comp-loations: https://fishshell.com/docs/current/completions.html#where-to-put-completions :nushell-comp-locations: https://www.nushell.sh/book/custom_commands.html#persisting @@ -23,14 +23,14 @@ You can also use the following command: [source,console] ---- -$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.2.1/stackablectl-x86_64-unknown-linux-gnu +$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.4.0/stackablectl-x86_64-unknown-linux-gnu ---- **aarch64** (arm64): [source,console] ---- -$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.2.1/stackablectl-aarch64-unknown-linux-gnu +$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.4.0/stackablectl-aarch64-unknown-linux-gnu ---- Install the binary into a directory in the `$PATH`, and make it executable: @@ -60,14 +60,14 @@ You can also use the following command: [source,console] ---- -$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.2.1/stackablectl-x86_64-apple-darwin +$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.4.0/stackablectl-x86_64-apple-darwin ---- **aarch64** (arm64): [source,console] ---- -$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.2.1/stackablectl-aarch64-apple-darwin +$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.4.0/stackablectl-aarch64-apple-darwin ---- Install the binary into a directory in the `$PATH`, and make it executable: From 266524aabf617103452545eeefb46a2d7544c37c Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 14 Apr 2026 09:33:45 +0200 Subject: [PATCH 2/5] fix: Bump aws-lc-{rs,sys} to negate RUSTSEC-2026-0048+0044 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73ba5ed3..6d2ffae6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -194,9 +194,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.16.1" +version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf" +checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" dependencies = [ "aws-lc-sys", "zeroize", @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.38.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e" +checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399" dependencies = [ "cc", "cmake", From 89c3c15a67951570212530c242f2301d5a6ab1fa Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 14 Apr 2026 09:35:48 +0200 Subject: [PATCH 3/5] fix: Bump rustls-webpki to negate RUSTSEC-2026-0049 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d2ffae6..4e76efd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3154,9 +3154,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.9" +version = "0.103.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" +checksum = "20a6af516fea4b20eccceaf166e8aa666ac996208e8a644ce3ef5aa783bc7cd4" dependencies = [ "aws-lc-rs", "ring", From 002f0b384a0c5408a4a9a3df7d32b96a74e9f777 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 14 Apr 2026 09:40:27 +0200 Subject: [PATCH 4/5] fix: Remove duplicate version key in Cargo.lock --- Cargo.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80d31bc8..6681b256 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,7 +195,6 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" version = "1.16.2" -version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" dependencies = [ @@ -3102,7 +3101,7 @@ dependencies = [ "rustls-webpki", "subtle", "zeroize", -] +]: [[package]] name = "rustls-native-certs" From fe5f32ea596db9f7cc6572672ec4fee798498e6d Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 14 Apr 2026 09:42:50 +0200 Subject: [PATCH 5/5] fix: Remove more stuff from merge conflict --- Cargo.lock | 2 +- Cargo.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6681b256..4e76efd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3101,7 +3101,7 @@ dependencies = [ "rustls-webpki", "subtle", "zeroize", -]: +] [[package]] name = "rustls-native-certs" diff --git a/Cargo.nix b/Cargo.nix index 78e86277..fb349b3e 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -10505,9 +10505,9 @@ rec { }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.103.10"; + version = "0.103.11"; edition = "2021"; - sha256 = "1vyipcdbazvhl6kyi1m8n0bg98sk25iv12bby2xcly653awb4cyz"; + sha256 = "1m3wpj1sfnpgwd6692lf42bcjsk6mbl6dwgarkn20jzadx8sz9i0"; libName = "webpki"; dependencies = [ {