From 6582c27a43d16fcf7e042a0f60c8403c150aa3fd Mon Sep 17 00:00:00 2001
From: Matteo Settenvini <matteo.settenvini@montecristosoftware.eu>
Date: Tue, 10 Jan 2023 17:13:05 +0100
Subject: [PATCH] Update deps and fix getaddrinfo test for canary

Apparently the return of getaddrinfo for the canary domain has
changed in the latest versions of either glibc or the corresponding
crate.

The error returned is Eai::NoData rather than Eai::NoName.
---
 Cargo.toml                | 8 ++++----
 tests/integration_test.rs | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 85584b9..442a786 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,11 +22,11 @@ name = "nss_malcontent"
 integration_test = ["dep:zbus_names"]
 
 [build-dependencies]
-bindgen = "0.60"
+bindgen = "0.63"
 
 [dev-dependencies]
 malcontent-nss = { path = ".", features = ["integration_test"] }
-env_logger = "0.9"
+env_logger = "0.10"
 event-listener = "2.5"
 futures-util = "0.3"
 rusty-hook = "0.11"
@@ -36,11 +36,11 @@ tokio = { version = "1", features = ["rt", "sync", "macros", "net", "time"] }
 
 [dependencies]
 anyhow = "1.0"
-gethostname = "0.2"
+gethostname = "0.4"
 libc = "0.2"
 once_cell = "1.13"
 log = "0.4"
-nix = { version = "0.24", features = ["socket", "user", "sched"] }
+nix = { version = "0.25", features = ["socket", "user", "sched"] }
 serde = "1.0"
 tokio = { version = "1", features = ["rt"] }
 trust-dns-resolver = { version = "0.22", features = ["dns-over-rustls"] }
diff --git a/tests/integration_test.rs b/tests/integration_test.rs
index 7ae4889..4734784 100644
--- a/tests/integration_test.rs
+++ b/tests/integration_test.rs
@@ -48,7 +48,7 @@ fork_test! {
     }
 
     #[test]
-    fn application_dns_is_nxdomain() -> Result<()> {
+    fn application_dns_is_nodata() -> Result<()> {
         common::setup()?;
         tokio::runtime::Runtime::new().unwrap().block_on(async {
             let _dbus = common::mock_dbus(HashMap::from([(
@@ -69,8 +69,8 @@ fork_test! {
                 let error = std::ffi::CStr::from_ptr(gai_strerror(getaddrinfo_status));
                 assert_eq!(
                     getaddrinfo_status,
-                    Eai::NoName.0,
-                    "Should have gotten no hostname (NXDOMAIN), instead got {}",
+                    Eai::NoData.0,
+                    "Should have gotten no data (NODATA), instead got {}",
                     error.to_str().unwrap()
                 );
                 freeaddrinfo(addr);