Date: Sun, 01 Mar 2026 05:07:52 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f2d62243c188 - main - net/dhcpd: Remove unnecessary patches Message-ID: <69a3c9a8.3a717.3967e725@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2d62243c1887e3ada4dc025904f43f1f18a0f4b commit f2d62243c1887e3ada4dc025904f43f1f18a0f4b Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-03-01 05:03:47 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-03-01 05:07:23 +0000 net/dhcpd: Remove unnecessary patches Forgot to remove in previous commit. PR: 293480 Reported by: Sulev-Madis Silber <bugs-freebsd-org916@ketas.si.pri.ee> --- net/dhcpd/files/patch-dhcp-options.5 | 13 ------------- net/dhcpd/files/patch-pfutils.c | 34 ---------------------------------- net/dhcpd/files/patch-tables.c | 11 ----------- 3 files changed, 58 deletions(-) diff --git a/net/dhcpd/files/patch-dhcp-options.5 b/net/dhcpd/files/patch-dhcp-options.5 deleted file mode 100644 index 03ca38af4016..000000000000 --- a/net/dhcpd/files/patch-dhcp-options.5 +++ /dev/null @@ -1,13 +0,0 @@ ---- dhcp-options.5.orig 2020-04-13 17:07:01 UTC -+++ dhcp-options.5 -@@ -346,6 +346,10 @@ This option specifies whether the client should config - for packet forwarding. - A value of 0 means disable IP forwarding, and a value of 1 means enable - IP forwarding. -+.It Ic option ipv6-only-preferred Ar uint32 ; -+The number of seconds for which an IPv6-only-capable client should disable -+DHCPv4. -+See RFC 8925 for details. - .It Ic option irc-server Ar ip-address Oo , Ar ip-address ... Oc ; - The - .Ic irc-server diff --git a/net/dhcpd/files/patch-pfutils.c b/net/dhcpd/files/patch-pfutils.c deleted file mode 100644 index 4c652c9ea1b8..000000000000 --- a/net/dhcpd/files/patch-pfutils.c +++ /dev/null @@ -1,34 +0,0 @@ ---- pfutils.c.orig 2024-02-29 18:24:10.373450000 +0000 -+++ pfutils.c 2024-02-29 18:35:27.247364000 +0000 -@@ -190,9 +190,15 @@ pf_kill_state(int fd, struct in_addr ip) - sizeof(psk.psk_src.addr.v.a.addr)); - memset(&psk.psk_src.addr.v.a.mask, 0xff, - sizeof(psk.psk_src.addr.v.a.mask)); -+#if (defined(__FreeBSD_version) && (__FreeBSD_version < 1500000)) - if (ioctl(fd, DIOCKILLSTATES, &psk) == -1) { - log_warn("DIOCKILLSTATES failed"); - } -+#else -+ if (ioctl(fd, DIOCKILLSTATESNV, &psk) == -1) { -+ log_warn("DIOCKILLSTATESNV failed"); -+ } -+#endif - - /* Kill all states to target */ - memset(&psk.psk_src, 0, sizeof(psk.psk_src)); -@@ -200,9 +206,15 @@ pf_kill_state(int fd, struct in_addr ip) - sizeof(psk.psk_dst.addr.v.a.addr)); - memset(&psk.psk_dst.addr.v.a.mask, 0xff, - sizeof(psk.psk_dst.addr.v.a.mask)); -+#if (defined(__FreeBSD_version) && (__FreeBSD_version < 1500000)) - if (ioctl(fd, DIOCKILLSTATES, &psk) == -1) { - log_warn("DIOCKILLSTATES failed"); - } -+#else -+ if (ioctl(fd, DIOCKILLSTATESNV, &psk) == -1) { -+ log_warn("DIOCKILLSTATESNV failed"); -+ } -+#endif - } - - /* inspired by ("stolen") from usr.bin/ssh/atomicio.c */ diff --git a/net/dhcpd/files/patch-tables.c b/net/dhcpd/files/patch-tables.c deleted file mode 100644 index 3195ef2f11db..000000000000 --- a/net/dhcpd/files/patch-tables.c +++ /dev/null @@ -1,11 +0,0 @@ ---- tables.c.orig 2023-11-20 14:12:38 UTC -+++ tables.c -@@ -184,7 +184,7 @@ struct option dhcp_options[256] = { - { "option-105", "X", &dhcp_universe, 105 }, - { "option-106", "X", &dhcp_universe, 106 }, - { "option-107", "X", &dhcp_universe, 107 }, -- { "option-108", "X", &dhcp_universe, 108 }, -+ { "ipv6-only-preferred", "L", &dhcp_universe, 108 }, - { "option-109", "X", &dhcp_universe, 109 }, - { "option-110", "X", &dhcp_universe, 110 }, - { "option-111", "X", &dhcp_universe, 111 },home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69a3c9a8.3a717.3967e725>