From owner-svn-ports-all@freebsd.org Wed Nov 6 11:13:23 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 83A2B1B2E2A; Wed, 6 Nov 2019 11:13:23 +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 477P6C30cqz3yGW; Wed, 6 Nov 2019 11:13:23 +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 3188924323; Wed, 6 Nov 2019 11:13:23 +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 xA6BDNT4030081; Wed, 6 Nov 2019 11:13:23 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA6BDMEq030078; Wed, 6 Nov 2019 11:13:22 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201911061113.xA6BDMEq030078@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 6 Nov 2019 11:13:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516875 - head/www/nginx-devel X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: head/www/nginx-devel X-SVN-Commit-Revision: 516875 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: Wed, 06 Nov 2019 11:13:23 -0000 Author: osa Date: Wed Nov 6 11:13:22 2019 New Revision: 516875 URL: https://svnweb.freebsd.org/changeset/ports/516875 Log: Fix the issue with third-aprty modsecurity2 module, it is not being built into after selection. An additional useful file is installed now. Bump PORTREVISION. Submitted by: Felipe Zipitria (in a private mail) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/pkg-plist Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Wed Nov 6 11:01:46 2019 (r516874) +++ head/www/nginx-devel/Makefile Wed Nov 6 11:13:22 2019 (r516875) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.17.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -344,6 +345,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-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Wed Nov 6 11:01:46 2019 (r516874) +++ head/www/nginx-devel/Makefile.extmod Wed Nov 6 11:13:22 2019 (r516875) @@ -222,6 +222,7 @@ MODSECURITY_MASTER_SITES= https://www.modsecurity.org/ 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:ecb255a:modsec Modified: head/www/nginx-devel/pkg-plist ============================================================================== --- head/www/nginx-devel/pkg-plist Wed Nov 6 11:01:46 2019 (r516874) +++ head/www/nginx-devel/pkg-plist Wed Nov 6 11:13:22 2019 (r516875) @@ -5,6 +5,7 @@ %%NAXSI%%%%ETCDIR%%/naxsi_core.rules @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params +%%MODSECURITY%%%%ETCDIR%%/unicode.mapping %%ETCDIR%%/win-utf @sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types @sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf