From owner-dev-commits-src-branches@freebsd.org Tue Apr 20 21:34:19 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 90EFE5E9E19; Tue, 20 Apr 2021 21:34:19 +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 4FPxlb3j82z3m4k; Tue, 20 Apr 2021 21:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6E0231A1DE; Tue, 20 Apr 2021 21:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KLYJRM097437; Tue, 20 Apr 2021 21:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KLYJZf097436; Tue, 20 Apr 2021 21:34:19 GMT (envelope-from git) Date: Tue, 20 Apr 2021 21:34:19 GMT Message-Id: <202104202134.13KLYJZf097436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 14fffd43061a - stable/13 - Remove reference to the pfctlinput2() from domain(9) after 237c1f932b. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14fffd43061a65239303db1e0d14dd2cf858e02d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 21:34:19 -0000 The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=14fffd43061a65239303db1e0d14dd2cf858e02d commit 14fffd43061a65239303db1e0d14dd2cf858e02d Author: Dmitry Chagin AuthorDate: 2021-04-13 21:40:20 +0000 Commit: Dmitry Chagin CommitDate: 2021-04-20 21:33:43 +0000 Remove reference to the pfctlinput2() from domain(9) after 237c1f932b. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D29751 (cherry picked from commit 86887853c39b0803009579e2b927bd67d524af63) --- ObsoleteFiles.inc | 3 +++ share/man/man9/Makefile | 1 - share/man/man9/domain.9 | 27 +-------------------------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4fd7275fb8fa..761d5f61dadd 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -36,6 +36,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20210413: Remove pfctlinput2 +OLD_FILES+=usr/share/man/man9/pfctlinput2.9.gz + # 20210329: Remove kernel-only crypto headers from /usr/include OLD_FILES+=usr/include/crypto/_cryptodev.h OLD_FILES+=usr/include/crypto/cbc_mac.h diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index edb87de6a35f..d2c3e77fc60f 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1010,7 +1010,6 @@ MLINKS+=dnv.9 dnvlist.9 \ MLINKS+=domain.9 DOMAIN_SET.9 \ domain.9 domain_add.9 \ domain.9 pfctlinput.9 \ - domain.9 pfctlinput2.9 \ domain.9 pffinddomain.9 \ domain.9 pffindproto.9 \ domain.9 pffindtype.9 diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index d8dca08c8dab..e8f97253a1d4 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -26,13 +26,12 @@ .\" .\" $FreeBSD$ .\" -.Dd April 29, 2020 +.Dd April 13, 2021 .Dt DOMAIN 9 .Os .Sh NAME .Nm domain_add , .Nm pfctlinput , -.Nm pfctlinput2 , .Nm pffinddomain , .Nm pffindproto , .Nm pffindtype , @@ -47,8 +46,6 @@ .Fn domain_add "void *data" .Ft void .Fn pfctlinput "int cmd" "struct sockaddr *sa" -.Ft void -.Fn pfctlinput2 "int cmd" "struct sockaddr *sa" "void *ctlparam" .Ft struct domain * .Fn pffinddomain "int family" .Ft struct protosw * @@ -130,27 +127,6 @@ calls the protocol specific .Fn pr_ctlinput function for each protocol in that has defined one, in every domain. .Pp -.Fn pfctlinput2 -provides that same functionality of -.Fn pfctlinput , -but with a few additional checks and a new -.Vt "void *" -argument that is passed directly to the protocol's -.Fn pr_ctlinput -function. -Unlike -.Fn pfctlinput , -.Fn pfctlinput2 -verifies that -.Fa sa -is not -.Dv NULL , -and that only the protocol families that are the same as -.Fa sa -have their -.Fn pr_ctlinput -function called. -.Pp .Fn domain_add adds a new protocol domain to the system. The argument @@ -240,7 +216,6 @@ types if the domain has a default raw protocol. The functions .Fn domain_add , .Fn pfctlinput , -.Fn pfctlinput2 , .Fn pffinddomain , .Fn pffindproto , .Fn pffindtype