git: f7dd45aa447a - main - dns/aardvark-dns: fix build by updating crates to their new versions
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 09 Jul 2026 20:18:17 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f7dd45aa447a1a300b3fa10c9e75f41874b096ed
commit f7dd45aa447a1a300b3fa10c9e75f41874b096ed
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2026-07-09 20:16:57 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2026-07-09 20:18:11 +0000
dns/aardvark-dns: fix build by updating crates to their new versions
Bump PORTREVISION.
Sponsored by: tipi.work
---
dns/aardvark-dns/Makefile | 1 +
dns/aardvark-dns/Makefile.crates | 4 +-
dns/aardvark-dns/distinfo | 10 ++--
dns/aardvark-dns/files/patch-Cargo.lock | 26 +++++++++
dns/aardvark-dns/files/patch-Cargo.toml | 11 ++++
...ch-cargo-crates_inotify-0.11.2_src_fd__guard.rs | 65 ----------------------
6 files changed, 45 insertions(+), 72 deletions(-)
diff --git a/dns/aardvark-dns/Makefile b/dns/aardvark-dns/Makefile
index ec6958d9e3c2..f2b850fbc424 100644
--- a/dns/aardvark-dns/Makefile
+++ b/dns/aardvark-dns/Makefile
@@ -1,6 +1,7 @@
PORTNAME= aardvark-dns
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= dns
MAINTAINER= osa@FreeBSD.org
diff --git a/dns/aardvark-dns/Makefile.crates b/dns/aardvark-dns/Makefile.crates
index 460466136e65..33d4c5cf8c8c 100644
--- a/dns/aardvark-dns/Makefile.crates
+++ b/dns/aardvark-dns/Makefile.crates
@@ -68,8 +68,8 @@ CARGO_CRATES= android_system_properties-0.1.5 \
idna-1.1.0 \
idna_adapter-1.2.2 \
indexmap-2.14.0 \
- inotify-0.11.2 \
- inotify-sys-0.1.5 \
+ inotify-0.11.4 \
+ inotify-sys-0.1.8 \
ipnet-2.12.0 \
is_terminal_polyfill-1.70.2 \
itoa-1.0.18 \
diff --git a/dns/aardvark-dns/distinfo b/dns/aardvark-dns/distinfo
index dea54f068601..699636510d5e 100644
--- a/dns/aardvark-dns/distinfo
+++ b/dns/aardvark-dns/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1781121641
+TIMESTAMP = 1783627280
SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
SHA256 (rust/crates/anstream-1.0.0.crate) = 824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d
@@ -139,10 +139,10 @@ SHA256 (rust/crates/idna_adapter-1.2.2.crate) = cb68373c0d6620ef8105e855e7745e18
SIZE (rust/crates/idna_adapter-1.2.2.crate) = 10444
SHA256 (rust/crates/indexmap-2.14.0.crate) = d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9
SIZE (rust/crates/indexmap-2.14.0.crate) = 104085
-SHA256 (rust/crates/inotify-0.11.2.crate) = 533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1
-SIZE (rust/crates/inotify-0.11.2.crate) = 29809
-SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
-SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965
+SHA256 (rust/crates/inotify-0.11.4.crate) = 153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8
+SIZE (rust/crates/inotify-0.11.4.crate) = 30209
+SHA256 (rust/crates/inotify-sys-0.1.8.crate) = c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d
+SIZE (rust/crates/inotify-sys-0.1.8.crate) = 8411
SHA256 (rust/crates/ipnet-2.12.0.crate) = d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2
SIZE (rust/crates/ipnet-2.12.0.crate) = 31000
SHA256 (rust/crates/is_terminal_polyfill-1.70.2.crate) = a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695
diff --git a/dns/aardvark-dns/files/patch-Cargo.lock b/dns/aardvark-dns/files/patch-Cargo.lock
new file mode 100644
index 000000000000..6980e475040a
--- /dev/null
+++ b/dns/aardvark-dns/files/patch-Cargo.lock
@@ -0,0 +1,26 @@
+--- Cargo.lock.orig 2026-07-09 20:05:06 UTC
++++ Cargo.lock
+@@ -718,9 +718,9 @@ name = "inotify"
+
+ [[package]]
+ name = "inotify"
+-version = "0.11.2"
++version = "0.11.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1"
++checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8"
+ dependencies = [
+ "bitflags",
+ "futures-util",
+@@ -731,9 +731,9 @@ name = "inotify-sys"
+
+ [[package]]
+ name = "inotify-sys"
+-version = "0.1.5"
++version = "0.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
++checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d"
+ dependencies = [
+ "libc",
+ ]
diff --git a/dns/aardvark-dns/files/patch-Cargo.toml b/dns/aardvark-dns/files/patch-Cargo.toml
new file mode 100644
index 000000000000..ca236130fa88
--- /dev/null
+++ b/dns/aardvark-dns/files/patch-Cargo.toml
@@ -0,0 +1,11 @@
+--- Cargo.toml.orig 2026-07-09 20:04:27 UTC
++++ Cargo.toml
+@@ -35,7 +35,7 @@ flume = "0.12.0"
+ libc = "0.2.186"
+ arc-swap = "1.9.1"
+ flume = "0.12.0"
+-inotify = "0.11.2"
++inotify = "0.11.4"
+ futures = "0.3.32"
+
+ [build-dependencies]
diff --git a/dns/aardvark-dns/files/patch-cargo-crates_inotify-0.11.2_src_fd__guard.rs b/dns/aardvark-dns/files/patch-cargo-crates_inotify-0.11.2_src_fd__guard.rs
deleted file mode 100644
index ba48c84c574a..000000000000
--- a/dns/aardvark-dns/files/patch-cargo-crates_inotify-0.11.2_src_fd__guard.rs
+++ /dev/null
@@ -1,65 +0,0 @@
---- cargo-crates/inotify-0.11.2/src/fd_guard.rs.orig 2026-06-11 11:57:55 UTC
-+++ cargo-crates/inotify-0.11.2/src/fd_guard.rs
-@@ -89,20 +89,48 @@ impl PartialEq for FdGuard {
- // wrapper both owns a file descriptor for control purposes and spawns a
- // second thread that needs a separate unowned descriptor to use the `epoll-rs`
- // crate.
-- const KCMP_FILE: i32 = 0;
-- let current_process = std::process::id();
-- match util::libc_convert(unsafe {
-- libc::syscall(
-- libc::SYS_kcmp,
-- current_process,
-- current_process,
-- KCMP_FILE,
-- self.fd,
-- other.fd,
-- ) as i64
-- }) {
-- Err(_) => false,
-- Ok(cmp) => cmp == 0,
-+ #[cfg(target_os = "linux")]
-+ {
-+ const KCMP_FILE: i32 = 0;
-+ let current_process = std::process::id();
-+ match util::libc_convert(unsafe {
-+ libc::syscall(
-+ libc::SYS_kcmp,
-+ current_process,
-+ current_process,
-+ KCMP_FILE,
-+ self.fd,
-+ other.fd,
-+ ) as i64
-+ }) {
-+ Err(_) => false,
-+ Ok(cmp) => cmp == 0,
-+ }
-+ }
-+ #[cfg(target_os = "freebsd")]
-+ {
-+ use std::mem::MaybeUninit;
-+
-+ unsafe {
-+ let mut stat1 = MaybeUninit::<libc::stat>::uninit();
-+ let mut stat2 = MaybeUninit::<libc::stat>::uninit();
-+
-+ if libc::fstat(self.fd, stat1.as_mut_ptr()) != 0 {
-+ return false;
-+ }
-+ if libc::fstat(other.fd, stat2.as_mut_ptr()) != 0 {
-+ return false;
-+ }
-+
-+ let stat1 = stat1.assume_init();
-+ let stat2 = stat2.assume_init();
-+
-+ stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino
-+ }
-+ }
-+ #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-+ {
-+ false
- }
- }
- }