Package: aardvark-dns
Version: 1.12.2-1
I hope to update rust-nix to version 0.29 soon. I've prpared a patch
for aardvark-dns. The patch is pretty trivial but unfortunately the
nature of the API change made it impractical to support both old
and new versions in the patch.
I was able to succesfully build the package, if you want to do
further testing, the new rust-nix is available in experimental.
Debdiff is attatched.
diff -Nru aardvark-dns-1.12.2/debian/cargo-checksum.json
aardvark-dns-1.12.2/debian/cargo-checksum.json
--- aardvark-dns-1.12.2/debian/cargo-checksum.json 1970-01-01
00:00:00.000000000 +0000
+++ aardvark-dns-1.12.2/debian/cargo-checksum.json 2024-10-19
01:11:38.000000000 +0000
@@ -0,0 +1 @@
+{"package":"dcbb59495599b679d9e729ebf985b08b482823209f91e7a5a82032d31183acbb","files":{}}
diff -Nru aardvark-dns-1.12.2/debian/changelog
aardvark-dns-1.12.2/debian/changelog
--- aardvark-dns-1.12.2/debian/changelog 2024-09-06 00:50:47.000000000
+0000
+++ aardvark-dns-1.12.2/debian/changelog 2024-10-19 01:11:38.000000000
+0000
@@ -1,3 +1,10 @@
+aardvark-dns (1.12.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch for nix 0.29.
+
+ -- Peter Michael Green <plugw...@debian.org> Sat, 19 Oct 2024 01:11:38 +0000
+
aardvark-dns (1.12.2-1) unstable; urgency=medium
* New upstream relase.
diff -Nru aardvark-dns-1.12.2/debian/control aardvark-dns-1.12.2/debian/control
--- aardvark-dns-1.12.2/debian/control 2024-09-06 00:50:47.000000000 +0000
+++ aardvark-dns-1.12.2/debian/control 2024-10-19 01:11:38.000000000 +0000
@@ -15,7 +15,7 @@
librust-hickory-client-dev,
librust-hickory-proto-dev,
librust-hickory-server-dev,
- librust-nix-dev,
+ librust-nix-0.29-dev,
librust-resolv-conf-dev,
librust-signal-hook-dev,
librust-strsim-dev,
diff -Nru aardvark-dns-1.12.2/debian/patches/nix-0.29.patch
aardvark-dns-1.12.2/debian/patches/nix-0.29.patch
--- aardvark-dns-1.12.2/debian/patches/nix-0.29.patch 1970-01-01
00:00:00.000000000 +0000
+++ aardvark-dns-1.12.2/debian/patches/nix-0.29.patch 2024-10-19
01:11:38.000000000 +0000
@@ -0,0 +1,27 @@
+Index: aardvark-dns-1.12.2/Cargo.toml
+===================================================================
+--- aardvark-dns-1.12.2.orig/Cargo.toml
++++ aardvark-dns-1.12.2/Cargo.toml
+@@ -31,7 +31,7 @@ hickory-client = "0.24.1"
+ futures-util = { version = "0.3.30", default-features = false }
+ tokio = { version = "1.39.2", features = ["macros", "rt-multi-thread", "net",
"signal"] }
+ resolv-conf = "0.7.0"
+-nix = { version = "0.27", features = ["fs", "signal"] }
++nix = { version = "0.29", features = ["fs", "signal"] }
+ libc = "0.2.154"
+ arc-swap = { version = ">= 1.6" }
+ flume = "0.11.0"
+Index: aardvark-dns-1.12.2/src/server/serve.rs
+===================================================================
+--- aardvark-dns-1.12.2.orig/src/server/serve.rs
++++ aardvark-dns-1.12.2/src/server/serve.rs
+@@ -92,8 +92,7 @@ pub async fn serve(
+ // to work but this is not really possible with the current code flow and
needs more changes.
+ daemonize()?;
+ let msg: [u8; 1] = [b'1'];
+- let ready_fd = ready.as_raw_fd();
+- unistd::write(ready_fd, &msg)?;
++ unistd::write(&ready, &msg)?;
+ drop(ready);
+
+ loop {
diff -Nru aardvark-dns-1.12.2/debian/patches/series
aardvark-dns-1.12.2/debian/patches/series
--- aardvark-dns-1.12.2/debian/patches/series 2024-09-06 00:50:47.000000000
+0000
+++ aardvark-dns-1.12.2/debian/patches/series 2024-10-19 01:10:39.000000000
+0000
@@ -1,3 +1,4 @@
relax-deps.patch
nix-0.27.patch
0003-Disable-failing-tests.patch
+nix-0.29.patch
