From nobody Sun May 05 16:25:28 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VXVJT2kVKz5KFPq; Sun, 05 May 2024 16:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VXVJT0Q83z43hZ; Sun, 5 May 2024 16:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714926329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oaB9dbBhuFzcVdVv7fiyvx8pN+N5XwZiYoM7cph63U=; b=iKv6peEoMuJRKWxF+MWi9fOut2ham5do05vRa1//sGQXiAWb/hP+FhREA7xmegGsLDvoo7 7pHWiW3lSTk6sxBZm/p2KSUWCPhl8GU1tYUauvr1qu7LUvmd6KsJ5EV1pJmfF+L2/O+nu1 IX8VY3YHr8YnwgRAB42ns3ee4h0fdTM+yPgir2LlyJ3tFDYfrplLEn9fNeGLprM+nyLs6t QIqOUugGeZX+fw9R3lt6sB3xPDHj11ay1VG8GTJ79OfAoEprodzS+M4qUSgriUYnyrrQrm ERfa0+SSfX2iAsuvr7Zf1gZyqvbT88TSWfRmb+V+CK/soHppK7PN+XtQSWqdLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714926329; a=rsa-sha256; cv=none; b=VXWmvSdH8D1ZRILAgfCMGYVZzFFEgqssU1A0gQfSoS6ftpsqFjt+4S6+P5cIZM+tnf2Ybu 8tMi8jeRvmK9OUctj6ibTZAeCyTlAKqXJ3QUAGCmcZVsjvGfoVM4IejKORk6l7WPSUAxdL 7wOPgKMABJIpnqg9YedWSJKTZIyBZBCtmQj9F4ULnI/nBk77sPkjh/MXa+7tECljpYdsxk 3iFctjM/aQ9kHh284mbcJOnQt/zm9rbpzmjGQSVSuCQkfMWHKWo84+xhVn8QGI54NUerxO DLro9tJXMWhN1bEAnH0VSV5+Ua4NjchKOgXjcb3+A8VJupwIBcwx5IJOrIT71g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714926329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oaB9dbBhuFzcVdVv7fiyvx8pN+N5XwZiYoM7cph63U=; b=F7Z4P3CMlklv11hBzTKQSiGWlFKZN1kvl14+UrphNiFtQ47EMsa6JB+mX8rWdxHSgWj8H1 kFkA4m+K8mlrWawwuJlom++gtntsCIXL282b/eaaJhWalplQ11M/isdgDNp0xZb/kSy7Bc 98Mco4iDSPHg3q7pc7kWo7v5aCXVlpxcu49S6kaQBfuGkr3yeLXD5TTSP1Dt+CqVRey7+w iIjXCfHCohTnQJP9TaPCPlHiCduHAIMEXl1I4FGWuVuPvocHWjkDNy0jzVeBI/52dpxCiw 8XL0sjuwWJXAaj96i60A/Kjao5xcAkUYt/4plDHeRmtKbLaQvW3EYI6P0zzOdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VXVJT01x9zLJg; Sun, 5 May 2024 16:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 445GPS4O097605; Sun, 5 May 2024 16:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 445GPS4c097601; Sun, 5 May 2024 16:25:28 GMT (envelope-from git) Date: Sun, 5 May 2024 16:25:28 GMT Message-Id: <202405051625.445GPS4c097601@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tilman Keskinoz Subject: git: ad291cdd00b7 - main - net/dhcpd: fix build on 15-CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arved X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad291cdd00b7e7c6db2fce4e71811e4e83a3b5bc Auto-Submitted: auto-generated The branch main has been updated by arved: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad291cdd00b7e7c6db2fce4e71811e4e83a3b5bc commit ad291cdd00b7e7c6db2fce4e71811e4e83a3b5bc Author: Tilman Keskinoz AuthorDate: 2024-05-05 16:23:43 +0000 Commit: Tilman Keskinoz 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 */