From owner-svn-ports-all@freebsd.org Fri Mar 13 17:47:45 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 559B6265E87; Fri, 13 Mar 2020 17:47:45 +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 48fCp908y5z3wtm; Fri, 13 Mar 2020 17:47:44 +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 B16629D1B; Fri, 13 Mar 2020 17:47:44 +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 02DHliF5057235; Fri, 13 Mar 2020 17:47:44 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DHlhGJ057232; Fri, 13 Mar 2020 17:47:43 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202003131747.02DHlhGJ057232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 13 Mar 2020 17:47:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528367 - head/www/nginx X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/www/nginx X-SVN-Commit-Revision: 528367 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: Fri, 13 Mar 2020 17:47:45 -0000 Author: joneum Date: Fri Mar 13 17:47:43 2020 New Revision: 528367 URL: https://svnweb.freebsd.org/changeset/ports/528367 Log: Update 3rd party Modul njs and add do-install Sponsored by: Netzkommune GmbH Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/distinfo head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Mar 13 17:18:40 2020 (r528366) +++ head/www/nginx/Makefile Fri Mar 13 17:47:43 2020 (r528367) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.16.1 -PORTREVISION?= 11 +PORTREVISION?= 12 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -168,7 +168,6 @@ HTTP_REWRITE_CONFIGURE_OFF= --without-http_rewrite_mod HTTP_SECURE_LINK_CONFIGURE_ON= --with-http_secure_link_module HTTP_SLICE_CONFIGURE_ON= --with-http_slice_module HTTP_SSL_CONFIGURE_ON= --with-http_ssl_module -HTTP_SSL_USE= openssl_rpath HTTP_SSL_USES= ssl HTTP_STATUS_CONFIGURE_ON= --with-http_stub_status_module HTTP_SUB_CONFIGURE_ON= --with-http_sub_module @@ -364,6 +363,9 @@ do-install-NAXSI-on: ${INSTALL_DATA} \ ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_config/naxsi_core.rules \ ${STAGEDIR}${ETCDIR} + +do-install-NJS-on: + ${INSTALL_PROGRAM} ${WRKSRC_njs}/build/njs ${STAGEDIR}${PREFIX}/sbin post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Fri Mar 13 17:18:40 2020 (r528366) +++ head/www/nginx/Makefile.extmod Fri Mar 13 17:47:43 2020 (r528367) @@ -246,7 +246,7 @@ NAXSI_NGINX_VER= 0.56 NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src -NJS_GH_TUPLE= nginx:njs:19ff812:njs +NJS_GH_TUPLE= nginx:njs:3c63fb0:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx PASSENGER_NGINX_VER= 6.0.4 Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Fri Mar 13 17:18:40 2020 (r528366) +++ head/www/nginx/distinfo Fri Mar 13 17:47:43 2020 (r528367) @@ -1,4 +1,4 @@ -TIMESTAMP = 1579717532 +TIMESTAMP = 1584099003 SHA256 (nginx-1.16.1.tar.gz) = f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b SIZE (nginx-1.16.1.tar.gz) = 1032630 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -115,8 +115,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz SIZE (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = 31920 SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120 -SHA256 (nginx-njs-19ff812_GH0.tar.gz) = f84dc6d2b1668f6841f0591f6741c2553f043f7fca38a9eb24550419249f8985 -SIZE (nginx-njs-19ff812_GH0.tar.gz) = 398411 +SHA256 (nginx-njs-3c63fb0_GH0.tar.gz) = 3475c177341f86d9a696df44c6bcc8dad0276764f34bcb7a27a8a2fde1a9a939 +SIZE (nginx-njs-3c63fb0_GH0.tar.gz) = 412586 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9 SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742 SHA256 (openresty-rds-csv-nginx-module-v0.08_GH0.tar.gz) = 26e80646cc4ad87984c60dab584e8f32faf5dbebb4c6911784339822f4675c79 Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Fri Mar 13 17:18:40 2020 (r528366) +++ head/www/nginx/pkg-plist Fri Mar 13 17:47:43 2020 (r528367) @@ -65,6 +65,7 @@ %%WWW%%www/nginx-dist/50x.html %%WWW%%@postexec chmod a-w %D/www/nginx-dist %%WWW%%@postunexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi +%%NJS%%sbin/njs sbin/nginx share/vim/vimfiles/ftdetect/nginx.vim share/vim/vimfiles/ftplugin/nginx.vim