diff options
| author | osa <osa@FreeBSD.org> | 2017-05-02 07:30:03 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2017-05-02 07:30:03 +0800 |
| commit | 0ecf57abdf104d18e6a8e55d5e754a7745862984 (patch) | |
| tree | ed2a20886cf58851483cde90974ee257a2cf1d03 /www/nginx | |
| parent | a107e0d67c60eafc68eca469f18051f3c4c0d1bd (diff) | |
| download | freebsd-ports-gnome-0ecf57abdf104d18e6a8e55d5e754a7745862984.tar.gz freebsd-ports-gnome-0ecf57abdf104d18e6a8e55d5e754a7745862984.tar.zst freebsd-ports-gnome-0ecf57abdf104d18e6a8e55d5e754a7745862984.zip | |
Fix third-party lua-nginx module build with LibreSSL.
While I'm here clean-up distinfo from the checksums of legacy
third-party modules.
Do not bump PORTREVISION.
PR: 218595
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 3 | ||||
| -rw-r--r-- | www/nginx/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 429796a86320..72a57a942b19 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -857,7 +857,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_lua} 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_module.c \ + ${PATCHDIR}/extra-patch-ngx_http_lua_ssl_ocsp.c .endif .if ${PORT_OPTIONS:MMEMC} diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 5b2952cb2863..a3b23b6133a4 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1492353399 +TIMESTAMP = 1493681058 SHA256 (nginx-1.12.0.tar.gz) = b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30 SIZE (nginx-1.12.0.tar.gz) = 980831 -SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 -SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -119,8 +117,6 @@ SHA256 (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 8f513d6d3df32c3b05327d40 SIZE (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 55918 SHA256 (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = e34b1ab5f5007661f73819f9c20fd6c2a46ed3e53364e9449b02ef2bd3628633 SIZE (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = 58777 -SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267 -SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477 SHA256 (nginx-njs-753ebe6_GH0.tar.gz) = 43fc7a307ee98b9c55283374b36f1f4576cbf529a4101176cb94ab73f3110f67 diff --git a/www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c b/www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c new file mode 100644 index 000000000000..5064f3376328 --- /dev/null +++ b/www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c @@ -0,0 +1,12 @@ +--- ../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; + |