From owner-svn-ports-all@freebsd.org Sat Nov 16 19:59:52 2019 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 666E81AD0A2; Sat, 16 Nov 2019 19:59:52 +0000 (UTC) (envelope-from osa@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) server-signature RSA-PSS (4096 bits) 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 47FmK41w84z4Hm6; Sat, 16 Nov 2019 19:59:52 +0000 (UTC) (envelope-from osa@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 1962169C6; Sat, 16 Nov 2019 19:59:52 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAGJxpiu095383; Sat, 16 Nov 2019 19:59:51 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAGJxpWf095382; Sat, 16 Nov 2019 19:59:51 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201911161959.xAGJxpWf095382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Sat, 16 Nov 2019 19:59:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517774 - in head/www/nginx-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/www/nginx-devel: . files X-SVN-Commit-Revision: 517774 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.29 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: Sat, 16 Nov 2019 19:59:52 -0000 Author: osa Date: Sat Nov 16 19:59:51 2019 New Revision: 517774 URL: https://svnweb.freebsd.org/changeset/ports/517774 Log: Add support for FreeBSD accept filters. Bump PORTREVISION. PR: 238739 Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/files/nginx.in Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sat Nov 16 19:45:08 2019 (r517773) +++ head/www/nginx-devel/Makefile Sat Nov 16 19:59:51 2019 (r517774) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.17.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/files/nginx.in ============================================================================== --- head/www/nginx-devel/files/nginx.in Sat Nov 16 19:45:08 2019 (r517773) +++ head/www/nginx-devel/files/nginx.in Sat Nov 16 19:59:51 2019 (r517774) @@ -21,6 +21,9 @@ # Extra flags passed to start command. # nginxlimits_args (str): Default to "-e -U %%WWWOWN%%" # Arguments of pre-start limits run. +# nginx_http_accept_enable (bool): Set to "NO" by default. +# Set to yes to check for accf_http kernel module +# on start-up and load if not loaded. . /etc/rc.subr @@ -44,6 +47,7 @@ extra_commands="reload configtest upgrade gracefulstop [ -z "$nginx_enable" ] && nginx_enable="NO" [ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" [ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" +[ -z "$nginx_http_accept_enable" ] && nginx_http_accept_enable="NO" load_rc_config $name @@ -123,6 +127,11 @@ nginx_upgrade() nginx_precmd() { + if checkyesno nginx_http_accept_enable + then + required_modules="$required_modules accf_http accf_data" + fi + nginx_checkconfig if checkyesno nginxlimits_enable