From nobody Tue Jan 14 21:39:21 2025 X-Original-To: dev-commits-ports-branches@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 4YXjFP6cxpz5kSSk; Tue, 14 Jan 2025 21:39:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXjFP5s2Zz3Db5; Tue, 14 Jan 2025 21:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736890761; 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=UVf5oiIF93MAQrCgNTtlPeTPlRfw/y6WwJLg7eS4uDc=; b=iG8+LRZDqZFsfnmnAXNm0c+cRgeTXNsbs6L95iMn9wkB10HPDXcBjjRpqyJBgIVXvMEzme l1PhTo1Zom7rZNHq5d6huFKjEbxN2q9r8wgyFF1wX1/3O9wr2sq3iv3XKqruFFEy//5mgp r/y3HKVRsrukQswFv1OeiIAjZpIltkWZwjRFyaMr+dvwBteZtF+uV26pqYAoMjUHChQAu5 5vwCBehBO2NeQUHfQcE7w5tQmQdI1UEIN4UT/M4UwSPlzdWh61DUa2UxpHeIUgMmkZ56eF AE3fb2AT2ZcyqUIbbsHGh1yL6kwulRQ6ycT0Dzmdi3MPeKVGUCrOJE5MrfG6iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736890761; 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=UVf5oiIF93MAQrCgNTtlPeTPlRfw/y6WwJLg7eS4uDc=; b=P3FWaK6KO/B5N7XXpH5JHlUUll85U3/ovtLNxz9oIJq0iStkiLxFfXrqxTOgBpVJaCrnUZ 4Q+C9ugEs9ibaXotfEOIUSHjuduzmco7W1v1DNvkGFVPoMuePDhpB6TmX3Koy5m73Eaewd 4o/P6wDJTq3WexVBXGJKXQf/g23YstTRXfc+UUnuTNEhgywwMQfX41Nv2qVBDNoACJoHKt ci0PhJ839h72mk0krd1OFA1HF+LUdw1WhY4Ni1Fh2mmTnji++S6sOCDeUINBK/m3t35wCn HVYnyD1QKG0keGAY5KB+g9LRjfYFXqVmCdYamkhS72Kfb39jNhiIP32ogev2MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736890761; a=rsa-sha256; cv=none; b=ByRI8Im6T789G6eUDGwe4ujCanXn5r4FB5VFa5sgLsJG2uAkPgq0FeIIc83Z/snX5MFeU2 4RL8VfUWD5IvuBLavAliwnoGjYy9RImiG4Qs0GiEAW0MsvDxoV7z73p7P1cFA27GaOkmpm 6k7RflZl5E2e1bZyZAU0TSnxyXUjkK8t3J9KOp8e7nIIIj+j7RHdSevn5v9uEFNSv4OszF ZS1dsJfCMHmAKUz6ViSuRmhOudgd7HSW61u1AoRYE9NgoeR4r7ip/cYKG4TFrbsxDvK/IX /0ccLpiPnl4MLyxT+bM5y5EBNDPWFdKXCh1eFrgvrIMG7njZcwsGP3irvhZ24A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YXjFP54Sdz3JT; Tue, 14 Jan 2025 21:39:21 +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 50ELdLml085982; Tue, 14 Jan 2025 21:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ELdLNP085979; Tue, 14 Jan 2025 21:39:21 GMT (envelope-from git) Date: Tue, 14 Jan 2025 21:39:21 GMT Message-Id: <202501142139.50ELdLNP085979@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: a47df6586625 - 2025Q1 - dns/dnsmasq-devel: update to 2.91test6. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2025Q1 X-Git-Reftype: branch X-Git-Commit: a47df65866257e12c1e5f144a8766010329ceac5 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=a47df65866257e12c1e5f144a8766010329ceac5 commit a47df65866257e12c1e5f144a8766010329ceac5 Author: Matthias Andree AuthorDate: 2025-01-08 15:28:31 +0000 Commit: Matthias Andree CommitDate: 2025-01-14 21:36:18 +0000 dns/dnsmasq-devel: update to 2.91test6. Also include one potential cache.c NULL deref which I have submitted upstream. Upstream Git log: * 0003db1 2025-01-07 | Fix crash introduced in 6656790f2498f2a0b21086bc4ab47a2e38429a7c (tag: v2.91test6) * 275f4a4 2025-01-07 | Remove arbitrary workspace size limit. (tag: v2.91test5) * 12e4565 2025-01-06 | Improve "chown of PID file failed" message for missing CAP_CHOWN [Andrew Sayers] * 7af26ee 2025-01-07 | Fix manpage typo. [Andrew Sayers] * 63dc6eb 2025-01-07 | Fix read_write() changes for TCP timeout. * 6656790 2025-01-07 | Handle queries with EDNS client subnet fields better. * c8de423 2025-01-07 | Fix finger-trouble in immediately previous commit. * c52653f 2025-01-06 | Correctly handle failure of pipe() call in swap_to_tcp() * e24c341 2025-01-01 | Fix wrong packet size when dumpong packets to file. (cherry picked from commit c822c10442a488fe79326e2095236b94ea1e4a22) --- dns/dnsmasq-devel/Makefile | 2 +- dns/dnsmasq-devel/distinfo | 6 +++--- dns/dnsmasq-devel/files/patch-src_cache.c | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index e5f3f775ccbb..808f2ddf1b33 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= dnsmasq -DISTVERSION= 2.91test4 # remember to bump PORTEPOCH when going from test to rc! +DISTVERSION= 2.91test6 # 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= 5 diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index fd36946323e3..733a37b90308 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735656297 -SHA256 (dnsmasq-2.91test4.tar.xz) = 3766f12ed5c9e845f8bf110767d77585670779a9d8f7e0596e86c5836ec4cb88 -SIZE (dnsmasq-2.91test4.tar.xz) = 571648 +TIMESTAMP = 1736349936 +SHA256 (dnsmasq-2.91test6.tar.xz) = 394becd1c0a3a8565b61db8dbe1afb3241295b984275e46905e0c7271642c235 +SIZE (dnsmasq-2.91test6.tar.xz) = 571768 diff --git a/dns/dnsmasq-devel/files/patch-src_cache.c b/dns/dnsmasq-devel/files/patch-src_cache.c new file mode 100644 index 000000000000..d91038ed1a25 --- /dev/null +++ b/dns/dnsmasq-devel/files/patch-src_cache.c @@ -0,0 +1,11 @@ +--- src/cache.c.orig 2025-01-07 23:08:35 UTC ++++ src/cache.c +@@ -479,7 +479,7 @@ static struct crec *cache_scan_free(char *name, union + if ((crecp->flags & F_FORWARD) && hostname_isequal(cache_get_name(crecp), name)) + { + int rrmatch = 0; +- if (crecp->flags & flags & F_RR) ++ if (addr && crecp->flags & flags & F_RR) + { + unsigned short rrc = (crecp->flags & F_KEYTAG) ? crecp->addr.rrblock.rrtype : crecp->addr.rrdata.rrtype; + unsigned short rra = (flags & F_KEYTAG) ? addr->rrblock.rrtype : addr->rrdata.rrtype;