From 91590abf02d37133660655cb97f3e43e6d50e644 Mon Sep 17 00:00:00 2001
From: Kyle Simpson <kyle@oxide.computer>
Date: Fri, 29 Sep 2023 23:19:12 +0100
Subject: [PATCH] (Numerically) bump to latest dendrite/opte

---
 Cargo.lock                     | 12 ++++++------
 package-manifest.toml          | 12 ++++++------
 tools/dendrite_openapi_version |  2 +-
 tools/dendrite_stub_checksums  |  6 +++---
 tools/opte_version             |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7296ea184..4680158258 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3376,7 +3376,7 @@ dependencies = [
 [[package]]
 name = "illumos-sys-hdrs"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=98d33125413f01722947e322f82caf9d22209434#98d33125413f01722947e322f82caf9d22209434"
+source = "git+https://github.com/oxidecomputer/opte?rev=631c2017f19cafb1535f621e9e5aa9198ccad869#631c2017f19cafb1535f621e9e5aa9198ccad869"
 
 [[package]]
 name = "illumos-utils"
@@ -3797,7 +3797,7 @@ dependencies = [
 [[package]]
 name = "kstat-macro"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=98d33125413f01722947e322f82caf9d22209434#98d33125413f01722947e322f82caf9d22209434"
+source = "git+https://github.com/oxidecomputer/opte?rev=631c2017f19cafb1535f621e9e5aa9198ccad869#631c2017f19cafb1535f621e9e5aa9198ccad869"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -5554,7 +5554,7 @@ dependencies = [
 [[package]]
 name = "opte"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=98d33125413f01722947e322f82caf9d22209434#98d33125413f01722947e322f82caf9d22209434"
+source = "git+https://github.com/oxidecomputer/opte?rev=631c2017f19cafb1535f621e9e5aa9198ccad869#631c2017f19cafb1535f621e9e5aa9198ccad869"
 dependencies = [
  "cfg-if 0.1.10",
  "dyn-clone",
@@ -5571,7 +5571,7 @@ dependencies = [
 [[package]]
 name = "opte-api"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=98d33125413f01722947e322f82caf9d22209434#98d33125413f01722947e322f82caf9d22209434"
+source = "git+https://github.com/oxidecomputer/opte?rev=631c2017f19cafb1535f621e9e5aa9198ccad869#631c2017f19cafb1535f621e9e5aa9198ccad869"
 dependencies = [
  "cfg-if 0.1.10",
  "illumos-sys-hdrs",
@@ -5584,7 +5584,7 @@ dependencies = [
 [[package]]
 name = "opte-ioctl"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=98d33125413f01722947e322f82caf9d22209434#98d33125413f01722947e322f82caf9d22209434"
+source = "git+https://github.com/oxidecomputer/opte?rev=631c2017f19cafb1535f621e9e5aa9198ccad869#631c2017f19cafb1535f621e9e5aa9198ccad869"
 dependencies = [
  "libc",
  "libnet",
@@ -5664,7 +5664,7 @@ dependencies = [
 [[package]]
 name = "oxide-vpc"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=98d33125413f01722947e322f82caf9d22209434#98d33125413f01722947e322f82caf9d22209434"
+source = "git+https://github.com/oxidecomputer/opte?rev=631c2017f19cafb1535f621e9e5aa9198ccad869#631c2017f19cafb1535f621e9e5aa9198ccad869"
 dependencies = [
  "cfg-if 0.1.10",
  "illumos-sys-hdrs",
diff --git a/package-manifest.toml b/package-manifest.toml
index 82538a0067..c73af5ccf7 100644
--- a/package-manifest.toml
+++ b/package-manifest.toml
@@ -457,8 +457,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "616862d1ff1a11411ac0de6289b98ef455aaafaa"
-source.sha256 = "b03c25589af5da1adb6c08b7044ecbdd9940c80d313dbbcb8369717fab7daf1b"
+source.commit = "7712104585266a2898da38c1345210ad26f9e71d"
+source.sha256 = "486b0b016c0df06947810b90f3a3dd40423f0ee6f255ed079dc8e5618c9a7281"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -482,8 +482,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "616862d1ff1a11411ac0de6289b98ef455aaafaa"
-source.sha256 = "b980add2fb3f7242d7e279e82335f71a484fcc6bc48fb7dcb59765fe42513455"
+source.commit = "7712104585266a2898da38c1345210ad26f9e71d"
+source.sha256 = "76ff76d3526323c3fcbe2351cf9fbda4840e0dc11cd0eb6b71a3e0bd36c5e5e8"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -500,8 +500,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "616862d1ff1a11411ac0de6289b98ef455aaafaa"
-source.sha256 = "9f8a3101a154fad58af044674067bd5a8286430226a523859f6080086fafe242"
+source.commit = "7712104585266a2898da38c1345210ad26f9e71d"
+source.sha256 = "b8e5c176070f9bc9ea0028de1999c77d66ea3438913664163975964effe4481b"
 output.type = "zone"
 output.intermediate_only = true
 
diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version
index 429d29b673..b1f210a647 100644
--- a/tools/dendrite_openapi_version
+++ b/tools/dendrite_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="616862d1ff1a11411ac0de6289b98ef455aaafaa"
+COMMIT="7712104585266a2898da38c1345210ad26f9e71d"
 SHA2="cb3f0cfbe6216d2441d34e0470252e0fb142332e47b33b65c24ef7368a694b6d"
diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums
index ed5be86ff2..9538bc0d00 100644
--- a/tools/dendrite_stub_checksums
+++ b/tools/dendrite_stub_checksums
@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="b03c25589af5da1adb6c08b7044ecbdd9940c80d313dbbcb8369717fab7daf1b"
-CIDL_SHA256_LINUX_DPD="70de937da6e784f14e06698cb183aaee7601f4e2b243287e8cd32c80351e0a56"
-CIDL_SHA256_LINUX_SWADM="afff41489c5217cd2266f501ad6df463e42d17c212c1f5698e9d355db2c0b60c"
+CIDL_SHA256_ILLUMOS="486b0b016c0df06947810b90f3a3dd40423f0ee6f255ed079dc8e5618c9a7281"
+CIDL_SHA256_LINUX_DPD="af97aaf7e1046a5c651d316c384171df6387b4c54c8ae4a3ef498e532eaa5a4c"
+CIDL_SHA256_LINUX_SWADM="909e400dcc9880720222c6dc3919404d83687f773f668160f66f38b51a81c188"
diff --git a/tools/opte_version b/tools/opte_version
index e87b1d6931..2dbaeb7154 100644
--- a/tools/opte_version
+++ b/tools/opte_version
@@ -1 +1 @@
-0.23.180
+0.23.181