Date: Sat, 24 Jan 2026 10:11:37 +0000 From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b877c8b2a1e8 - main - dns/dnsmasq: fix DBUS option Message-ID: <69749ad9.34904.7ea35269@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=b877c8b2a1e8cdb3e24c41394bc335a0bbdc0f75 commit b877c8b2a1e8cdb3e24c41394bc335a0bbdc0f75 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2026-01-24 10:10:16 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2026-01-24 10:11:31 +0000 dns/dnsmasq: fix DBUS option I'd overlooked that I need to remove the src/dbus.c patch in v2.92, fixed now. Thanks for the report. Reported by: Igor Pavlov PR: 292674 --- dns/dnsmasq/Makefile | 2 +- dns/dnsmasq/files/patch-src_dbus.c | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 81a358810111..c874a61429ff 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.92 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= LOCAL/mandree/ \ diff --git a/dns/dnsmasq/files/patch-src_dbus.c b/dns/dnsmasq/files/patch-src_dbus.c deleted file mode 100644 index 0955676b4cd4..000000000000 --- a/dns/dnsmasq/files/patch-src_dbus.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/dbus.c.orig 2025-02-21 14:41:34 UTC -+++ src/dbus.c -@@ -745,7 +745,6 @@ static DBusMessage *dbus_get_server_metrics(DBusMessag - if (!(serv->flags & SERV_MARK)) - { - unsigned int port; -- unsigned int queries = 0, failed_queries = 0, nxdomain_replies = 0, retrys = 0; - unsigned int sigma_latency = 0, count_latency = 0; - - struct server *serv1; -@@ -754,10 +753,6 @@ static DBusMessage *dbus_get_server_metrics(DBusMessag - if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr)) - { - serv1->flags |= SERV_MARK; -- queries += serv1->queries; -- failed_queries += serv1->failed_queries; -- nxdomain_replies += serv1->nxdomain_replies; -- retrys += serv1->retrys; - sigma_latency += serv1->query_latency; - count_latency++; - }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69749ad9.34904.7ea35269>