diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2017-04-25 23:18:09 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2017-04-25 23:18:09 +0000 |
| commit | 09d995fd2c5573d663dfb8df8b6846fc441cfce5 (patch) | |
| tree | 84072d67c0ae130907d90250db176210a6b0e2d5 /www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config | |
| parent | Fix USE_GITHUB usage. (diff) | |
Upgrade from 1.10.3 to 1.12.0.
ChangeLog: http://nginx.org/en/CHANGES-1.12
Remove IPV6 knob, IPv6 now compiled-in automatically if support is found.
Also, remove third-party modules:
o) udplog
o) statsd
Enable third_party mod_zip module back by changing upstream.
Upgrade third-party modules:
o) lua to 0.10.8
o) upstream_fair to b5be36f (upstream has been changed)
o) upload to 72ec037 (upstream has been changed).
o) http_auth_krb5 to 0c6ff3f.
o) party njs to 0.1.10.
Please see this comment in case of the production use of the lua module:
https://github.com/openresty/lua-nginx-module/pull/1017#issuecomment-294076002
Patches obtained from:
o) https://github.com/openresty/lua-nginx-module/commit/0459a285ca0159d45e73da8bd1164edb5c57cde3
o) https://github.com/SpiderLabs/ModSecurity/pull/1373/commits/d19df159043106a4d6dfd113696900b5b0dae24b
Diffstat (limited to 'www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config')
| -rw-r--r-- | www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config index 9ac1b629b398..5f8d7523c16e 100644 --- a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config +++ b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config @@ -1,8 +1,9 @@ ---- ../spnego-http-auth-nginx-module-c85a38c/config.orig 2015-06-13 20:49:15.590751000 +0300 -+++ ../spnego-http-auth-nginx-module-c85a38c/config 2015-06-13 20:49:31.024936000 +0300 -@@ -1,4 +1,4 @@ +--- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig 2017-04-15 13:07:01.159506000 -0400 ++++ ../spnego-http-auth-nginx-module-0c6ff3f/config 2017-04-15 13:07:36.283398000 -0400 +@@ -1,5 +1,5 @@ ngx_addon_name=ngx_http_auth_spnego_module - HTTP_MODULES="$HTTP_MODULES ngx_http_auth_spnego_module" - NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c" --CORE_LIBS="$CORE_LIBS -lgssapi_krb5 -lkrb5 -lcom_err" -+CORE_LIBS="$CORE_LIBS %%GSSAPILIBS%% -lcom_err" +-ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" ++ngx_feature_libs="%%GSSAPILIBS%% -lcom_err" + + if uname -o | grep -q FreeBSD; then + ngx_feature_libs="$ngx_feature_libs -lgssapi" |