Bug 283138
| Summary: | [patch] dns/dnsmasq: Fix --dhcp-relay not working on FreeBSD | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Harald Schmalzbauer <bugzilla.freebsd> | ||||
| Component: | Individual Port(s) | Assignee: | Matthias Andree <mandree> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Some People | Flags: | mandree:
maintainer-feedback+
mandree: merge-quarterly+ |
||||
| Priority: | --- | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Harald Schmalzbauer
2024-12-05 09:24:06 UTC
Comment on attachment 255635 [details]
Provide files/patch-relay_upstream4_dhcp.c
I will fix the bug with this upstream code change, but I am rejecting this particular one because it bumps PORTEPOCH instead of PORTREVISION.
(In reply to Matthias Andree from comment #1) Tahnks for taking care. To my understanding, PORTREVISION explicitly is meant for infrastructure changes, so anything affecting the port but NOT the code. I chose PORTEPOCH because we are changing the code to import a upstream fix, which is not part of any release yet, but part of upstream code. Please confirm I misunderstood the meaning. Thanks -harry A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b572f527d6423f318197a98802cb58b8e20929d7 commit b572f527d6423f318197a98802cb58b8e20929d7 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2024-12-08 14:50:08 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2024-12-08 14:51:51 +0000 dns/dnsmasq: Fix --dhcp-relay not working on FreeBSD PR: 283138 MFH: 2024Q2 Reported by: Harald Schmalzbauer Obtained from: Simon Kelley, https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=5a1f2c577db58ea47727f1b6900c0be25e6db205 dns/dnsmasq/Makefile | 3 +-- dns/dnsmasq/files/patch-CHANGELOG (new) | 10 ++++++++++ dns/dnsmasq/files/patch-src_dhcp.c (new) | 12 ++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) PORTREVISION is what we are supposed to change here. PORTEPOCH is only ever increased if the versioning scheme breaks, say, if a port changes from a 20241208 like numbering scheme to semantic versioning such as 1.2.3 and we need a "very powerful" way of saying "1.2.3 is newer than 20241208". That's what we need PORTEPOCH for. (In reply to Matthias Andree from comment #4) Ic, thanks for clarification! A commit in branch 2024Q4 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cb026d575baf5460c1770ec2e9ec085da5a953e commit 8cb026d575baf5460c1770ec2e9ec085da5a953e Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2024-12-08 14:50:08 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2024-12-08 15:02:57 +0000 dns/dnsmasq: Fix --dhcp-relay not working on FreeBSD PR: 283138 MFH: 2024Q2 Reported by: Harald Schmalzbauer Obtained from: Simon Kelley, https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=5a1f2c577db58ea47727f1b6900c0be25e6db205 (cherry picked from commit b572f527d6423f318197a98802cb58b8e20929d7) dns/dnsmasq/Makefile | 3 +-- dns/dnsmasq/files/patch-CHANGELOG (new) | 10 ++++++++++ dns/dnsmasq/files/patch-src_dhcp.c (new) | 12 ++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) Of course the merge is to 2024Q4 not 2024Q2. MFH: 2024Q4 Thanks Harald for bringing this to our attention and having this fixed. |
