Pull in consistent DHCPv6 DUID fixes

bnaecker · bnaecker · commit f737acbdaa32 · 2026-05-20T20:49:25.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -501,7 +501,7 @@ digest = "0.10.7"
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
-dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "187aee7de2e50f907099ea06c04aac96c3455665" }
+dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "697223f2b69321bc90dc1724b132e9e61ed333d3" }
 dropshot = { version = "0.17.0", features = [ "usdt-probes" ] }
 dropshot-api-manager = "0.7.1"
 dropshot-api-manager-types = "0.7.1"
diff --git a/package-manifest.toml b/package-manifest.toml
@@ -765,8 +765,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "187aee7de2e50f907099ea06c04aac96c3455665"
-source.sha256 = "2a72f23b76c7e89c9e26b5e9cc646a85120b75972c5dc9058bc6377f834d5d34"
+source.commit = "697223f2b69321bc90dc1724b132e9e61ed333d3"
+source.sha256 = "c7347175c9846d68dc50d1236ab18d873a3becb429bba8922b6e83d3682e25fa"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -792,8 +792,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "187aee7de2e50f907099ea06c04aac96c3455665"
-source.sha256 = "b8e7e20f1aefc7e2447b89525d6177452c72bbce99d21319cade5a2c12e7a038"
+source.commit = "697223f2b69321bc90dc1724b132e9e61ed333d3"
+source.sha256 = "3092f10ff37116dc64132f19ed2b348c915bba4b1f3491ccf38bf8966646d63a"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -812,8 +812,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "187aee7de2e50f907099ea06c04aac96c3455665"
-source.sha256 = "657e4f9f6bda938f5f12685076066554089ee4774c92b510f888099966c32a8e"
+source.commit = "697223f2b69321bc90dc1724b132e9e61ed333d3"
+source.sha256 = "0829dd3e58192944f6555f27094eab0428228e233f3f6526741e941953665bcc"
 output.type = "zone"
 output.intermediate_only = true
 
diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums
@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="2a72f23b76c7e89c9e26b5e9cc646a85120b75972c5dc9058bc6377f834d5d34"
-CIDL_SHA256_LINUX_DPD="bdf0d1bedda8c8aecba489297d374c56aa0578b22b6a601fe399c03fa322ac74"
-CIDL_SHA256_LINUX_SWADM="9ae4ee3e4439f154e987c9c0b22947317247b8f63225f175aff2c568d381b881"
+CIDL_SHA256_ILLUMOS="c7347175c9846d68dc50d1236ab18d873a3becb429bba8922b6e83d3682e25fa"
+CIDL_SHA256_LINUX_DPD="e7dc0f81307120130a74a53e3ff3b02a02178dc42a05adadd9a30b8e238d77bb"
+CIDL_SHA256_LINUX_SWADM="dc5c4445f307053be8648e8d88f0ee728d4ce95bb6d9b983c5fdb8b716e5695a"
diff --git a/tools/dendrite_version b/tools/dendrite_version
@@ -1 +1 @@
-COMMIT="187aee7de2e50f907099ea06c04aac96c3455665"
+COMMIT="697223f2b69321bc90dc1724b132e9e61ed333d3"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-COMMIT="187aee7de2e50f907099ea06c04aac96c3455665"`
	`1`	`+COMMIT="697223f2b69321bc90dc1724b132e9e61ed333d3"`