From owner-svn-ports-head@freebsd.org Thu Nov 14 14:55:16 2019 Return-Path: Delivered-To: svn-ports-head@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 E7A6C1AA40E; Thu, 14 Nov 2019 14:55:16 +0000 (UTC) (envelope-from joneum@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 47DPfX5gZpz4FYV; Thu, 14 Nov 2019 14:55:16 +0000 (UTC) (envelope-from joneum@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 A010A1FEB; Thu, 14 Nov 2019 14:55:16 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAEEtGug095633; Thu, 14 Nov 2019 14:55:16 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAEEtGTi095630; Thu, 14 Nov 2019 14:55:16 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201911141455.xAEEtGTi095630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 14 Nov 2019 14:55:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517568 - head/www/nginx X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/www/nginx X-SVN-Commit-Revision: 517568 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2019 14:55:17 -0000 Author: joneum Date: Thu Nov 14 14:55:15 2019 New Revision: 517568 URL: https://svnweb.freebsd.org/changeset/ports/517568 Log: Fix the issue with third-aprty modsecurity2 module, it is not being built into after selection. An additional useful file is installed now. Submitted by: Felipe Zipitria (in a private mail) Sponsored by: Netzkommune GmbH Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Thu Nov 14 14:28:58 2019 (r517567) +++ head/www/nginx/Makefile Thu Nov 14 14:55:15 2019 (r517568) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.16.1 -PORTREVISION?= 4 +PORTREVISION?= 5 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -350,6 +350,11 @@ do-install-DSO-on: do-install-FASTDFS-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs ${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample + +do-install-MODSECURITY-on: + ${INSTALL_DATA} \ + ${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/unicode.mapping \ + ${STAGEDIR}${ETCDIR} do-install-NAXSI-on: ${INSTALL_DATA} \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Thu Nov 14 14:28:58 2019 (r517567) +++ head/www/nginx/Makefile.extmod Thu Nov 14 14:55:15 2019 (r517568) @@ -224,6 +224,7 @@ MODSECURITY_MASTER_SITES= http://www.modsecurity.org/t MODSECURITY_DISTFILES= modsecurity-${MODSECURITY_VERSION}.tar.gz:modsecurity MODSECURITY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure MODSECURITY_VARS= WRKSRC_modsecurity=${WRKDIR}/modsecurity-${MODSECURITY_VERSION} +MODSECURITY_CONFIGURE_ON= --add-module=${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/nginx/modsecurity MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:71ede63:modsec Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Thu Nov 14 14:28:58 2019 (r517567) +++ head/www/nginx/pkg-plist Thu Nov 14 14:55:15 2019 (r517568) @@ -3,6 +3,7 @@ %%ETCDIR%%/koi-utf %%ETCDIR%%/koi-win %%NAXSI%%%%ETCDIR%%/naxsi_core.rules +%%MODSECURITY%%%%ETCDIR%%/unicode.mapping @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params %%ETCDIR%%/win-utf