Page MenuHomeFreeBSD
Files F171842618

D14007.id38285.diff
No OneTemporary
Actions

D14007.id38285.diff
View Options

Index: www/nginx/Makefile
===================================================================
--- www/nginx/Makefile
+++ www/nginx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.12.2
-PORTREVISION?= 5
+PORTREVISION?= 6
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
@@ -872,8 +872,7 @@
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
.endif
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_common.h \
- ${PATCHDIR}/extra-patch-ngx_http_lua_headers.c \
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_headers.c \
${PATCHDIR}/extra-patch-ngx_http_lua_headers.h \
${PATCHDIR}/extra-patch-ngx_http_lua_module.c \
${PATCHDIR}/extra-patch-ngx_http_lua_ssl_ocsp.c
@@ -901,8 +900,9 @@
USE_APACHE= 22+
USE_GNOME+= libxml2
USES+= pkgconfig shebangfix
-MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity
-DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity
+GH_ACCOUNT+= SpiderLabs:modsecurity
+GH_PROJECT+= ModSecurity:modsecurity
+GH_TAGNAME+= v${NGINX_MODSECURITY_VERSION}:modsecurity
CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure \
${PATCHDIR}/extra-patch-ngx_http_modsecurity.c
@@ -980,7 +980,6 @@
GH_PROJECT+= redis2-nginx-module:redis2
GH_TAGNAME+= v${NGINX_REDIS2_VERSION}:redis2
CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_redis2_util.c
.endif
.if ${PORT_OPTIONS:MRTMP}
Index: www/nginx/files/extra-patch-ngx_http_lua_common.h
===================================================================
--- www/nginx/files/extra-patch-ngx_http_lua_common.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h.orig 2017-04-15 10:55:20.591680000 -0400
-+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h 2017-04-15 10:55:50.449108000 -0400
-@@ -199,6 +199,12 @@
- of reqeusts */
- ngx_uint_t malloc_trim_req_count;
-
-+#if nginx_version >= 1011011
-+ /* the following 2 fields are only used by ngx.req.raw_headers() for now */
-+ ngx_buf_t **busy_buf_ptrs;
-+ ngx_int_t busy_buf_ptr_count;
-+#endif
-+
- unsigned requires_header_filter:1;
- unsigned requires_body_filter:1;
- unsigned requires_capture_filter:1;
Index: www/nginx/files/extra-patch-ngx_http_redis2_util.c
===================================================================
--- www/nginx/files/extra-patch-ngx_http_redis2_util.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c.orig 2016-11-20 15:00:28.997903000 -0500
-+++ ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c 2016-11-20 15:00:44.173323000 -0500
-@@ -77,6 +77,7 @@
- continue;
- }
-
-+#if (nginx_version < 1011006)
- if (uscfp[i]->default_port
- && url->default_port
- && uscfp[i]->default_port != url->default_port)
-@@ -84,6 +85,7 @@
- dd("upstream_add: default_port not match");
- continue;
- }
-+#endif
-
- return uscfp[i];
- }

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 15, 12:04 AM (17 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38932106
Default Alt Text
D14007.id38285.diff (3 KB)

Event Timeline