git: ad291cdd00b7 - main - net/dhcpd: fix build on 15-CURRENT

The branch main has been updated by arved:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ad291cdd00b7e7c6db2fce4e71811e4e83a3b5bc

commit ad291cdd00b7e7c6db2fce4e71811e4e83a3b5bc
Author:     Tilman Keskinoz <arved@FreeBSD.org>
AuthorDate: 2024-05-05 16:23:43 +0000
Commit:     Tilman Keskinoz <arved@FreeBSD.org>
CommitDate: 2024-05-05 16:25:12 +0000

    net/dhcpd: fix build on 15-CURRENT
    
    PR:             275313
    Reported by:    Mallorya@fastmail.com
    Submitted by:   maintainer
---
 net/dhcpd/Makefile              |  2 +-
 net/dhcpd/files/patch-pfutils.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/net/dhcpd/Makefile b/net/dhcpd/Makefile
index 98a562f5ddbd..d11faa7e7793 100644
--- a/net/dhcpd/Makefile
+++ b/net/dhcpd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dhcpd
 PORTVERSION=	6.6.20200413
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	koue@chaosophia.net
diff --git a/net/dhcpd/files/patch-pfutils.c b/net/dhcpd/files/patch-pfutils.c
new file mode 100644
index 000000000000..4c652c9ea1b8
--- /dev/null
+++ b/net/dhcpd/files/patch-pfutils.c
@@ -0,0 +1,34 @@
+--- 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 */