From nobody Mon Apr 21 22:21:54 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZhKbl0kXjz5t7Hm; Mon, 21 Apr 2025 22:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZhKbl03j4z42TR; Mon, 21 Apr 2025 22:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745274115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yol4bJu0bspoFaCLH7vzcwLBYff8aFFRWxtR3VQM3L0=; b=nuLt0kXLU4rMgPMvdsOduL8ahGlLZgrHybyI1wF0xTd57cme0IEh2Iaz7kAVbr7RlliAsg hHurHHZSuTkxS2WJXFrDjVIxAt4JckaQKP/rMGtvGVXtyI0H7y909lnY3m4zf1HDY/HEei BpX7XObvNpUZo3EyOe4q5tDRoh7kNYA9uZcRYQ7o2t/Qvp/TVX2l8zpw94w4RYuGCTd7GS sFSyYR3TYLq/GP5csznSCWl29B/ZkxVQHjRGh+DoaWzf81T4kF2Xnmdd5P2nuWu/Bop5UJ h2rM8lW+FhaOhvk151nflvrHK9W5MpoI+sDFb+/FL+ZkL46r9O1Pkq58Teijxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745274115; a=rsa-sha256; cv=none; b=r/mlesINwTRD81Fl55F0gsErO/2lp6lv8isw8uOfONT8SPqSkf4T3Rs734cC/4hy/lh5nZ 3+ezci5ROxbRNHBhuoLm9FCbzqT+jdOmEohbbLAxFKZOF9mCNQztfMjoUKehyLhNMCRz0Y wGFEUoI63YDb9mL5nYFmo83Zh1oQoLNsD8zvESbyXR/ha/bzOjHCs0ZL5mHb2+dG7fUZpL 3dDRt2H2bO2N4vGWjfJkk0jTs7Ee5Po7J2xsz2SDWynwrEeCRxc70H3nOtIVTIjzVmoLwq vlD6NRQZypEY7pdgyQqQZSyushURQ57F5AF8jptGwkyrtleW4gxsx4xA7yyM9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745274115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yol4bJu0bspoFaCLH7vzcwLBYff8aFFRWxtR3VQM3L0=; b=SLFR0mXjtLIKe7uzStz26z59iwQRCh1cU5nc492pkmIf14xh5a+Qxa0xejDDjoRopws5wW 5rFzZRiJfnWbIvJjPfMf24GLPQ1DWQYWwSQc7Fr0y1hHriuLqMjIMyJhlFC5NESQIUZO/Q a5KduBR3M5GCjC9IzRyjocnv6SIruX8xTlEacrPDU202AYk1VEs3QztVAEUAMUN/OUJRp5 NpCmgTimYNmQbyCvX0re3psVStP8kCusWqwbK4PrEq68ESG7ddrYq/V2zRfap1ojP5EYsv VtZ94zJ8zpDK8A/vcuXwAq4yNxbwSmeRxX+qqE7Lm0t+XHtSElXmfVfM9V+8Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZhKbk6bS2z17JZ; Mon, 21 Apr 2025 22:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53LMLsOX061935; Mon, 21 Apr 2025 22:21:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LMLsBj061932; Mon, 21 Apr 2025 22:21:54 GMT (envelope-from git) Date: Mon, 21 Apr 2025 22:21:54 GMT Message-Id: <202504212221.53LMLsBj061932@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: ef94302f4678 - 2025Q2 - dns/dnsmasq-devel: update to v2.92test3 + 1 cherry-pick List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q2 X-Git-Reftype: branch X-Git-Commit: ef94302f467828fc0cb1326961b68256febb02c7 Auto-Submitted: auto-generated The branch 2025Q2 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef94302f467828fc0cb1326961b68256febb02c7 commit ef94302f467828fc0cb1326961b68256febb02c7 Author: Matthias Andree AuthorDate: 2025-04-21 21:51:10 +0000 Commit: Matthias Andree CommitDate: 2025-04-21 22:18:55 +0000 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 (cherry picked from commit 1925d2725fe9bfec3ad369a336923b4dfb1f74f8) --- dns/dnsmasq-devel/Makefile | 2 +- dns/dnsmasq-devel/distinfo | 6 +++--- 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);