Merge pull request #86 from essentialkaos/develop

Version 1.17.2.1

Author: andyone

SOURCES/resty-core-disable.patch

@@ -0,0 +1,12 @@
+diff -urN lua-nginx-module-0.10.15-orig/src/ngx_http_lua_module.c lua-nginx-module-0.10.15/src/ngx_http_lua_module.c
+--- lua-nginx-module-0.10.15-orig/src/ngx_http_lua_module.c	2019-05-08 02:02:31.000000000 +0300
++++ lua-nginx-module-0.10.15/src/ngx_http_lua_module.c	2019-07-26 14:30:07.000000000 +0300
+@@ -919,7 +919,7 @@
+     ngx_http_lua_main_conf_t *lmcf = conf;
+ 
+     if (lmcf->load_resty_core == NGX_CONF_UNSET) {
+-        lmcf->load_resty_core = 1;
++        lmcf->load_resty_core = 0;
+     }
+ 
+ #if (NGX_PCRE)

webkaos.spec

@@ -56,7 +56,7 @@
 Summary:              Superb high performance web server
 Name:                 webkaos
 Version:              1.17.2
-Release:              0%{?dist}
+Release:              1%{?dist}
 License:              2-clause BSD-like license
 Group:                System Environment/Daemons
 URL:                  https://github.com/essentialkaos/webkaos
@@ -91,6 +91,8 @@ Patch2:               %{name}-dynamic-tls-records.patch
 Patch3:               boringssl.patch
 Patch5:               boringssl-tls13-support.patch
 Patch6:               boringssl-c6-build-fix.patch
+# For resty-core, lua-nginx-module 0.10.16 is required but it not released yet
+Patch7:               resty-core-disable.patch
 
 BuildRoot:            %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -169,6 +171,10 @@ pushd boringssl
 %endif
 popd
 
+pushd lua-nginx-module-%{lua_module_ver}
+%patch7 -p1
+popd
+
 %build
 
 # Renaming and moving docs
@@ -573,6 +579,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Wed Jul 24 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.2-1
+- resty-core disabled by default
+
 * Wed Jul 24 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.2-0
 - Nginx updated to 1.17.2
 - BoringSSL updated to the latest version