View | Details | Raw Unified | Return to bug 293480
Collapse All | Expand All

(-)b/net/dhcpd/Makefile (-2 / +1 lines)
Lines 1-6 Link Here
1
PORTNAME=	dhcpd
1
PORTNAME=	dhcpd
2
PORTVERSION=	6.6.20200413
2
PORTVERSION=	7.8.20260223
3
PORTREVISION=	3
4
CATEGORIES=	net
3
CATEGORIES=	net
5
4
6
MAINTAINER=	ports@FreeBSD.org
5
MAINTAINER=	ports@FreeBSD.org
(-)b/net/dhcpd/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1586798509
1
TIMESTAMP = 1772177580
2
SHA256 (koue-dhcpd-6.6.20200413_GH0.tar.gz) = 5e8286e6595477ad031e1a60d0a48d182b14050ea56c7929a707789223b63676
2
SHA256 (koue-dhcpd-7.8.20260223_GH0.tar.gz) = daa2a092c9d0795a44341b9b4a7a28669d7590e1aa41ce4cfad220bb0cf263ab
3
SIZE (koue-dhcpd-6.6.20200413_GH0.tar.gz) = 131419
3
SIZE (koue-dhcpd-7.8.20260223_GH0.tar.gz) = 135138
(-)a/net/dhcpd/files/patch-dhcp-options.5 (-13 lines)
Removed Link Here
1
--- dhcp-options.5.orig	2020-04-13 17:07:01 UTC
2
+++ dhcp-options.5
3
@@ -346,6 +346,10 @@ This option specifies whether the client should config
4
 for packet forwarding.
5
 A value of 0 means disable IP forwarding, and a value of 1 means enable
6
 IP forwarding.
7
+.It Ic option ipv6-only-preferred Ar uint32 ;
8
+The number of seconds for which an IPv6-only-capable client should disable
9
+DHCPv4.
10
+See RFC 8925 for details.
11
 .It Ic option irc-server Ar ip-address Oo , Ar ip-address ... Oc ;
12
 The
13
 .Ic irc-server
(-)a/net/dhcpd/files/patch-pfutils.c (-34 lines)
Removed Link Here
1
--- pfutils.c.orig	2024-02-29 18:24:10.373450000 +0000
2
+++ pfutils.c	2024-02-29 18:35:27.247364000 +0000
3
@@ -190,9 +190,15 @@ pf_kill_state(int fd, struct in_addr ip)
4
 	    sizeof(psk.psk_src.addr.v.a.addr));
5
 	memset(&psk.psk_src.addr.v.a.mask, 0xff,
6
 	    sizeof(psk.psk_src.addr.v.a.mask));
7
+#if (defined(__FreeBSD_version) && (__FreeBSD_version < 1500000))
8
 	if (ioctl(fd, DIOCKILLSTATES, &psk) == -1) {
9
 		log_warn("DIOCKILLSTATES failed");
10
 	}
11
+#else
12
+	if (ioctl(fd, DIOCKILLSTATESNV, &psk) == -1) {
13
+		log_warn("DIOCKILLSTATESNV failed");
14
+	}
15
+#endif
16
 
17
 	/* Kill all states to target */
18
 	memset(&psk.psk_src, 0, sizeof(psk.psk_src));
19
@@ -200,9 +206,15 @@ pf_kill_state(int fd, struct in_addr ip)
20
 	    sizeof(psk.psk_dst.addr.v.a.addr));
21
 	memset(&psk.psk_dst.addr.v.a.mask, 0xff,
22
 	    sizeof(psk.psk_dst.addr.v.a.mask));
23
+#if (defined(__FreeBSD_version) && (__FreeBSD_version < 1500000))
24
 	if (ioctl(fd, DIOCKILLSTATES, &psk) == -1) {
25
 		log_warn("DIOCKILLSTATES failed");
26
 	}
27
+#else
28
+	if (ioctl(fd, DIOCKILLSTATESNV, &psk) == -1) {
29
+		log_warn("DIOCKILLSTATESNV failed");
30
+	}
31
+#endif
32
 }
33
 
34
 /* inspired by ("stolen") from usr.bin/ssh/atomicio.c */
(-)a/net/dhcpd/files/patch-tables.c (-11 lines)
Removed Link Here
1
--- tables.c.orig	2023-11-20 14:12:38 UTC
2
+++ tables.c
3
@@ -184,7 +184,7 @@ struct option dhcp_options[256] = {
4
 	{ "option-105", "X",				&dhcp_universe, 105 },
5
 	{ "option-106", "X",				&dhcp_universe, 106 },
6
 	{ "option-107", "X",				&dhcp_universe, 107 },
7
-	{ "option-108", "X",				&dhcp_universe, 108 },
8
+	{ "ipv6-only-preferred", "L",			&dhcp_universe, 108 },
9
 	{ "option-109", "X",				&dhcp_universe, 109 },
10
 	{ "option-110", "X",				&dhcp_universe, 110 },
11
 	{ "option-111", "X",				&dhcp_universe, 111 },

Return to bug 293480