From nobody Tue Jan 14 21:39:22 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 4YXjFR0hwxz5kSqn; Tue, 14 Jan 2025 21:39:23 +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 4YXjFQ5Y4cz3DdZ; Tue, 14 Jan 2025 21:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736890762; 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=q8ERJu4n4wyRl/np6/cWdrs5ul/2+av2n0/zfvpsApU=; b=pvXyX9vuAQDs9V3000kWR4Vsa0+2xxLUA8J9EEzaVtizGrGutVbamlM7nThMEiYY5DA3mQ 7Hc5z+47d69dh3gNZo+4AOxoz643wqPlI0Rl1VIlbShhlzlSLpULnTolyr7vnzjlqrQwjf uZ1ukGBeIPM6N16Gv+lOZ3xtAXX1d8PIqrolZOjxguyklzXwRjKwrZkgb+MXzmYyPxM/Pg mqg8iLh8KdJr0elSN0kfGS/qx66c/qrwLmBjPOx3VBKm5yABb/wxNdl4wil/NvH6G3eGuW zD7R3J54Bl5PdtawydFp1t4IWxre1d53a7u21dT40M6bCi9CV36Hy3PHewUAuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736890762; 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=q8ERJu4n4wyRl/np6/cWdrs5ul/2+av2n0/zfvpsApU=; b=yBKOmP9sFmR5Zq2fbLQjDW7bQC9wywy5LvL4/fHmPuYZ84AJhkP5yE4QvsmHSNBBWmEDze 9f+YGC1zM8Edqoa7fwU6e7gJVJWDOzWiXvjBKa7wV6SZo07atQ744yf9j2jT1oTPTK4e3P 4rmCdfwGi0Uvy7m4DIzKZ+XljzydDgJ2t1x3aXwajXIbR44uoaf7F1koAw+9qzxguimcwR Nvu2EEYKARbXBhALYmWrS5+Bdev7vafMI5P0IKNXchVe4ySYkc0nASUm3OWW7w6IXsYGCk Dw2A42SEx6hPH2m6+uE1oXfbYlb2X6uFYfiSr4vaw6qhiqPxWu4HfGjW5w9n2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736890762; a=rsa-sha256; cv=none; b=n/oEgUD2D3/UqysU6MRbwnmIyqFBMVKFd6dgKBrRUI3OQ1GXkuxY9AifwOKWjhInamweaQ k6SOCvmkOoE/jIps6538jBNz9I1tf5etj8nMX1cvhH+BLafQBqq4Qwa0KA7RNakQEd9waV RM5yqgVP04HfYLIiqJixK6BiEAljGYS31EI20N4Ki+Rne0ptUV8lWhGetaOLkyqUK97Vk9 1sF8zC6h2N2WdGFRXYrCIAR0IgLIqsmcIIjNB2ZRA1rkY0R8gdAHhk/xiGI/b8fpxFWKvk fc0gDgZH8BHititpf/EY/KtGjGybBtt4WGK3c+b/EaC5WSg1aBlHNZSLEZwojw== 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 4YXjFQ57s3z31y; Tue, 14 Jan 2025 21:39:22 +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 50ELdMSm086021; Tue, 14 Jan 2025 21:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ELdMdw086018; Tue, 14 Jan 2025 21:39:22 GMT (envelope-from git) Date: Tue, 14 Jan 2025 21:39:22 GMT Message-Id: <202501142139.50ELdMdw086018@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: 0f9874c5844e - 2025Q1 - dns/dnsmasq-devel: update to v2.91test7 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: 0f9874c5844e7ed005de40e38a3ad19ce2b13fb8 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f9874c5844e7ed005de40e38a3ad19ce2b13fb8 commit 0f9874c5844e7ed005de40e38a3ad19ce2b13fb8 Author: Matthias Andree AuthorDate: 2025-01-14 21:17:45 +0000 Commit: Matthias Andree CommitDate: 2025-01-14 21:36:18 +0000 dns/dnsmasq-devel: update to v2.91test7 The local patch got merged upstream and was removed. This is the changelog since test6: * da58455 2025-01-13 | Tweak 7d915a0bb94260073ec7aa4dd00b787f3ea4b9e8 (tag: v2.91test7) * b915c9a 2025-01-13 | Attempt to keep running if a child process dies. * 424aaa0 2025-01-13 | Fix another 509afcd1d2f9edbd1e11c9abd0f335f02baa7fc4 SNAFU * c72c895 2025-01-12 | Improve "no upstream servers configured" when D-Bus is enabled [Andrew Sayers] * b715611 2025-01-12 | Fix SNAFU in 509afcd1d2f9edbd1e11c9abd0f335f02baa7fc4 * 7d915a0 2025-01-12 | Don't do retries over UDP when we've sent the query by TCP. * 509afcd 2025-01-12 | Refactor poll() loop. * 51343bd 2025-01-12 | Treat replies with CD flag set the same for UDP and TCP code paths. * b58276a 2025-01-12 | Return EDE OTHER error when DNSSEC validation abandoned. * f162d34 2024-12-29 | cache: Fix potential NULL deref in arcane situations. [Matthias Andree] (cherry picked from commit 44de445d96ac7096fb803c1bba9019c23cc24990) --- dns/dnsmasq-devel/Makefile | 2 +- dns/dnsmasq-devel/distinfo | 6 +++--- dns/dnsmasq-devel/files/patch-src_cache.c | 11 ----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index 808f2ddf1b33..f363001805a9 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= dnsmasq -DISTVERSION= 2.91test6 # remember to bump PORTEPOCH when going from test to rc! +DISTVERSION= 2.91test7 # 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 733a37b90308..dbf8ff6b92bd 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1736349936 -SHA256 (dnsmasq-2.91test6.tar.xz) = 394becd1c0a3a8565b61db8dbe1afb3241295b984275e46905e0c7271642c235 -SIZE (dnsmasq-2.91test6.tar.xz) = 571768 +TIMESTAMP = 1736889174 +SHA256 (dnsmasq-2.91test7.tar.xz) = 5440f0f68a0b0cc4531c34e7ba825da018d57877d2e7d5ac1e28be0a140eebae +SIZE (dnsmasq-2.91test7.tar.xz) = 572008 diff --git a/dns/dnsmasq-devel/files/patch-src_cache.c b/dns/dnsmasq-devel/files/patch-src_cache.c deleted file mode 100644 index d91038ed1a25..000000000000 --- a/dns/dnsmasq-devel/files/patch-src_cache.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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;