Attachment 248829 Details for Bug 275313 – dhcpd patch

[patch] dhcpd patch

dhcpd-patch.txt (text/plain), 1.67 KB, created by Nikola Kolev on 2024-02-29 18:47:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Kolev

Created: 2024-02-29 18:47:34 UTC

Size: 1.67 KB

patch

obsolete

>diff -rupN dhcpd.orig/Makefile dhcpd/Makefile
>--- dhcpd.orig/Makefile	2024-02-29 18:21:21.022752000 +0000
>+++ dhcpd/Makefile	2024-02-29 18:42:42.929635000 +0000
>@@ -1,5 +1,6 @@
> PORTNAME=	dhcpd
> PORTVERSION=	6.6.20200413
>+PORTREVISION=	1
> CATEGORIES=	net
> 
> MAINTAINER=	koue@chaosophia.net
>diff -rupN dhcpd.orig/files/patch-pfutils.c dhcpd/files/patch-pfutils.c
>--- dhcpd.orig/files/patch-pfutils.c	1970-01-01 00:00:00.000000000 +0000
>+++ dhcpd/files/patch-pfutils.c	2024-02-29 18:35:54.742545000 +0000
>@@ -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 */

Flags:

koue: maintainer-approval+

Actions: View | Diff

Attachments on bug 275313: 248829