Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Dec 2018 18:52:00 +0000 (UTC)
From:      Jochen Neumeister <joneum@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r488617 - in head/www/nginx: . files
Message-ID:  <201812281852.wBSIq0Bq027949@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: joneum
Date: Fri Dec 28 18:51:59 2018
New Revision: 488617
URL: https://svnweb.freebsd.org/changeset/ports/488617

Log:
  Update 3rd party-module:
  - modsecurity to 2.9.3
  - njs to 21572a0
  
  Sponsored by:	Netzkommune GmbH

Modified:
  head/www/nginx/Makefile
  head/www/nginx/Makefile.extmod
  head/www/nginx/distinfo
  head/www/nginx/files/extra-patch-nginx-modsecurity-configure

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Fri Dec 28 18:20:13 2018	(r488616)
+++ head/www/nginx/Makefile	Fri Dec 28 18:51:59 2018	(r488617)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.14.2
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/ \

Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod	Fri Dec 28 18:20:13 2018	(r488616)
+++ head/www/nginx/Makefile.extmod	Fri Dec 28 18:51:59 2018	(r488617)
@@ -209,11 +209,12 @@ MODSECURITY_LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 				libpcre.so:devel/pcre \
 				libyajl.so:devel/yajl
 MODSECURITY_USE=		GNOME=libxml2
-MODSECURITY_USES=		apache:2.2+ pkgconfig shebangfix
-MODSECURITY_MASTER_SITES=	http://www.modsecurity.org/tarball/2.9.2/:modsecurity
-MODSECURITY_DISTFILES=		modsecurity-2.9.2.tar.gz:modsecurity
+MODSECURITY_VERSION=	2.9.3
+MODSECURITY_USES=		apache:2.4+ pkgconfig shebangfix
+MODSECURITY_MASTER_SITES=	http://www.modsecurity.org/tarball/${MODSECURITY_VERSION}/:modsecurity
+MODSECURITY_DISTFILES=		modsecurity-${MODSECURITY_VERSION}.tar.gz:modsecurity
 MODSECURITY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
-MODSECURITY_VARS=		WRKSRC_modsecurity=${WRKDIR}/modsecurity-2.9.2
+MODSECURITY_VARS=		WRKSRC_modsecurity=${WRKDIR}/modsecurity-${MODSECURITY_VERSION}
 
 MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
 MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:71ede63:modsec
@@ -223,7 +224,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:36f1295:njs
+NJS_GH_TUPLE=		nginx:njs:21572a0:njs
 NJS_VARS=		DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
 
 PASSENGER_NGINX_VER=	6.0.0

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Fri Dec 28 18:20:13 2018	(r488616)
+++ head/www/nginx/distinfo	Fri Dec 28 18:51:59 2018	(r488617)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1545319684
+TIMESTAMP = 1545897033
 SHA256 (nginx-1.14.2.tar.gz) = 002d9f6154e331886a2dd4e6065863c9c1cf8291ae97a1255308572c02be9797
 SIZE (nginx-1.14.2.tar.gz) = 1015384
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
 SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90
 SIZE (08a395c66e42.tar.gz) = 120603
-SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5
-SIZE (modsecurity-2.9.2.tar.gz) = 4298993
+SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118
+SIZE (modsecurity-2.9.3.tar.gz) = 4307670
 SHA256 (passenger-6.0.0.tar.gz) = 3f826e55065bb69ff5cc945b7b8ab5eb69f957e108053d15401c2ea059321b83
 SIZE (passenger-6.0.0.tar.gz) = 7202705
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
@@ -107,8 +107,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-71ede63_GH0.tar.g
 SIZE (SpiderLabs-ModSecurity-nginx-71ede63_GH0.tar.gz) = 28816
 SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4
 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
-SHA256 (nginx-njs-36f1295_GH0.tar.gz) = 8c96112b5784faaec5f97290c49600ff9e85c510c785f3cf25997d981ac25e17
-SIZE (nginx-njs-36f1295_GH0.tar.gz) = 286757
+SHA256 (nginx-njs-21572a0_GH0.tar.gz) = 2bb061ef4d425776a33cd9d6ec6ec9936ec5211e7ac3554ac1f337f73b284bf4
+SIZE (nginx-njs-21572a0_GH0.tar.gz) = 290995
 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/files/extra-patch-nginx-modsecurity-configure
==============================================================================
--- head/www/nginx/files/extra-patch-nginx-modsecurity-configure	Fri Dec 28 18:20:13 2018	(r488616)
+++ head/www/nginx/files/extra-patch-nginx-modsecurity-configure	Fri Dec 28 18:51:59 2018	(r488617)
@@ -1,5 +1,5 @@
---- ../modsecurity-2.9.2/configure.orig	2018-07-17 14:12:34.223173000 +0200
-+++ ../modsecurity-2.9.2/configure	2018-07-17 14:16:23.284534000 +0200
+--- ../modsecurity-2.9.3/configure.orig	2018-07-17 14:12:34.223173000 +0200
++++ ../modsecurity-2.9.3/configure	2018-07-17 14:16:23.284534000 +0200
 @@ -15715,7 +15715,7 @@ LUA_CPPFLAGS=""
  LUA_LDADD=""
  LUA_LDFLAGS=""



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812281852.wBSIq0Bq027949>