From 870b6f26945f05610e9f1d4f7f8afb3f86543994 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 24 Feb 2025 09:20:46 +0100
Subject: [PATCH] dnsdist: switch back to serde_yaml

Fixes the dnsdist part of #15202
---
 .../dnsdist-rust-lib/rust/Cargo.lock          | 42 ++++---------------
 .../dnsdist-rust-lib/rust/Cargo.toml          |  2 +-
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.lock b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.lock
index 58b8d6f03a..fff57aa489 100644
--- a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.lock
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.lock
@@ -1,12 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "anyhow"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+version = 4
 
 [[package]]
 name = "cc"
@@ -78,7 +72,7 @@ dependencies = [
  "cxx",
  "cxx-build",
  "serde",
- "serde_yml",
+ "serde_yaml",
 ]
 
 [[package]]
@@ -109,16 +103,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "libyml"
-version = "0.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980"
-dependencies = [
- "anyhow",
- "version_check",
-]
-
 [[package]]
 name = "link-cplusplus"
 version = "1.0.9"
@@ -128,12 +112,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -191,18 +169,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_yml"
-version = "0.0.12"
+name = "serde_yaml"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
  "indexmap",
  "itoa",
- "libyml",
- "memchr",
  "ryu",
  "serde",
- "version_check",
+ "unsafe-libyaml",
 ]
 
 [[package]]
@@ -244,10 +220,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
-name = "version_check"
-version = "0.9.5"
+name = "unsafe-libyaml"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "winapi-util"
diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.toml b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.toml
index d3537feb5c..26e81bad74 100644
--- a/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.toml
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["staticlib"]
 [dependencies]
 cxx = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_yaml = { package = "serde_yml", version = "0.0.12" }
+serde_yaml = { version = "0.9.34" }
 
 [build-dependencies]
 cxx-build = "1.0"
-- 
2.47.2