Created attachment 271480 [details] patch 1/3, for main, to update dnsmasq to 2.93 release Greetings, the current situation is: dns/dnsmasq is at 2.92rel2,1 consistently at main and 2026Q2 dns/dnsmasq-devel is at 2.93.r3,8 (Release Candidate #3) for main and .r1,8 for 2026Q2. I would like to do these things, for which I have three patches I will attach; hey can by previewed on https://github.com/mandree/freebsd-ports/commits/main/ #1 - update dnsmasq (stable port) to 2.93,1 on main (this has to come first so the commit messages are consistent when reading them in commit order!) #2 - remove dnsmasq-devel from main according to the DEPRECATED= tag https://github.com/mandree/freebsd-ports/commits/2026Q2/ NP - keep dnsmasq unchanged at 2.92rel2,1 on 2026Q2 (NP = no patch, obviously) #3 - update dnsmasq-devel on 2026Q2 to the formal release, and mark it with EXPIRATION_DATE 2026-06-30
Created attachment 271481 [details] patch 2/3, for main, to remove dns/dnsmasq-devel and update MOVED and UPDATING
Created attachment 271482 [details] patch 3/3, for 2026Q2 directly, to update dnsmasq-devel to 2.93 release In order to minimize disruption for users of the quarterly branch 2026Q2, the proposal is, for 2026Q2, to - keep dnsmasq at 2.92rel2 (this "rel2" has the security fixes that went into 2.93) - instead update dnsmasq-devel from 2.93rc1 (release candidate #1) to 2.93 release to collect the bugfixes, and mark it for expiration at the 2026Q2's EOL date.
The required patches are now all attached, and should be committed together. I don't mind whoever commits these, might be ports-secteam@ (I am assigning them only because they are more people on the team) or someone else.
Forgot the PR: tag in the commit messages. Will replace patches now.
Created attachment 271483 [details] patch 1/3, for main, to update dnsmasq to 2.93 release (v2: PR tag added to commit message)
Created attachment 271484 [details] patch 2/3, for main, to remove dns/dnsmasq-devel and update MOVED and UPDATING (v2: adds PR tag to commit message)
Created attachment 271485 [details] patch 3/3, for 2026Q2 directly, to update dnsmasq-devel to 2.93 release (v2: adds PR tag to commit message)
All patches updated now so you'll have the PR: tag when using "git am" to apply them to the tree. (Gitlab and Github repos have been updated, too)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=586f3574a2aba859884bae464f335ed3883f64d8 commit 586f3574a2aba859884bae464f335ed3883f64d8 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2026-06-04 12:41:54 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-06-05 16:28:40 +0000 dns/dnsmasq-devel: remove port, dns/dnsmasq is newer Due to administrative issues effectuated earlier in 2026 that have been unresolved to date, this port been unable to move usefully fast enough. Let's not pretend otherwise and remove the dnsmasq-devel port, as announced in its DEPRECATED tag, now that dns/dnsmasq is newer than this dns/dnsmasq-devel; the DEPRECATED has announced for months this would happen after dnsmasq's v2.93 release. (There was no EXPIRATION_DATE because the v2.93 release wasn't fixed to a date.) Add MOVED and UPDATING entries to suggest that users should install the stable dns/dnsmasq port instead. In order to minimize disruption on the quarterly branch, this shall not be MFH'd, I will propose to update dnsmasq-devel to 2.93 release for 2026Q2 by direct commit instead. PR: 295851 Pull Request: https://github.com/freebsd/freebsd-ports/pull/529 MOVED | 1 + UPDATING | 14 ++ dns/Makefile | 1 - dns/dnsmasq-devel/Makefile (gone) | 180 --------------------- dns/dnsmasq-devel/distinfo (gone) | 3 - dns/dnsmasq-devel/files/dnsmasq.in (gone) | 109 ------------- dns/dnsmasq-devel/files/pkg-message.in (gone) | 24 --- .../files/simon-kelley-keyring.asc (gone) | Bin 7158 -> 0 bytes dns/dnsmasq-devel/files/update.py (gone) | 52 ------ dns/dnsmasq-devel/pkg-descr (gone) | 12 -- dns/dnsmasq-devel/pkg-plist (gone) | 18 --- 11 files changed, 15 insertions(+), 399 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=642bf8e1a3b7c521139e36ab97a31af672b9e8c7 commit 642bf8e1a3b7c521139e36ab97a31af672b9e8c7 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2026-06-04 12:38:16 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-06-05 16:28:40 +0000 dns/dnsmasq: update to v2.93 stable release This release improves DNSSEC and inotify related matters, see Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG PR: 295851 Pull Request: https://github.com/freebsd/freebsd-ports/pull/529 dns/dnsmasq/Makefile | 2 +- dns/dnsmasq/distinfo | 6 +- dns/dnsmasq/files/patch-src_dhcp.c (gone) | 110 ------------------------------ 3 files changed, 4 insertions(+), 114 deletions(-)
Comment on attachment 271484 [details] patch 2/3, for main, to remove dns/dnsmasq-devel and update MOVED and UPDATING (v2: adds PR tag to commit message) so, we'd need to update dns/dnsmasq-devel on 2026Q2 directly to close this PR.
rebased my 2026Q2 and pushed, here's the PR if you find that easier than the patch: https://github.com/freebsd/freebsd-ports/pull/544
A commit in branch 2026Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7758b5547bb5c697b628f5cb872703efff6f485 commit c7758b5547bb5c697b628f5cb872703efff6f485 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2026-06-04 12:50:35 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-06-20 11:41:43 +0000 dns/dnsmasq-devel: update to 2.93, add EXPIRATION_DATE Move users of this -devel to the formal release of this v2.93 development effort, and set the port to expire with the EOL of this quarterly branch. The dns/dnsmasq on quarterly should remain at 2.92rel2 for now according to usual maintenance practice on the quarterly ports branch, but we want to provide the bugfixes made during the release testing, see below, and keep disruptions minimal for users of the quarterly branch. Users should plan ahead to migrate to dns/dnsmasq when 2026Q3 will be branched in July 2026. Configuration files including rc.conf settings are compatible between dnsmasq-devel and dnsmasq. (As direct commit to 2026Q2, port to be removed in main branch.) Changes in 2.93 release since 2.93rc1, from upstream Git repository: * 3ff66da 2026-06-02 | Fix two typos in v2.93 CHANGELOG (tag: v2.93) [Matthias Andree] * d823d8e 2026-06-03 | Fix OOB-read crash in get_rdata(). [Simon Kelley] * 2c78b6d 2026-06-02 | Better code to make human-friendly tokens for pointers in log-malloc. [Simon Kelley] * 4bf46ce 2026-06-02 | Add the ability to bail before EOF to get_line_alloc(); [Simon Kelley] * 7d42376 2026-06-01 | Fix get_line_alloc() (tag: v2.93rc3) [Simon Kelley] * 08cc209 2026-06-01 | Add --log-debug to man page. [Simon Kelley] * ff4964d 2026-05-31 | Re-implement print_mac() to do its own buffer managment. (tag: v2.93rc2) [Simon Kelley] * 45771dc 2026-05-30 | Fix OOB writes in contrib/leasequesry/leasequery.c [Michalis Vasileiadis] * af73e48 2026-05-30 | Include fc00::/8 in the set of local addresses. [Simon Kelley] * 77d4749 2026-05-29 | Fix DNSSEC frec use-after-free in TCP validation path. [Simon Kelley] * 0375e40 2026-05-29 | Fix bounds-checking in contrib/lease-tools/dhcp_release6.c [OpenAI Security Research Team] * 18a139f 2026-05-17 | Change "limit" arg to add_pseudoheader() to a length. [Simon Kelley] * d5d2bfb 2026-05-17 | Change "limit" arg to make_local_answer() to a length. [Simon Kelley] * 7f5802c 2026-05-17 | Tidy up get_line_alloc() [Simon Kelley] * 7280e46 2026-05-17 | Check for too-small packets in relay_upstream6() [Simon Kelley] * 754177b 2026-05-16 | Fix hostname_issubdomain() confusion. [Simon Kelley] * 228d7ff 2026-05-14 | Remove arbitrary limit on config file line lengths. [Simon Kelley] PR: 295851 Pull Request: https://github.com/freebsd/freebsd-ports/pull/544 dns/dnsmasq-devel/Makefile | 9 ++++++--- dns/dnsmasq-devel/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-)
Thanks, Gleb!