From owner-svn-ports-all@freebsd.org Wed Aug 26 13:32:36 2020 Return-Path: Delivered-To: svn-ports-all@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 3B1F63D51C5; Wed, 26 Aug 2020 13:32:36 +0000 (UTC) (envelope-from mat@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bc6H76GCbz41cZ; Wed, 26 Aug 2020 13:32:33 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B07813F8D; Wed, 26 Aug 2020 13:32:33 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07QDWXRT053341; Wed, 26 Aug 2020 13:32:33 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07QDWWZe053339; Wed, 26 Aug 2020 13:32:32 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202008261332.07QDWWZe053339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 26 Aug 2020 13:32:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546284 - in head/dns/bind911: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/dns/bind911: . files X-SVN-Commit-Revision: 546284 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2020 13:32:36 -0000 Author: mat Date: Wed Aug 26 13:32:32 2020 New Revision: 546284 URL: https://svnweb.freebsd.org/changeset/ports/546284 Log: Add an option to use the DNS accept filter if available. PR: 241613 Submitted by: eugen Added: head/dns/bind911/files/extrapatch-interfacemgr.c (contents, props changed) Modified: head/dns/bind911/Makefile (contents, props changed) Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Wed Aug 26 13:32:28 2020 (r546283) +++ head/dns/bind911/Makefile Wed Aug 26 13:32:32 2020 (r546284) @@ -55,7 +55,7 @@ PORTDOCS= * OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \ DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN \ FILTER_AAAA DNSTAP -OPTIONS_DEFINE= IDN LARGE_FILE JSON GEOIP \ +OPTIONS_DEFINE= ACCFDNS IDN LARGE_FILE JSON GEOIP \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \ RPZ_NSIP RPZ_NSDNAME DOCS \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ @@ -72,6 +72,7 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSA OPTIONS_SUB= yes +ACCFDNS_DESC= Prefer DNS accept filter over generic one CRYPTO_DESC= Choose which crypto engine to use DLZ_BDB_DESC= DLZ BDB driver DLZ_DESC= Dynamically Loadable Zones @@ -101,6 +102,8 @@ START_LATE_DESC= Start BIND late in the boot process ( TCP_FASTOPEN_DESC= RFC 7413 support TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) +ACCFDNS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-interfacemgr.c + DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb Added: head/dns/bind911/files/extrapatch-interfacemgr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/bind911/files/extrapatch-interfacemgr.c Wed Aug 26 13:32:32 2020 (r546284) @@ -0,0 +1,14 @@ +Use accf_dns's kernel module if available. + +--- bin/named/interfacemgr.c.orig 2020-08-06 10:05:20 UTC ++++ bin/named/interfacemgr.c +@@ -521,7 +521,8 @@ ns_interface_accepttcp(ns_interface_t *ifp) { + * If/when there a multiple filters listen to the + * result. + */ +- (void)isc_socket_filter(ifp->tcpsocket, "dataready"); ++ if (isc_socket_filter(ifp->tcpsocket, "dnsready") != ISC_R_SUCCESS) ++ (void)isc_socket_filter(ifp->tcpsocket, "dataready"); + + result = ns_clientmgr_createclients(ifp->clientmgr, 1, ifp, true); + if (result != ISC_R_SUCCESS) {