From d14258b1202942707388976971e46d29e29abcdc Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Wed, 23 Apr 2025 23:48:54 +0200 Subject: [PATCH] dns/dnsmasq-devel: update to 2.92test4 Changes since 2.92test3, by Simon Kelley unless stated otherwise: * a458c2b 2025-04-23 | Tidy up pipe-to-parent code in DNS TCP path. (tag: v2.92test4) * 9e67099 2025-04-22 | Tidy up replies to non-QUERY DNS opcodes in auth mode. * cfa1313 2025-04-20 | Log format error from upstream as 'FORMERR' [Rob Gill] * e3a2c8d 2025-04-20 | Add --log-queries=auth option. I had cherry-picked this in FreeBSD's test3 port already: * 95b74a7 2025-04-18 | Fix copy 'n paste error in DBUS server-statistics code. MFH: 2025Q2 --- dns/dnsmasq-devel/Makefile | 2 +- dns/dnsmasq-devel/distinfo | 6 +++--- dns/dnsmasq-devel/files/patch-src_dbus.c | 17 ----------------- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 dns/dnsmasq-devel/files/patch-src_dbus.c diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index 30d4e67ed7cb..5c5afc4a17d2 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= dnsmasq -DISTVERSION= 2.92test3 # remember to bump PORTEPOCH when going from test to rc! +DISTVERSION= 2.92test4 # remember to bump PORTEPOCH when going from test to rc! # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: PORTREVISION= 0 PORTEPOCH= 6 diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index 9b070f9d84dc..13e2333f4f0b 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745272053 -SHA256 (dnsmasq-2.92test3.tar.xz) = 92c1072772640f9e446b53d77327db833adb3f5f7d4734d9d2565c9379f524fb -SIZE (dnsmasq-2.92test3.tar.xz) = 576736 +TIMESTAMP = 1745444769 +SHA256 (dnsmasq-2.92test4.tar.xz) = 8783e6df51a76a31fae9bba684442aef57fa570cfad18dcf77a1a8ef4e6c8b02 +SIZE (dnsmasq-2.92test4.tar.xz) = 577208 diff --git a/dns/dnsmasq-devel/files/patch-src_dbus.c b/dns/dnsmasq-devel/files/patch-src_dbus.c deleted file mode 100644 index 8f60a0f53f1d..000000000000 --- a/dns/dnsmasq-devel/files/patch-src_dbus.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/dbus.c.orig 2025-04-18 13:01:14 UTC -+++ src/dbus.c -@@ -768,10 +768,10 @@ static DBusMessage *dbus_get_server_metrics(DBusMessag - add_dict_entry(&dict_array, "address", daemon->namebuff); - - add_dict_int(&dict_array, "port", port); -- add_dict_int(&dict_array, "queries", serv->queries); -- add_dict_int(&dict_array, "failed_queries", serv->failed_queries); -- add_dict_int(&dict_array, "nxdomain", serv->nxdomain_replies); -- add_dict_int(&dict_array, "retries", serv->retrys); -+ add_dict_int(&dict_array, "queries", queries); -+ add_dict_int(&dict_array, "failed_queries", failed_queries); -+ add_dict_int(&dict_array, "nxdomain", nxdomain_replies); -+ add_dict_int(&dict_array, "retries", retrys); - add_dict_int(&dict_array, "latency", sigma_latency/count_latency); - - dbus_message_iter_close_container(&server_array, &dict_array);