From eabbae0e0cc4949c7da0e83d4052c3e4abd8b835 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 01:54:44 +0000
Subject: [PATCH 1/3] fix(deps): update all dependencies

---
 rust/tool/Cargo.lock                  | 57 +++++++++++----------------
 rust/tool/shared/Cargo.toml           | 10 ++---
 rust/tool/systemd/Cargo.toml          | 26 ++++++------
 rust/uefi/Cargo.lock                  | 12 +++---
 rust/uefi/linux-bootloader/Cargo.toml |  6 +--
 rust/uefi/stub/Cargo.toml             |  4 +-
 6 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/rust/tool/Cargo.lock b/rust/tool/Cargo.lock
index 47314fb..cf22582 100644
--- a/rust/tool/Cargo.lock
+++ b/rust/tool/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -57,9 +57,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -189,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.3"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -199,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.2"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstream",
  "anstyle",
@@ -331,9 +331,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "filetime"
@@ -368,17 +368,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "goblin"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
-dependencies = [
- "log",
- "plain",
- "scroll",
-]
-
 [[package]]
 name = "goblin"
 version = "0.7.1"
@@ -430,9 +419,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
+checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
 
 [[package]]
 name = "itertools"
@@ -469,7 +458,7 @@ dependencies = [
  "expect-test",
  "fastrand",
  "filetime",
- "goblin 0.7.1",
+ "goblin",
  "indoc",
  "log",
  "nix",
@@ -511,7 +500,7 @@ dependencies = [
  "clap",
  "expect-test",
  "filetime",
- "goblin 0.6.1",
+ "goblin",
  "indoc",
  "lanzaboote_tool",
  "log",
@@ -533,11 +522,11 @@ checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "nix"
-version = "0.26.4"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "cfg-if",
  "libc",
 ]
@@ -710,18 +699,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -741,9 +730,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
diff --git a/rust/tool/shared/Cargo.toml b/rust/tool/shared/Cargo.toml
index ac82dab..2a7df1b 100644
--- a/rust/tool/shared/Cargo.toml
+++ b/rust/tool/shared/Cargo.toml
@@ -7,19 +7,19 @@ edition.workspace = true
 
 [dependencies]
 anyhow = "1"
-clap = { version = "4.3", features = ["derive"] }
+clap = { version = "4.4", features = ["derive"] }
 goblin = "0.7"
-nix = { version = "0.26", default-features = false, features = [ "fs" ] }
+nix = { version = "0.27", default-features = false, features = [ "fs" ] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tempfile = "3.6.0"
+tempfile = "3.8.0"
 bootspec = "1"
 walkdir = "2"
 time = "0.3"
 sha2 = "0.10"
 # Keep the fastrand version aligned with the one from tempfile to avoid two
 # different versions.
-fastrand = "2.0.0"
+fastrand = "2.0.1"
 log = { version = "0.4", features = ["std"] }
 stderrlog = "0.5"
 indoc = "2"
@@ -27,5 +27,5 @@ indoc = "2"
 [dev-dependencies]
 assert_cmd = "2.0.12"
 expect-test = "1.4.1"
-filetime = "0.2.21"
+filetime = "0.2.22"
 rand = "0.8.5"
diff --git a/rust/tool/systemd/Cargo.toml b/rust/tool/systemd/Cargo.toml
index 47f2898..afbdde4 100644
--- a/rust/tool/systemd/Cargo.toml
+++ b/rust/tool/systemd/Cargo.toml
@@ -6,23 +6,23 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.71"
+anyhow = "1.0.75"
 base32ct = { version = "0.2.0", features = ["alloc"] }
 stderrlog = "0.5.4"
-log = { version = "0.4.18", features = ["std"] }
-clap = { version = "4.3.1", features = ["derive"] }
+log = { version = "0.4.20", features = ["std"] }
+clap = { version = "4.4.6", features = ["derive"] }
 lanzaboote_tool = { path = "../shared" }
-indoc = "2.0.1"
-serde_json = "1.0.96"
-sha2 = "0.10.6"
-tempfile = "3.5.0"
-nix = { version = "0.26.2", default-features = false, features = [ "fs" ] }
+indoc = "2.0.4"
+serde_json = "1.0.107"
+sha2 = "0.10.8"
+tempfile = "3.8.0"
+nix = { version = "0.27.1", default-features = false, features = [ "fs" ] }
 
 [dev-dependencies]
-assert_cmd = "2.0.11"
+assert_cmd = "2.0.12"
 expect-test = "1.4.1"
-filetime = "0.2.21"
+filetime = "0.2.22"
 rand = "0.8.5"
-goblin = "0.6.1"
-serde = { version = "1.0.163", features = ["derive"] }
-walkdir = "2.3.3"
+goblin = "0.7.1"
+serde = { version = "1.0.189", features = ["derive"] }
+walkdir = "2.4.0"
diff --git a/rust/uefi/Cargo.lock b/rust/uefi/Cargo.lock
index a0f3dcd..d3dda3e 100644
--- a/rust/uefi/Cargo.lock
+++ b/rust/uefi/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "block-buffer"
@@ -70,9 +70,9 @@ dependencies = [
 
 [[package]]
 name = "goblin"
-version = "0.6.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
+checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134"
 dependencies = [
  "log",
  "plain",
@@ -178,9 +178,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
diff --git a/rust/uefi/linux-bootloader/Cargo.toml b/rust/uefi/linux-bootloader/Cargo.toml
index 42a02f5..94bbd2a 100644
--- a/rust/uefi/linux-bootloader/Cargo.toml
+++ b/rust/uefi/linux-bootloader/Cargo.toml
@@ -14,11 +14,11 @@ rust-version = "1.68"
 [dependencies]
 uefi = { version = "0.25.0", default-features = false, features = [ "alloc", "global_allocator" ] }
 # Update blocked by #237
-goblin = { version = "=0.6.1", default-features = false, features = [ "pe64", "alloc" ]}
-bitflags = "2.3.3"
+goblin = { version = "=0.7.1", default-features = false, features = [ "pe64", "alloc" ]}
+bitflags = "2.4.1"
 
 # Even in debug builds, we don't enable the debug logs, because they generate a lot of spam from goblin.
-log = { version = "0.4.19", default-features = false, features = [ "max_level_info", "release_max_level_warn" ]}
+log = { version = "0.4.20", default-features = false, features = [ "max_level_info", "release_max_level_warn" ]}
 
 [badges]
 maintenance = { status = "actively-developed" }
diff --git a/rust/uefi/stub/Cargo.toml b/rust/uefi/stub/Cargo.toml
index 06a8e36..a11410f 100644
--- a/rust/uefi/stub/Cargo.toml
+++ b/rust/uefi/stub/Cargo.toml
@@ -8,9 +8,9 @@ publish = false
 uefi = { version = "0.25.0", default-features = false, features = [ "alloc", "global_allocator" ] }
 uefi-services = { version = "0.22.0", default-features = false, features = [ "panic_handler", "logger" ] }
 # Even in debug builds, we don't enable the debug logs, because they generate a lot of spam from goblin.
-log = { version = "0.4.19", default-features = false, features = [ "max_level_info", "release_max_level_warn" ]}
+log = { version = "0.4.20", default-features = false, features = [ "max_level_info", "release_max_level_warn" ]}
 # Use software implementation because the UEFI target seems to need it.
-sha2 = { version = "0.10.7", default-features = false, features = ["force-soft"], optional = true }
+sha2 = { version = "0.10.8", default-features = false, features = ["force-soft"], optional = true }
 # Our linux-bootloader crate containing most of what we need
 linux-bootloader = { path = "../linux-bootloader" }
 

From ace18ed4bde61df6ab0d5fec2492f5170e9d4f39 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Mon, 16 Oct 2023 10:51:58 +0200
Subject: [PATCH 2/3] renovate: ignore goblin updates

... because of #237.
---
 .github/renovate.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 5635685..f260ac8 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -11,5 +11,8 @@
   "dependencyDashboard": true,
   "nix": {
     "enabled": true
-  }
+  },
+  "ignoreDeps": [
+    "goblin"
+  ]
 }

From bb5b2de5450ab6a725f35ab1512b59cbbcaf7830 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Mon, 16 Oct 2023 10:53:56 +0200
Subject: [PATCH 3/3] stub: pin goblin (again)

... because of #237. Now renovate should ignore this.
---
 rust/uefi/Cargo.lock                  | 4 ++--
 rust/uefi/linux-bootloader/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/uefi/Cargo.lock b/rust/uefi/Cargo.lock
index d3dda3e..217f8b3 100644
--- a/rust/uefi/Cargo.lock
+++ b/rust/uefi/Cargo.lock
@@ -70,9 +70,9 @@ dependencies = [
 
 [[package]]
 name = "goblin"
-version = "0.7.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134"
+checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
 dependencies = [
  "log",
  "plain",
diff --git a/rust/uefi/linux-bootloader/Cargo.toml b/rust/uefi/linux-bootloader/Cargo.toml
index 94bbd2a..1e2f9f9 100644
--- a/rust/uefi/linux-bootloader/Cargo.toml
+++ b/rust/uefi/linux-bootloader/Cargo.toml
@@ -14,7 +14,7 @@ rust-version = "1.68"
 [dependencies]
 uefi = { version = "0.25.0", default-features = false, features = [ "alloc", "global_allocator" ] }
 # Update blocked by #237
-goblin = { version = "=0.7.1", default-features = false, features = [ "pe64", "alloc" ]}
+goblin = { version = "=0.6.1", default-features = false, features = [ "pe64", "alloc" ]}
 bitflags = "2.4.1"
 
 # Even in debug builds, we don't enable the debug logs, because they generate a lot of spam from goblin.