Date: Wed, 8 Jan 2025 15:30:01 GMT 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: c822c10442a4 - main - dns/dnsmasq-devel: update to 2.91test6. Message-ID: <202501081530.508FU1GK009248@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=c822c10442a488fe79326e2095236b94ea1e4a22 commit c822c10442a488fe79326e2095236b94ea1e4a22 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2025-01-08 15:28:31 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2025-01-08 15:29:47 +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. --- 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501081530.508FU1GK009248>