From nobody Fri Apr 19 23:11:42 2024 X-Original-To: dev-commits-src-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 4VLr4Z3xJ2z5Hwmr; Fri, 19 Apr 2024 23:11:42 +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 4VLr4Z2V9kz4RZ0; Fri, 19 Apr 2024 23:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568302; 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=kttYfDUsPkczV5jmdXgc1E9eGjpZWaociR3kLVY64lQ=; b=tMB1WJKxsZ7o1l8BMmv4exf3s6SRMj0Wpq1ZMD5p4+r/hXs1lk098mulXhhXvuPJyuAdQw 6DRwVcq+3Kipy15bXuALO5Hq/lr36ciIWPm5xfFmgcD/koi1Ftx86L7oWNa3mTboxB2nmR egP14HkvBpkMcnoOeui29xMPYnURMqXqL5EjkY691fz/mR4bTPYyxbjm2oA+TEKPKTs73W wBuiCyG/mfQMvR4cXQ3hwZMvNAGN1vRhQqY2E/H5D0G/MQrZQGA3KQjPprdgMwRoWQHtS2 fQXB+dhCHBi0li7vMFqiM8ig/9s5bL783qTRgnsIKv/H039cXEj0QiUoAx2rmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713568302; a=rsa-sha256; cv=none; b=xxMuDoSBcfUlo0pVM7G1OgiCbK+fIKb+tSLISfTkAIdiCy//zIcIK02O1vE44I9cQ1t20q /YcvzuXnWIsz1ktf2o4DgJ5ZrZ1b5M+/p1kN1n9J2Tr6/ooy8DnMGKim5PHUY5CMxeR8US rB8NgpMBPsRB0eFECuV6hmwjRt3jIG6/0GUgpQ7Ak+B+EXX8GoOiLSCz3AWXhEi5MYzGN6 WXw/uIShAAKOMed2sh7F+nUjzR+uP5Oj4IKOThJASA0Lj3VdSBjIoFy3SDsnJwQ0117sJo 8xhXG+1j4ptCy0flnq9hcrVTnWmQWEILkKAr8lctfCcwQ7QUShym2qnIRkOhfw== 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=1713568302; 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=kttYfDUsPkczV5jmdXgc1E9eGjpZWaociR3kLVY64lQ=; b=v1+HtNRxBbm2n9jMd9kcdqyvmTqf5jfyU2zzvH3EUN+QdIiN863pZ3GprJdHT7QfQYCu/k vecHBcCunjli6OxWrxddk630X9IHbkVVSVyHJqHNhN7InBoddgVTKAbk30mdleUuMTcOKQ 6/UWPcBod/lLebe7bdCiuxz+kxbqb0BnuT6ZSyzdz1OyRHRpJbs6Tibb9VowMmKyeor7pq n6FcYEp0zgUUD4Dogfc8yGjDEhjiRHXCXuWLIUQkkbyf+11PZLHaajksYpS7ZwUy+5/T6Q Qkt/ZoZKnHfd/5RLY6DoQUB01PV+vwZvlFHJ0FtJ0sdDHT1+7+VV/j7J2m2rRA== 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 4VLr4Z26Gxz1CFF; Fri, 19 Apr 2024 23:11:42 +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 43JNBgOu059622; Fri, 19 Apr 2024 23:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JNBgeG059619; Fri, 19 Apr 2024 23:11:42 GMT (envelope-from git) Date: Fri, 19 Apr 2024 23:11:42 GMT Message-Id: <202404192311.43JNBgeG059619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 42acb16bb86f - main - rescue: add ipfw, pfctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42acb16bb86fe6ec18c0591f9a9a3dbad1719d1d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=42acb16bb86fe6ec18c0591f9a9a3dbad1719d1d commit 42acb16bb86fe6ec18c0591f9a9a3dbad1719d1d Author: Lexi Winter AuthorDate: 2024-04-19 22:53:23 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:54:31 +0000 rescue: add ipfw, pfctl Rationale for this change: - ipf is already there - if the kernel is configured with a packet filter which drops packets by default, pfctl or ipfw will be required in the rescue environment to make the network functional. - rescue's stated purpose is to be useful for small/embedded systems (and is also quite useful for small jails); a rescue-based router would want these binaries. On amd64, this increases the size of rescue from 17346200 to 17907248, or 561048 bytes (3.2%). Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1169 --- rescue/rescue/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index c1ba22885618..6dceea6f5077 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -119,6 +119,15 @@ CRUNCH_PROGS_sbin+= ipf CRUNCH_LIBS_ipf+= ${LIBIPF} .endif +.if ${MK_IPFW} != "no" +CRUNCH_PROGS_sbin+= ipfw +.endif + +.if ${MK_PF} != "no" +CRUNCH_PROGS_sbin+= pfctl +CRUNCH_LIBS_pfctl+= ${LIBPFCTL} ${LIBNV} +.endif + .if ${MK_ROUTED} != "no" CRUNCH_PROGS_sbin+= routed rtquery .endif