From b978de49081ef6307befe1f76e3b3f5ceeed19b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 19:34:40 +0000
Subject: [PATCH 1/2] --- updated-dependencies: - dependency-name: h2  
 dependency-type: indirect ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 46 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a70e98b79..6f6666783 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -390,7 +390,7 @@ name = "builder_core"
 version = "0.0.0"
 dependencies = [
  "base64 0.21.0",
- "bitflags 1.3.2",
+ "bitflags 0.3.3",
  "chrono",
  "dogstatsd",
  "env_proxy",
@@ -965,6 +965,12 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
 [[package]]
 name = "errno"
 version = "0.2.8"
@@ -1250,9 +1256,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "h2"
-version = "0.3.17"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -1260,7 +1266,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util 0.7.7",
@@ -1292,7 +1298,7 @@ dependencies = [
  "actix-web",
  "artifactory-client",
  "base64 0.21.0",
- "bitflags 1.3.2",
+ "bitflags 0.3.3",
  "builder_core",
  "bytes",
  "chrono",
@@ -1369,7 +1375,7 @@ dependencies = [
 name = "habitat_builder_graph"
 version = "0.0.0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 0.3.3",
  "builder_core",
  "clap",
  "copperline",
@@ -1408,7 +1414,7 @@ dependencies = [
  "actix-web",
  "async-trait",
  "backtrace",
- "bitflags 1.3.2",
+ "bitflags 0.3.3",
  "builder_core",
  "bytes",
  "chrono",
@@ -1450,7 +1456,7 @@ name = "habitat_builder_worker"
 version = "0.0.0"
 dependencies = [
  "backtrace",
- "bitflags 1.3.2",
+ "bitflags 0.3.3",
  "builder_core",
  "chrono",
  "clap",
@@ -1494,7 +1500,7 @@ dependencies = [
  "habitat_win_users",
  "hex 0.4.3",
  "lazy_static",
- "libc 0.2.155",
+ "libc 0.1.12",
  "log",
  "native-tls",
  "nix 0.26.2",
@@ -1551,6 +1557,12 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -1703,6 +1715,16 @@ dependencies = [
  "hashbrown 0.12.3",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.5",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -2321,7 +2343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 1.9.2",
 ]
 
 [[package]]
@@ -3005,7 +3027,7 @@ version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
 dependencies = [
- "indexmap",
+ "indexmap 1.9.2",
  "itoa 1.0.5",
  "ryu",
  "serde",
@@ -3473,7 +3495,7 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
 dependencies = [
- "indexmap",
+ "indexmap 1.9.2",
  "serde",
 ]
 

From 21072fb020fc450d69818c90305ecf103a6642b3 Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Mon, 20 May 2024 15:28:35 -0700
Subject: [PATCH 2/2] fix downgraded crates

Signed-off-by: Matt Wrock <matt@mattwrock.com>
---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f6666783..36889fceb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -390,7 +390,7 @@ name = "builder_core"
 version = "0.0.0"
 dependencies = [
  "base64 0.21.0",
- "bitflags 0.3.3",
+ "bitflags 1.3.2",
  "chrono",
  "dogstatsd",
  "env_proxy",
@@ -1298,7 +1298,7 @@ dependencies = [
  "actix-web",
  "artifactory-client",
  "base64 0.21.0",
- "bitflags 0.3.3",
+ "bitflags 1.3.2",
  "builder_core",
  "bytes",
  "chrono",
@@ -1375,7 +1375,7 @@ dependencies = [
 name = "habitat_builder_graph"
 version = "0.0.0"
 dependencies = [
- "bitflags 0.3.3",
+ "bitflags 1.3.2",
  "builder_core",
  "clap",
  "copperline",
@@ -1414,7 +1414,7 @@ dependencies = [
  "actix-web",
  "async-trait",
  "backtrace",
- "bitflags 0.3.3",
+ "bitflags 1.3.2",
  "builder_core",
  "bytes",
  "chrono",
@@ -1456,7 +1456,7 @@ name = "habitat_builder_worker"
 version = "0.0.0"
 dependencies = [
  "backtrace",
- "bitflags 0.3.3",
+ "bitflags 1.3.2",
  "builder_core",
  "chrono",
  "clap",
@@ -1500,7 +1500,7 @@ dependencies = [
  "habitat_win_users",
  "hex 0.4.3",
  "lazy_static",
- "libc 0.1.12",
+ "libc 0.2.155",
  "log",
  "native-tls",
  "nix 0.26.2",