diff options
author | Matthias Andree <mandree@FreeBSD.org> | 2025-04-21 23:51:10 +0200 |
---|---|---|
committer | Matthias Andree <mandree@FreeBSD.org> | 2025-04-22 00:16:41 +0200 |
commit | 1925d2725fe9bfec3ad369a336923b4dfb1f74f8 (patch) | |
tree | 8e6b4b9ea42912eb13ac650659b924608e573be0 | |
parent | archivers/py-borgbackup: bugfix update to 1.4.1 (diff) |
dns/dnsmasq-devel: update to v2.92test3 + 1 cherry-pick
Changes (newest first) since v2.92test2, by Simon Kelley unless
noted otherwise:
* 95b74a7 2025-04-18 | Fix copy 'n paste error in DBUS server-statistics code.
* ae57f84 2025-04-18 | Do a better job of 942a35f[...] (tag: v2.92test3)
* 0620309 2025-04-16 | Revise negative DNS caching to better comply with RFC2308.
* 942a35f 2025-04-16 | Silence compiler warnings. [Opty]
MFH: 2025Q2
-rw-r--r-- | dns/dnsmasq-devel/Makefile | 2 | ||||
-rw-r--r-- | dns/dnsmasq-devel/distinfo | 6 | ||||
-rw-r--r-- | dns/dnsmasq-devel/files/patch-src_dbus.c | 17 |
3 files changed, 21 insertions, 4 deletions
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index 0a704369d976..30d4e67ed7cb 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= dnsmasq -DISTVERSION= 2.92test2 # remember to bump PORTEPOCH when going from test to rc! +DISTVERSION= 2.92test3 # 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 bd313892efdc..9b070f9d84dc 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743962929 -SHA256 (dnsmasq-2.92test2.tar.xz) = 3b975111b8180a0ae9a7ec8109bebc27170dfd55aecf10ef5da7b3e65756c0c9 -SIZE (dnsmasq-2.92test2.tar.xz) = 576740 +TIMESTAMP = 1745272053 +SHA256 (dnsmasq-2.92test3.tar.xz) = 92c1072772640f9e446b53d77327db833adb3f5f7d4734d9d2565c9379f524fb +SIZE (dnsmasq-2.92test3.tar.xz) = 576736 diff --git a/dns/dnsmasq-devel/files/patch-src_dbus.c b/dns/dnsmasq-devel/files/patch-src_dbus.c new file mode 100644 index 000000000000..8f60a0f53f1d --- /dev/null +++ b/dns/dnsmasq-devel/files/patch-src_dbus.c @@ -0,0 +1,17 @@ +--- 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); |