From nobody Fri Nov 24 19:38:50 2023 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 4ScQJp2hgmz51m5d; Fri, 24 Nov 2023 19:38:50 +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 4ScQJp1hdGz3WDV; Fri, 24 Nov 2023 19:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700854730; 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=psJFSOTkWBKDJyFgjuiUJqbS1JLVbzNJduytCE1wWoc=; b=fawFueWnwf5iAIoi1LFKiEGa52o5cg+7wagOddS5yxeCvKUn9NcKxY+HfwdcMunbA00Sty FG9C6qDzhJwmJL7NAbX3y4UKE0wI/2q/YVgAxw+CQYiAJSWlFkcso8157qt562XCIUJZsV /35agEyMvin7PWx4hNZ+1gs8TSNOllPtwKIq3RLY6+quoHJ6PUbMUxCT3hy2yLtN3Lg9Vg lZyf7m7dlMbjKoOCpkzwkD4KqKt/nA6x8GSyYzIQCPqdbmzVbf9xN62ZjEQtVz1zlIYNeb WO5+iRng+yZjTL0naY8AdlOYWtUkX5GopcylxqGYJkeUBFUC6vyFR+KiajlvbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700854730; 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=psJFSOTkWBKDJyFgjuiUJqbS1JLVbzNJduytCE1wWoc=; b=OOAcPNGltQu2U/KXEWVljogwErl10KLJCFvQPecWKB7YPdJRW62OLWzdGJhKDi0IRmUOk0 ydvKiVeV2vKPe9k9CAKW/G7IV+iGVXsFokJC9C5HxH3PaI8RIkHfveDMoibFnXKU6OPaEw eIPOFWUHj1hlTg4p7hUnQdY+xIDLGyXm5ZvAz69yIkjDyGFP4LIWKN8Q3CSnBtY0yQA8Q3 sqQcUe/w2GGXChcDQ+hUOD2JFVG8Hvw8U9Y1OXcvPoM91OI59KD/ttCUy+SNHLJWZOjHu9 T/O+dhc5EF1lSJV3DWMVCCuBaOrMUtVfwrqbJOjyyLh4gJuN2+n5WMbhxSC4HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700854730; a=rsa-sha256; cv=none; b=WZQ6ClKvjb0XOvk9JyVV3Jbgx9fh4+JbvtTjlaN+AptMNu6ueWAMmFhSAb9BKwxTUcY65l w1Se8AipaAGhNeIj66eAebINuSmrqClE7tR4hLvwbZNyRyEp9EtWluybMN/OBfgN/ndxc3 jnVM29s0EpaijJ3eHIh52o0mtC4YPJq7l/1AFlX+V8IoWLpl/M0isI6b9GJT7G7a2n1zEU YC5yBNavO8154gHFnY4C83iFXFAo1PNASTuqFLuwaKm0UbxF7UPd6oSWGaDhfx3Dw/udOf stniTHlasMCcsoJzMlBzJRM9JtWFl602go7V1W5gnnquFrM07WmUe9pmhWJuEw== 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 4ScQJp0lDBzxSv; Fri, 24 Nov 2023 19:38:50 +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 3AOJco0j069737; Fri, 24 Nov 2023 19:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AOJcohJ069734; Fri, 24 Nov 2023 19:38:50 GMT (envelope-from git) Date: Fri, 24 Nov 2023 19:38:50 GMT Message-Id: <202311241938.3AOJcohJ069734@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 6cf595b31f7a - main - net/dhcpd: Add ipv6-only-preferred option per RFC 8925 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cf595b31f7a2447d1a8c82fb9a88838ffca40a7 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=6cf595b31f7a2447d1a8c82fb9a88838ffca40a7 commit 6cf595b31f7a2447d1a8c82fb9a88838ffca40a7 Author: Mallory AuthorDate: 2023-11-24 08:25:21 +0000 Commit: Fernando Apesteguía CommitDate: 2023-11-24 19:38:21 +0000 net/dhcpd: Add ipv6-only-preferred option per RFC 8925 While here, pet linters. PR: 275217 Reported by: mallorya@fastmail.com Approved by: koue@chaosophia.net (maintainer) --- net/dhcpd/Makefile | 13 +++++-------- net/dhcpd/files/patch-dhcp-options.5 | 13 +++++++++++++ net/dhcpd/files/patch-tables.c | 11 +++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/net/dhcpd/Makefile b/net/dhcpd/Makefile index 52798760d878..afb1b64f6db3 100644 --- a/net/dhcpd/Makefile +++ b/net/dhcpd/Makefile @@ -10,25 +10,22 @@ LICENSE= BSD3CLAUSE USES= ssl uidfix -WRKSRC_SUBDIR= src/usr.sbin/${PORTNAME} - USE_GITHUB= yes GH_ACCOUNT= koue - -CONFLICTS= isc-dhcp4[1-3]-server* - USE_RC_SUBR= dhcpd +MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man + CFLAGS+= -Wall -MAKE_ARGS+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man +CONFLICTS= isc-dhcp4[1-3]-server* +WRKSRC_SUBDIR= src/usr.sbin/${PORTNAME} OPTIONS_DEFINE= NOPF +OPTIONS_SUB= yes NOPF_DESC= Disable PF support -OPTIONS_SUB= yes - NOPF_CFLAGS= -DNO_PF=1 post-patch: diff --git a/net/dhcpd/files/patch-dhcp-options.5 b/net/dhcpd/files/patch-dhcp-options.5 new file mode 100644 index 000000000000..03ca38af4016 --- /dev/null +++ b/net/dhcpd/files/patch-dhcp-options.5 @@ -0,0 +1,13 @@ +--- 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-tables.c b/net/dhcpd/files/patch-tables.c new file mode 100644 index 000000000000..3195ef2f11db --- /dev/null +++ b/net/dhcpd/files/patch-tables.c @@ -0,0 +1,11 @@ +--- 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 },