diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2018-04-24 22:29:18 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2018-04-24 22:29:18 +0000 |
| commit | 8f19945eed329db2d64ba3494511b395a00cf56e (patch) | |
| tree | 37a195df8a30fc1a33c3ef13d2b4cffbe481f5b5 /www/nginx-devel/files | |
| parent | java/java-checkstyle: Update version 8.7=>8.9 (diff) | |
Merge from www/nginx and adopt next revisions:
468201, 468240.
Update third-party modules to their recent versions.
Enable libxml usage for third-party vod module.
Bump PORTREVISION.
Notes
Notes:
svn path=/head/; revision=468248
Diffstat (limited to 'www/nginx-devel/files')
3 files changed, 28 insertions, 11 deletions
diff --git a/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL b/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL index 4dd87b8a8fae..9aa89a463a9d 100644 --- a/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL +++ b/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL @@ -1,20 +1,20 @@ ---- ../ nginx-ct-1.3.2/ngx_ssl_ct_module.c.orig 2016-11-30 22:58:29.000000000 +0100 -+++ ../nginx-ct-1.3.2/ngx_ssl_ct_module.c 2017-02-11 19:42:19.741572000 +0100 -@@ -170,7 +170,7 @@ +--- ../nginx-ct-93e9884/ngx_ssl_ct_module.c.orig 2017-07-23 08:03:35.000000000 -0400 ++++ ../nginx-ct-93e9884/ngx_ssl_ct_module.c 2018-04-24 16:58:27.698435000 -0400 +@@ -158,7 +158,7 @@ #endif } -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) /* add OpenSSL TLS extension */ - if (SSL_CTX_add_server_custom_ext(ssl_ctx, NGX_SSL_CT_EXT, - &ngx_ssl_ct_ext_cb, NULL, NULL, NULL, NULL) == 0) -@@ -184,7 +184,7 @@ + # if OPENSSL_VERSION_NUMBER >= 0x10101000L + int context = SSL_EXT_CLIENT_HELLO +@@ -183,7 +183,7 @@ return NGX_CONF_OK; } -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) - int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, const unsigned char **out, - size_t *outlen, int *al, void *add_arg) - { + # if OPENSSL_VERSION_NUMBER >= 0x10101000L + int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, unsigned int context, + const unsigned char **out, size_t *outlen, X509 *x, size_t chainidx, diff --git a/www/nginx-devel/files/extra-patch-nginx-vod-module-config b/www/nginx-devel/files/extra-patch-nginx-vod-module-config new file mode 100644 index 000000000000..d71f81774644 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-vod-module-config @@ -0,0 +1,17 @@ +--- ../nginx-vod-module-1.22/config.orig 2018-04-24 17:51:34.654430000 -0400 ++++ ../nginx-vod-module-1.22/config 2018-04-24 18:10:13.517041000 -0400 +@@ -154,8 +154,12 @@ + ngx_feature_run=no + ngx_feature_incs="#include <libxml/parser.h> + #include <libxml/tree.h>" +-ngx_feature_path="/usr/include/libxml2" +-ngx_feature_libs="-lxml2" ++ngx_feature_path="%%PREFIX%%/include/libxml2 %%PREFIX%%/include" ++if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lxml2 -lxslt" ++else ++ ngx_feature_libs="-L%%PREFIX%%/lib -lxml2 -lxslt" ++fi + ngx_feature_test="xmlReadMemory(NULL, 0, NULL, NULL, 0);" + . auto/feature + diff --git a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config index 7ef2a4be7016..6a94aa3eff55 100644 --- a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config +++ b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config @@ -1,5 +1,5 @@ ---- ../drizzle-nginx-module-0.1.10/config.orig 2011-12-30 10:26:53.000000000 +0400 -+++ ../drizzle-nginx-module-0.1.10/config 2011-12-30 10:28:20.000000000 +0400 +--- ../drizzle-nginx-module-b4f94ec/config.orig 2011-12-30 10:26:53.000000000 +0400 ++++ ../drizzle-nginx-module-b4f94ec/config 2011-12-30 10:28:20.000000000 +0400 @@ -22,12 +22,12 @@ if [ $ngx_found = no ]; then |