From 195feb8d9876672a60e5174f17e3806f441fcc62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:21:03 +0000
Subject: [PATCH 1/3] deps(rust): bump the minor-updates group with 2 updates

Bumps the minor-updates group with 2 updates: [tower](https://github.com/tower-rs/tower) and [cc](https://github.com/rust-lang/cc-rs).


Updates `tower` from 0.4.13 to 0.5.0
- [Release notes](https://github.com/tower-rs/tower/releases)
- [Commits](https://github.com/tower-rs/tower/compare/tower-0.4.13...tower-0.5.0)

Updates `cc` from 1.1.8 to 1.1.11
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Changelog](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/cc-rs/compare/cc-v1.1.8...cc-v1.1.11)

---
updated-dependencies:
- dependency-name: tower
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: minor-updates
- dependency-name: cc
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: minor-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock     | 32 +++++++++++++++++++++++++-------
 nss/Cargo.toml |  4 ++--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c416a654..184806264 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -114,7 +114,7 @@ dependencies = [
  "rustversion",
  "serde",
  "sync_wrapper 1.0.1",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
 ]
@@ -180,9 +180,12 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.1.8"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549"
+checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -507,7 +510,7 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tower-service",
  "tracing",
 ]
@@ -677,7 +680,7 @@ dependencies = [
  "tokio",
  "tonic",
  "tonic-build",
- "tower",
+ "tower 0.5.0",
 ]
 
 [[package]]
@@ -996,6 +999,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "simple_logger"
 version = "5.0.0"
@@ -1188,7 +1197,7 @@ dependencies = [
  "socket2",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -1227,6 +1236,16 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7"
+dependencies = [
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.2"
@@ -1245,7 +1264,6 @@ version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
diff --git a/nss/Cargo.toml b/nss/Cargo.toml
index be2a04e6a..99e54e628 100644
--- a/nss/Cargo.toml
+++ b/nss/Cargo.toml
@@ -22,7 +22,7 @@ tonic = "0.12.1"
 prost = "0.13.1"
 rustix = { version = "0.38.34", features = ["use-libc"] }
 tokio = { version = "1.39.2", features = ["macros", "rt-multi-thread"] }
-tower = "0.4.13"
+tower = "0.5.0"
 log = "0.4.22"
 simple_logger = {version = "5.0.0", features = ["stderr"]}
 syslog = "7.0.0"
@@ -32,4 +32,4 @@ hyper-util = "0.1.7"
 
 [build-dependencies]
 tonic-build = "0.12.1"
-cc = "1.1.8"
+cc = "1.1.11"

From 6f3b05c0f1d0ddb12b847669568530a004aa2792 Mon Sep 17 00:00:00 2001
From: Adrian Dombeck <adrian.dombeck@canonical.com>
Date: Wed, 21 Aug 2024 14:17:26 +0200
Subject: [PATCH 2/3] Update tower-layer

To work around https://github.com/tower-rs/tower/issues/784.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 184806264..79ff7ca3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1248,9 +1248,9 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"

From 2e8de177b01ee2b6fc814c2588e2530834dc8500 Mon Sep 17 00:00:00 2001
From: Adrian Dombeck <adrian.dombeck@canonical.com>
Date: Wed, 21 Aug 2024 14:32:54 +0200
Subject: [PATCH 3/3] Add tower-layer as a dependency

---
 Cargo.lock     | 1 +
 nss/Cargo.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 79ff7ca3c..0278b520c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -681,6 +681,7 @@ dependencies = [
  "tonic",
  "tonic-build",
  "tower 0.5.0",
+ "tower-layer",
 ]
 
 [[package]]
diff --git a/nss/Cargo.toml b/nss/Cargo.toml
index 99e54e628..e836b8be8 100644
--- a/nss/Cargo.toml
+++ b/nss/Cargo.toml
@@ -29,6 +29,7 @@ syslog = "7.0.0"
 ctor = "0.2.8"
 procfs = "0.16.0"
 hyper-util = "0.1.7"
+tower-layer = "0.3.3"
 
 [build-dependencies]
 tonic-build = "0.12.1"