Date: Tue, 3 Mar 2020 15:05:06 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527678 - in head/www/nginx-devel: . files Message-ID: <202003031505.023F56Y8034254@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Mar 3 15:05:06 2020 New Revision: 527678 URL: https://svnweb.freebsd.org/changeset/ports/527678 Log: Update NGINX JavaScript (aka njs) module from 0.3.8 to 0.3.9. To avoid a potential conflict between two versions of LuaJIT let's update mod_security's dependecy list and use lang/luajit-openresty instead of original lang/luajit. Bump PORTREVISION. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Mar 3 15:01:01 2020 (r527677) +++ head/www/nginx-devel/Makefile Tue Mar 3 15:05:06 2020 (r527678) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.17.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Mar 3 15:01:01 2020 (r527677) +++ head/www/nginx-devel/Makefile.extmod Tue Mar 3 15:05:06 2020 (r527678) @@ -218,7 +218,7 @@ MEMC_VARS= DSO_EXTMODS+=memc MODSECURITY_LIB_DEPENDS= libapr-1.so:devel/apr1 \ libcurl.so:ftp/curl \ - libluajit-5.1.so:lang/luajit \ + libluajit-5.1.so:lang/luajit-openresty \ libpcre.so:devel/pcre \ libyajl.so:devel/yajl MODSECURITY_USE= GNOME=libxml2 @@ -238,7 +238,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:0.3.8:njs +NJS_GH_TUPLE= nginx:njs:0.3.9:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx PASSENGER_NGINX_VER= 6.0.4 Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Mar 3 15:01:01 2020 (r527677) +++ head/www/nginx-devel/distinfo Tue Mar 3 15:05:06 2020 (r527678) @@ -1,4 +1,4 @@ -TIMESTAMP = 1579981520 +TIMESTAMP = 1583247379 SHA256 (nginx-1.17.8.tar.gz) = 97d23ecf6d5150b30e284b40e8a6f7e3bb5be6b601e373a4d013768d5a25965b SIZE (nginx-1.17.8.tar.gz) = 1038627 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -61,8 +61,6 @@ SHA256 (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz SIZE (sto-ngx_http_auth_pam_module-v1.5.1_GH0.tar.gz) = 6863 SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859 SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558 -SHA256 (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = d5460002dcda8e67a10027866255842a064225bb1dbcddb2db8cb18bb3fa511a -SIZE (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = 127676 SHA256 (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 014bedb2b334ba8e8e23b4c660590357f8055dbed7b9b017e4cc2937876a8822 SIZE (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 14849 SHA256 (aperezdc-ngx-fancyindex-v0.4.3_GH0.tar.gz) = 81698fb0c1ec9f906ce308c055d5d248085caf390f4b92516c1ec93f87c886d4 @@ -105,6 +103,8 @@ SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534 +SHA256 (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = d5460002dcda8e67a10027866255842a064225bb1dbcddb2db8cb18bb3fa511a +SIZE (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = 127676 SHA256 (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2 SIZE (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 655110 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 @@ -113,8 +113,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-0.3.8_GH0.tar.gz) = 5620fab03f890043a3f5b95459be24f2c22e0b5478c4b925aafdcfe13a60fc16 -SIZE (nginx-njs-0.3.8_GH0.tar.gz) = 398172 +SHA256 (nginx-njs-0.3.9_GH0.tar.gz) = 429f34c5e02a56dd6a8666aa3192288d8693c9cfcde8406390381fa85acf9b28 +SIZE (nginx-njs-0.3.9_GH0.tar.gz) = 412279 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.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea Modified: head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure ============================================================================== --- head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Tue Mar 3 15:01:01 2020 (r527677) +++ head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Tue Mar 3 15:05:06 2020 (r527678) @@ -14,7 +14,7 @@ test_paths= ;; #( yes) : - test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #( -+ test_paths="%%PREFIX%%/include/luajit-2.0" ;; #( ++ test_paths="%%PREFIX%%/include/luajit-2.1" ;; #( *) : test_paths="${with_lua}" ;; esac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003031505.023F56Y8034254>