From nobody Sat Feb 22 12:56:40 2025 X-Original-To: dev-commits-ports-main@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 4Z0RpJ60lrz5pqfb; Sat, 22 Feb 2025 12:56:40 +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 4Z0RpJ5Nn1z3WQQ; Sat, 22 Feb 2025 12:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740229000; 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=U9XVDZ7niJGCszkA0TDi6qwgFyEC51Tqq9rB+N9LkoY=; b=xBIt/wxuNKMVs+/qENa3nNz/UMDgGxOGhUIvfSdJoWcUZH0P7OxZ0USV6hXsAw0TyzKI7b IOvZJTPfVTsd0Mm1FvZjvOS4IpE5N3T6jzpFfc0dFSWp77GfmFhDqebI145WB9mTGX4Qtx g2p+1nLVZGbGB8WoNIxA8K5x4fhk6hsnyc1BQ+WhbSUBMImMYAxpTrLEVQb0CVNS64Kubl QRFe47iNuey9/iA+uxQei9H0OAJba6XoIoOQ22JmkwvFpgSDHlA92cjqx4QYbr3T31pe80 07qUiePogFMIOnYUbnJ2YyMnZAlk03W7atolg/RrOD3g5gCY4NZDj/qeBvq/MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740229000; a=rsa-sha256; cv=none; b=b7eC2xdqnFFY0e2cmDtUW08/QmwLxoHhYuig3kbF2b7kgdmFivrMcPCQhtMrtwRcMoqAhF c/ohJKGUbfWRKcY+AsM78pbCzrAaknflyBbLGBeffSdHLxq36NQ6n37CMR31rtlUBeOPzw OfrCawjbrIgUo89XG+1IJPRROuUkaNZ69Uzo8iUAPQCnLBa7mNz7iomkUPxClr9Zh/C+zO 2SWSNcSO02a8m9gk97G8Y1qhUEuPWv/daMc+ZzR8zUqo2uE0nD1D+f+TQppZnFM1UsbNz2 cH3oblV+eUncH+W7laVmwUDRgSM5gACLXW4nXsc2oFBBxdgwosClOf7EnWNpew== 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=1740229000; 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=U9XVDZ7niJGCszkA0TDi6qwgFyEC51Tqq9rB+N9LkoY=; b=Te7N8WSn1H6R3bvazdLqM9aGT6mKmqLDN678Lj9fLvQImUCFTnAl/WISAJ7BxwmAsLfoSC sdzptnGMKSzFI5qoLlx69rZsV0lE16MeiqlhZq2N/I0KlzcjxPTMbsdRfW9VuiSkHD/UdM pHH25rs8FZWwSi5E8GBQRfWi6yXmTfJTArAzpn4rRWkB9cvpxou162pZ3imMTXE0nBCKsj 6ZnQISqdyTZuydoYyGRAIhFG9HuwKnIq6qgAaY22+CIswFaKAOsZNmhubz8gCgVLp0iwty eEdTNrz7Lsb+oMxgCBvKAfyEJ5/hIEqZJGvYO2antxTVh63MS1wczMj9J576+w== 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 4Z0RpJ4DxWz184S; Sat, 22 Feb 2025 12:56:40 +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 51MCuexU097311; Sat, 22 Feb 2025 12:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51MCuerg097308; Sat, 22 Feb 2025 12:56:40 GMT (envelope-from git) Date: Sat, 22 Feb 2025 12:56:40 GMT Message-Id: <202502221256.51MCuerg097308@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: ccd2f3531f9a - main - dns/dnsmasq: update pkg-message and fix a few compiler warnings List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: ccd2f3531f9ad5662e4d3047123f0156e525ebbd Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=ccd2f3531f9ad5662e4d3047123f0156e525ebbd commit ccd2f3531f9ad5662e4d3047123f0156e525ebbd Author: Matthias Andree AuthorDate: 2025-02-22 12:56:00 +0000 Commit: Matthias Andree CommitDate: 2025-02-22 12:56:00 +0000 dns/dnsmasq: update pkg-message and fix a few compiler warnings ...which v2.91 will also fix. --- dns/dnsmasq/Makefile | 5 +++-- dns/dnsmasq/files/patch-src_dbus.c | 21 +++++++++++++++++++++ dns/dnsmasq/files/pkg-message.in | 6 ++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 82c465cf42c6..1e64e36f3a3e 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.90 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \ @@ -26,7 +26,8 @@ MAKE_ARGS= CC="${CC}" \ PREFIX="${PREFIX}" \ RPM_OPT_FLAGS="${CPPFLAGS}" CFLAGS+= -Wall -Wno-unused-function -Wno-unused-parameter \ - -Wno-unused-value -Wno-unused-variable + -Wno-unused-value -Wno-unused-variable \ + -Wno-gnu-variable-sized-type-not-at-end CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS_INSTALL= dnsmasq-devel diff --git a/dns/dnsmasq/files/patch-src_dbus.c b/dns/dnsmasq/files/patch-src_dbus.c new file mode 100644 index 000000000000..0955676b4cd4 --- /dev/null +++ b/dns/dnsmasq/files/patch-src_dbus.c @@ -0,0 +1,21 @@ +--- 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++; + } diff --git a/dns/dnsmasq/files/pkg-message.in b/dns/dnsmasq/files/pkg-message.in index ea0fda8b3e92..3585d591a921 100644 --- a/dns/dnsmasq/files/pkg-message.in +++ b/dns/dnsmasq/files/pkg-message.in @@ -7,6 +7,12 @@ set dnsmasq_enable="YES" in /etc/rc.conf[.local] Further options and actions are documented inside %%PREFIX%%/etc/rc.d/dnsmasq + +NOTE: when using dnssec, inaccurate system clocks +can cause DNS resolution to fail +because DNSSEC signatures may then not validate. + + SECURITY RECOMMENDATION ~~~~~~~~~~~~~~~~~~~~~~~ It is recommended to enable the wpad-related options