mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

ModSecurity: back to 2.9.1

Browse Source 
Tarantool back to 1278ee5
Drizzle back to 0.1.9
Dynamic Upstream back to 0.1.3

- fix patches for fastdfs

- remove needless patch

Approved by:	tz (mentor)
Differential Revision:	https://reviews.freebsd.org/D14007
This commit is contained in:
Jochen Neumeister 2018-01-24 17:54:43 +00:00
parent 1f18d5c995
commit 8b842f0ff1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=459848
10 changed files with 25 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
www/nginx/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.12.2
PORTREVISION?= 5
PORTREVISION?= 6
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
@ -695,13 +695,13 @@ LIB_DEPENDS+= libmsgpuck.so:devel/msgpuck \
libyajl.so:devel/yajl
GH_ACCOUNT+= tarantool:nginx_tarantool
GH_PROJECT+= nginx_upstream_module:nginx_tarantool
GH_TAGNAME+= 9e38881:nginx_tarantool
GH_TAGNAME+= 1278ee5:nginx_tarantool
.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool}
.endif
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config
.endif
.if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
@ -804,7 +804,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
LIB_DEPENDS+= libdrizzle.so:databases/libdrizzle
CONFIGURE_ENV+= "LIBDRIZZLE_INC=${LOCALBASE}/include"
CONFIGURE_ENV+= "LIBDRIZZLE_LIB=${LOCALBASE}/lib"
NGINX_DRIZZLE_VERSION= 0.1.10
NGINX_DRIZZLE_VERSION= 0.1.9
GH_ACCOUNT+= openresty:drizzle
GH_PROJECT+= drizzle-nginx-module:drizzle
GH_TAGNAME+= v${NGINX_DRIZZLE_VERSION}:drizzle
@ -814,7 +814,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config \
.endif
.if ${PORT_OPTIONS:MDYNAMIC_UPSTREAM}
NGINX_DYNAMIC_UPSTREAM_VERSION= 0.1.6
NGINX_DYNAMIC_UPSTREAM_VERSION= 0.1.3
GH_ACCOUNT+= cubicdaiya:dyn_upstream
GH_PROJECT+= ngx_dynamic_upstream:dyn_upstream
GH_TAGNAME+= v${NGINX_DYNAMIC_UPSTREAM_VERSION}:dyn_upstream
@ -844,7 +844,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_encryptsession}
.if ${PORT_OPTIONS:MGRIDFS}
NGINX_GRIDFS_VERSION= 0.8
MONGO_C_DRIVER_VERSION= 0.4
MONGO_C_DRIVER_VERSION= 0.3.1
GH_ACCOUNT+= mdirolf:gridfs mongodb:mongo_c
GH_PROJECT+= nginx-gridfs:gridfs mongo-c-driver:mongo_c
GH_TAGNAME+= v${NGINX_GRIDFS_VERSION}:gridfs v${MONGO_C_DRIVER_VERSION}:mongo_c
@ -872,11 +872,6 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_lua}
.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 \
${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
.endif
.if ${PORT_OPTIONS:MMEMC}
@ -892,7 +887,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
.endif
.if ${PORT_OPTIONS:MMODSECURITY}
NGINX_MODSECURITY_VERSION= 3.0.0
NGINX_MODSECURITY_VERSION= 2.9.1
LIB_DEPENDS+= libapr-1.so:devel/apr1 \
libcurl.so:ftp/curl \
libluajit-5.1.so:lang/luajit \
@ -980,7 +975,6 @@ GH_ACCOUNT+= openresty:redis2
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}
@ -1004,7 +998,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
.endif
.if ${PORT_OPTIONS:MSFLOW}
NGINX_SFLOW_VERSION= f15c87f
NGINX_SFLOW_VERSION= 543c72a
GH_ACCOUNT+= sflow:sflow
GH_PROJECT+= nginx-sflow-module:sflow
GH_TAGNAME+= ${NGINX_SFLOW_VERSION}:sflow

26
www/nginx/distinfo
View File

@ -1,4 +1,4 @@
TIMESTAMP = 1516399275
TIMESTAMP = 1516812661
SHA256 (nginx-1.12.2.tar.gz) = 305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416
SIZE (nginx-1.12.2.tar.gz) = 981687
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d
SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90
SIZE (08a395c66e42.tar.gz) = 120603
SHA256 (modsecurity-3.0.0.tar.gz) = 51e288999c5903f4062afdca37a602c7ba14242120ba54cf22f90650b646d4dc
SIZE (modsecurity-3.0.0.tar.gz) = 5591
SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24
SIZE (modsecurity-2.9.1.tar.gz) = 4261212
SHA256 (passenger-5.1.12.tar.gz) = 1705bd6d1f9b9d055fb58b3545ca6f38ca6d222c07201f53c5014e0eb09f4495
SIZE (passenger-5.1.12.tar.gz) = 4245993
SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
@ -63,8 +63,8 @@ SHA256 (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 5253bb8a804ea679
SIZE (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 183493
SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3
SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230
SHA256 (tarantool-nginx_upstream_module-9e38881_GH0.tar.gz) = d4fba33c831a41af58da38b1b9c3a0c638cc9e7265c26c2041055803dda7752e
SIZE (tarantool-nginx_upstream_module-9e38881_GH0.tar.gz) = 73713
SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a
SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378
SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd
SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303
SHA256 (masterzen-nginx-upload-progress-module-v0.9.2_GH0.tar.gz) = b286689355442657650421d8e8398bd4abf9dbbaade65947bb0cb74a349cc497
@ -77,18 +77,18 @@ SHA256 (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 6ad7d12
SIZE (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 2709894
SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44
SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 26125
SHA256 (openresty-drizzle-nginx-module-v0.1.10_GH0.tar.gz) = 4033b9af73241a695ff07162969ea2212f5401dd484f204b8e3e50f488f84a94
SIZE (openresty-drizzle-nginx-module-v0.1.10_GH0.tar.gz) = 50674
SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 056fcd63cab39c2f0144d6a8c3ce16e8ae2cfb6e02ad66e5972ffeeca6c6a4d3
SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 11015
SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080
SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024
SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b
SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921
SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619
SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455
SHA256 (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = ab7b20be9f32da846f5c380677f7bc1dff0b93ce02c06bf584cd45709896ad66
SIZE (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = 11139
SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
SHA256 (mongodb-mongo-c-driver-v0.4_GH0.tar.gz) = 5bddb502be7d743c0e67617ff06088e49a3d5ed2bcccbf6a2c49b39f2177d389
SIZE (mongodb-mongo-c-driver-v0.4_GH0.tar.gz) = 76430
SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
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 (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = c0fb91fcfd1c6e7dec34ca64826ef81ffebafdef6174d254467636f380566626
@ -109,8 +109,8 @@ SHA256 (arut-nginx-rtmp-module-v1.2.1_GH0.tar.gz) = 87aa597400b0b5a05274ee2d23d8
SIZE (arut-nginx-rtmp-module-v1.2.1_GH0.tar.gz) = 519919
SHA256 (openresty-set-misc-nginx-module-cda7e50_GH0.tar.gz) = 6fb2c99d4aecdd0335f55493b0dd4170efa46b0014a4c2e41f2ea519b633aca2
SIZE (openresty-set-misc-nginx-module-cda7e50_GH0.tar.gz) = 29291
SHA256 (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 251de3a5b588a4721effe88f3dbc632706321b7cd1af5fae7aa4f38ca50d2637
SIZE (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 29515
SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955
SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504
SHA256 (nginx-shib-nginx-http-shibboleth-f07bf3c_GH0.tar.gz) = db0c244fbd553846539e4020c5131e2c99700cddc0e5664aac0b807733607b05
SIZE (nginx-shib-nginx-http-shibboleth-f07bf3c_GH0.tar.gz) = 22177
SHA256 (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 4cf660651d11330a13aab29eb1722bf792d7c3c42e2919a36a1957c4ed0f1533

4
www/nginx/files/extra-patch-fastdfs-src-config
View File

@ -1,5 +1,5 @@
--- ../fastdfs-nginx-module-5a8110f/src/config.orig 2016-10-12 16:09:34.075804000 +0200
+++ ../fastdfs-nginx-module-5a8110f/src/config 2016-10-12 16:10:43.916280000 +0200
--- ../fastdfs-nginx-module-85347be/src/config.orig 2016-10-12 16:09:34.075804000 +0200
+++ ../fastdfs-nginx-module-85347be/src/config 2016-10-12 16:10:43.916280000 +0200
@@ -3,16 +3,16 @@
if test -n "${ngx_module_link}"; then
ngx_module_type=HTTP

4
www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
View File

@ -1,5 +1,5 @@
--- ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf.orig 2017-09-05 14:19:44.560907000 +0200
+++ ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf 2017-09-05 14:24:43.475900000 +0200
--- ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf.orig 2017-09-05 14:19:44.560907000 +0200
+++ ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf 2017-09-05 14:24:43.475900000 +0200
@@ -59,8 +59,8 @@
# store_path#, based 0, if store_path0 not exists, it's value is base_path
# the paths must be exist

15
www/nginx/files/extra-patch-ngx_http_lua_common.h
View File

@ -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;

124
www/nginx/files/extra-patch-ngx_http_lua_headers.c
View File

@ -1,124 +0,0 @@
--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c.orig 2017-04-15 10:57:48.875770000 -0400
+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c 2017-04-15 11:02:00.492564000 -0400
@@ -26,6 +26,9 @@
static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
static int ngx_http_lua_ngx_req_header_set(lua_State *L);
static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
+#if nginx_version >= 1011011
+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
+#endif
static int
@@ -77,6 +80,11 @@
size_t size;
ngx_buf_t *b, *first = NULL;
ngx_int_t i, j;
+#if nginx_version >= 1011011
+ ngx_buf_t **bb;
+ ngx_chain_t *cl;
+ ngx_http_lua_main_conf_t *lmcf;
+#endif
ngx_connection_t *c;
ngx_http_request_t *r, *mr;
ngx_http_connection_t *hc;
@@ -93,6 +101,10 @@
return luaL_error(L, "no request object found");
}
+#if nginx_version >= 1011011
+ lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+#endif
+
ngx_http_lua_check_fake_request(L, r);
mr = r->main;
@@ -109,8 +121,13 @@
dd("hc->nbusy: %d", (int) hc->nbusy);
if (hc->nbusy) {
+#if nginx_version >= 1011011
+ dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
+ hc->busy->buf->last, hc->busy->buf->end);
+#else
dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
hc->busy[0]->last, hc->busy[0]->end);
+#endif
}
dd("request line: %p %p", mr->request_line.data,
@@ -146,9 +163,37 @@
dd("size: %d", (int) size);
if (hc->nbusy) {
+#if nginx_version >= 1011011
+ if (hc->nbusy > lmcf->busy_buf_ptr_count) {
+ if (lmcf->busy_buf_ptrs) {
+ ngx_free(lmcf->busy_buf_ptrs);
+ }
+
+ lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
+ r->connection->log);
+
+ if (lmcf->busy_buf_ptrs == NULL) {
+ return luaL_error(L, "no memory");
+ }
+
+ lmcf->busy_buf_ptr_count = hc->nbusy;
+ }
+
+ bb = lmcf->busy_buf_ptrs;
+ for (cl = hc->busy; cl; cl = cl->next) {
+ *bb++ = cl->buf;
+ }
+#endif
b = NULL;
+
+#if nginx_version >= 1011011
+ bb = lmcf->busy_buf_ptrs;
+ for (i = hc->nbusy; i > 0; i--) {
+ b = bb[i - 1];
+#else
for (i = 0; i < hc->nbusy; i++) {
b = hc->busy[i];
+#endif
dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
b->start);
@@ -223,8 +268,15 @@
}
if (hc->nbusy) {
+
+#if nginx_version >= 1011011
+ bb = lmcf->busy_buf_ptrs;
+ for (i = hc->nbusy - 1; i >= 0; i--) {
+ b = bb[i];
+#else
for (i = 0; i < hc->nbusy; i++) {
b = hc->busy[i];
+#endif
if (!found) {
if (b != first) {
@@ -1431,4 +1483,20 @@
#endif /* NGX_LUA_NO_FFI_API */
+#if nginx_version >= 1011011
+void
+ngx_http_lua_ngx_raw_header_cleanup(void *data)
+{
+ ngx_http_lua_main_conf_t *lmcf;
+
+ lmcf = (ngx_http_lua_main_conf_t *) data;
+
+ if (lmcf->busy_buf_ptrs) {
+ ngx_free(lmcf->busy_buf_ptrs);
+ lmcf->busy_buf_ptrs = NULL;
+ }
+}
+#endif
+
+
/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

12
www/nginx/files/extra-patch-ngx_http_lua_headers.h
View File

@ -1,12 +0,0 @@
--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h.orig 2017-04-15 11:05:40.649209000 -0400
+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h 2017-04-15 11:06:01.658936000 -0400
@@ -15,6 +15,9 @@
void ngx_http_lua_inject_resp_header_api(lua_State *L);
void ngx_http_lua_inject_req_header_api(lua_State *L);
void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L);
+#if nginx_version >= 1011011
+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
+#endif
#endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */

36
www/nginx/files/extra-patch-ngx_http_lua_module.c
View File

@ -1,36 +0,0 @@
--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c.orig 2017-04-15 11:07:10.366543000 -0400
+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c 2017-04-15 11:08:25.640520000 -0400
@@ -28,6 +28,7 @@
#include "ngx_http_lua_ssl_certby.h"
#include "ngx_http_lua_ssl_session_storeby.h"
#include "ngx_http_lua_ssl_session_fetchby.h"
+#include "ngx_http_lua_headers.h"
static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
@@ -624,7 +625,7 @@
volatile ngx_cycle_t *saved_cycle;
ngx_http_core_main_conf_t *cmcf;
ngx_http_lua_main_conf_t *lmcf;
-#ifndef NGX_LUA_NO_FFI_API
+#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
ngx_pool_cleanup_t *cln;
#endif
@@ -716,6 +717,16 @@
cln->handler = ngx_http_lua_sema_mm_cleanup;
#endif
+#if nginx_version >= 1011011
+ cln = ngx_pool_cleanup_add(cf->pool, 0);
+ if (cln == NULL) {
+ return NGX_ERROR;
+ }
+
+ cln->data = lmcf;
+ cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
+#endif
+
if (lmcf->lua == NULL) {
dd("initializing lua vm");

12
www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c
View File

@ -1,12 +0,0 @@
--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_ssl_ocsp.c.orig 2017-04-30 17:32:37.211186000 -0400
+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_ssl_ocsp.c 2017-04-30 17:33:42.926721000 -0400
@@ -490,7 +490,9 @@
dd("set ocsp resp: resp_len=%d", (int) resp_len);
(void) SSL_set_tlsext_status_ocsp_resp(ssl_conn, p, resp_len);
+#ifndef LIBRESSL_VERSION_NUMBER
ssl_conn->tlsext_status_expected = 1;
+#endif
return NGX_OK;

18
www/nginx/files/extra-patch-ngx_http_redis2_util.c
View File

@ -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];
}