Date: Mon, 1 May 2017 23:30:03 +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: r439916 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <201705012330.v41NU3CR022184@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Mon May 1 23:30:03 2017 New Revision: 439916 URL: https://svnweb.freebsd.org/changeset/ports/439916 Log: 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 Added: head/www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c (contents, props changed) head/www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Mon May 1 21:38:05 2017 (r439915) +++ head/www/nginx-devel/Makefile Mon May 1 23:30:03 2017 (r439916) @@ -857,7 +857,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_lu 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} Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Mon May 1 21:38:05 2017 (r439915) +++ head/www/nginx-devel/distinfo Mon May 1 23:30:03 2017 (r439916) @@ -1,4 +1,4 @@ -TIMESTAMP = 1493162906 +TIMESTAMP = 1493681058 SHA256 (nginx-1.13.0.tar.gz) = 79f52ab6550f854e14439369808105b5780079769d7b8db3856be03c683605d7 SIZE (nginx-1.13.0.tar.gz) = 982592 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9 Added: head/www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c Mon May 1 23:30:03 2017 (r439916) @@ -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; + Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Mon May 1 21:38:05 2017 (r439915) +++ head/www/nginx/Makefile Mon May 1 23:30:03 2017 (r439916) @@ -857,7 +857,8 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_lu 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} Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Mon May 1 21:38:05 2017 (r439915) +++ head/www/nginx/distinfo Mon May 1 23:30:03 2017 (r439916) @@ -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. 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 Added: head/www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c Mon May 1 23:30:03 2017 (r439916) @@ -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; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705012330.v41NU3CR022184>