Merge pull request #14653 from omoerbeek/rec-rust-updates

rec: rust related updates
PowerDNS · Oct 7, 2024 · 88b78f8 · 88b78f8
2 parents ec0e381 + 1ac9bb2
commit 88b78f8
Show file tree

Hide file tree

Showing 8 changed files with 2,854 additions and 2,816 deletions.
diff --git a/builder-support/helpers/rust.json b/builder-support/helpers/rust.json
@@ -1,7 +1,7 @@
 {
-  "version": "1.78.0",
+  "version": "1.81.0",
   "license": "MIT",
   "publisher": "https://www.rust-lang.org/",
-  "SHA256SUM_x86_64": "1377999f189d328ec183676c0e69f21af16e450f8d67f10d1f6cf746951a1d64",
-  "SHA256SUM_aarch64": "a76e6b659e9948f2bbd9d1c99b45348c3729bac7003d5f5b7fb5cacddb2bfcc1"
+  "SHA256SUM_x86_64": "b82a9daa19de7ae7e445af211974d96d390945aede7b32f752c93d0bb2e0890d",
+  "SHA256SUM_aarch64": "f103d49fe2c6a2d468d48113102a72fa8ea12b1cc379ad76784e1754bbb29a45"
 }
diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc
@@ -166,7 +166,11 @@ static void possiblyConvertACLFile(const string& includeDir, const string& apiDi
     if (plusis != string::npos) {
       auto val = line.substr(plusis + 2);
       boost::trim(val);
-      result.emplace_back(val);
+      vector<string> acls;
+      stringtok(acls, val, " ,\t");
+      for (const auto& acl : acls) {
+        result.emplace_back(acl);
+      }
     }
   }
 

diff --git a/pdns/recursordist/settings/rust/Cargo.lock b/pdns/recursordist/settings/rust/Cargo.lock
diff --git a/pdns/recursordist/settings/rust/Cargo.toml b/pdns/recursordist/settings/rust/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["staticlib"]
 [dependencies]
 cxx = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.9"
+serde_yaml = { package = "serde_yml", version = "0.0.12" }
 ipnet = "2.8"
 once_cell = "1.18.0"
-base64 = "0.21"
+base64 = "0.22"
 
 [build-dependencies]
 cxx-build = "1.0"