Merge pull request #84 from essentialkaos/develop

Version 1.17.1

Author: andyone

README.md

@@ -20,14 +20,14 @@
 #### From ESSENTIAL KAOS Public repo for RHEL6/CentOS6
 
 ````
-[sudo] yum install -y https://yum.kaos.st/6/release/x86_64/kaos-repo-9.1-0.el6.noarch.rpm
+[sudo] yum install -y yum install -y https://yum.kaos.st/kaos-repo-latest.el6.noarch.rpm
 [sudo] yum install webkaos
 ````
 
 #### From ESSENTIAL KAOS Public repo for RHEL7/CentOS7
 
 ````
-[sudo] yum install -y https://yum.kaos.st/7/release/x86_64/kaos-repo-9.1-0.el7.noarch.rpm
+[sudo] yum install -y yum install -y https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm
 [sudo] yum install webkaos
 ````
 
@@ -38,7 +38,7 @@
 git clone https://github.com/essentialkaos/webkaos.git
 cd webkaos/
 rpmbuilder webkaos.spec -dl SOURCES/
-rpmbuilder webkaos.spec -1 -V -di
+rpmbuilder webkaos.spec -3 -V -di
 ````
 
 ### License

SOURCES/webkaos.patch

@@ -1,6 +1,6 @@
-diff -urN nginx-1.17.0-orig/auto/lib/openssl/make nginx-1.17.0/auto/lib/openssl/make
---- nginx-1.17.0-orig/auto/lib/openssl/make	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/auto/lib/openssl/make	2019-05-22 00:06:31.588052220 +0300
+diff -urN nginx-1.17.1-orig/auto/lib/openssl/make nginx-1.17.1/auto/lib/openssl/make
+--- nginx-1.17.1-orig/auto/lib/openssl/make	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/auto/lib/openssl/make	2019-06-29 01:59:04.850301918 +0300
 @@ -45,18 +45,18 @@
              /*) ngx_prefix="$OPENSSL/.openssl" ;;
              *)  ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.17.0-orig/auto/lib/openssl/make nginx-1.17.0/auto/lib/openssl/
      ;;
 
  esac
-diff -urN nginx-1.17.0-orig/src/core/nginx.c nginx-1.17.0/src/core/nginx.c
---- nginx-1.17.0-orig/src/core/nginx.c	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/core/nginx.c	2019-05-22 00:06:31.594052167 +0300
+diff -urN nginx-1.17.1-orig/src/core/nginx.c nginx-1.17.1/src/core/nginx.c
+--- nginx-1.17.1-orig/src/core/nginx.c	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/core/nginx.c	2019-06-29 01:59:04.856301870 +0300
 @@ -389,13 +389,13 @@
  static void
  ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.17.0-orig/src/core/nginx.c nginx-1.17.0/src/core/nginx.c
              "Options:" NGX_LINEFEED
              "  -?,-h         : this help" NGX_LINEFEED
              "  -v            : show version and exit" NGX_LINEFEED
-diff -urN nginx-1.17.0-orig/src/core/nginx.h nginx-1.17.0/src/core/nginx.h
---- nginx-1.17.0-orig/src/core/nginx.h	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/core/nginx.h	2019-05-22 00:21:44.000000000 +0300
+diff -urN nginx-1.17.1-orig/src/core/nginx.h nginx-1.17.1/src/core/nginx.h
+--- nginx-1.17.1-orig/src/core/nginx.h	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/core/nginx.h	2019-06-29 01:59:31.000000000 +0300
 @@ -11,7 +11,7 @@
 
- #define nginx_version      1017000
- #define NGINX_VERSION      "1.17.0"
+ #define nginx_version      1017001
+ #define NGINX_VERSION      "1.17.1"
 -#define NGINX_VER          "nginx/" NGINX_VERSION
 +#define NGINX_VER          "webkaos/" NGINX_VERSION
 
@@ -66,9 +66,9 @@ diff -urN nginx-1.17.0-orig/src/core/nginx.h nginx-1.17.0/src/core/nginx.h
  #define NGX_OLDPID_EXT     ".oldbin"
 
 
-diff -urN nginx-1.17.0-orig/src/core/ngx_log.c nginx-1.17.0/src/core/ngx_log.c
---- nginx-1.17.0-orig/src/core/ngx_log.c	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/core/ngx_log.c	2019-05-22 00:06:31.604052077 +0300
+diff -urN nginx-1.17.1-orig/src/core/ngx_log.c nginx-1.17.1/src/core/ngx_log.c
+--- nginx-1.17.1-orig/src/core/ngx_log.c	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/core/ngx_log.c	2019-06-29 01:59:04.866301790 +0300
 @@ -202,9 +202,9 @@
          return;
      }
@@ -99,9 +99,9 @@ diff -urN nginx-1.17.0-orig/src/core/ngx_log.c nginx-1.17.0/src/core/ngx_log.c
          return NGX_CONF_ERROR;
  #endif
 
-diff -urN nginx-1.17.0-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.0/src/http/modules/ngx_http_autoindex_module.c
---- nginx-1.17.0-orig/src/http/modules/ngx_http_autoindex_module.c	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/http/modules/ngx_http_autoindex_module.c	2019-05-22 00:17:05.000000000 +0300
+diff -urN nginx-1.17.1-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.1/src/http/modules/ngx_http_autoindex_module.c
+--- nginx-1.17.1-orig/src/http/modules/ngx_http_autoindex_module.c	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/http/modules/ngx_http_autoindex_module.c	2019-06-29 01:59:04.871301750 +0300
 @@ -449,9 +449,11 @@
      ;
 
@@ -177,9 +177,9 @@ diff -urN nginx-1.17.0-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
                                tm.ngx_tm_mday,
                                months[tm.ngx_tm_mon - 1],
                                tm.ngx_tm_year,
-diff -urN nginx-1.17.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.0/src/http/ngx_http_header_filter_module.c
---- nginx-1.17.0-orig/src/http/ngx_http_header_filter_module.c	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/http/ngx_http_header_filter_module.c	2019-05-22 00:06:31.616051969 +0300
+diff -urN nginx-1.17.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.1/src/http/ngx_http_header_filter_module.c
+--- nginx-1.17.1-orig/src/http/ngx_http_header_filter_module.c	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/http/ngx_http_header_filter_module.c	2019-06-29 01:59:04.877301702 +0300
 @@ -46,7 +46,7 @@
  };
 
@@ -230,9 +230,9 @@ diff -urN nginx-1.17.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.
  #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
      ngx_string("500 Internal Server Error"),
-diff -urN nginx-1.17.0-orig/src/http/ngx_http_special_response.c nginx-1.17.0/src/http/ngx_http_special_response.c
---- nginx-1.17.0-orig/src/http/ngx_http_special_response.c	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/http/ngx_http_special_response.c	2019-05-22 00:20:57.000000000 +0300
+diff -urN nginx-1.17.1-orig/src/http/ngx_http_special_response.c nginx-1.17.1/src/http/ngx_http_special_response.c
+--- nginx-1.17.1-orig/src/http/ngx_http_special_response.c	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/http/ngx_http_special_response.c	2019-06-29 01:59:04.882301662 +0300
 @@ -19,21 +19,21 @@
 
 
@@ -705,9 +705,9 @@ diff -urN nginx-1.17.0-orig/src/http/ngx_http_special_response.c nginx-1.17.0/sr
  #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
      ngx_string(ngx_http_error_494_page), /* 494, request header too large */
-diff -urN nginx-1.17.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.0/src/http/v2/ngx_http_v2_filter_module.c
---- nginx-1.17.0-orig/src/http/v2/ngx_http_v2_filter_module.c	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/http/v2/ngx_http_v2_filter_module.c	2019-05-22 00:06:31.627051871 +0300
+diff -urN nginx-1.17.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.1/src/http/v2/ngx_http_v2_filter_module.c
+--- nginx-1.17.1-orig/src/http/v2/ngx_http_v2_filter_module.c	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/http/v2/ngx_http_v2_filter_module.c	2019-06-29 01:59:04.888301614 +0300
 @@ -148,7 +148,7 @@
      ngx_http_core_srv_conf_t  *cscf;
      u_char                     addr[NGX_SOCKADDR_STRLEN];
@@ -726,9 +726,9 @@ diff -urN nginx-1.17.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.0
          }
 
          *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
-diff -urN nginx-1.17.0-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.0/src/os/unix/ngx_setproctitle.c
---- nginx-1.17.0-orig/src/os/unix/ngx_setproctitle.c	2019-05-21 17:23:57.000000000 +0300
-+++ nginx-1.17.0/src/os/unix/ngx_setproctitle.c	2019-05-22 00:06:31.632051826 +0300
+diff -urN nginx-1.17.1-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.1/src/os/unix/ngx_setproctitle.c
+--- nginx-1.17.1-orig/src/os/unix/ngx_setproctitle.c	2019-06-25 15:19:45.000000000 +0300
++++ nginx-1.17.1/src/os/unix/ngx_setproctitle.c	2019-06-29 01:59:04.894301566 +0300
 @@ -89,7 +89,7 @@
 
      ngx_os_argv[1] = NULL;

webkaos.spec

@@ -44,19 +44,19 @@
 %define service_name         %{name}
 %define service_home         %{_cachedir}/%{service_name}
 
-%define boring_commit        c12b7cda729f9a05e3bfb391e7e4273b0f342963
-%define lua_module_ver       0.10.14
+%define boring_commit        d6f9c359d219055a89c676cb8886421b145a08da
+%define lua_module_ver       0.10.15
 %define mh_module_ver        0.33
 %define pcre_ver             8.43
 %define zlib_ver             1.2.11
-%define luajit_ver           2.1-20190507
+%define luajit_ver           2.1-20190626
 
 ################################################################################
 
 Summary:              Superb high performance web server
 Name:                 webkaos
-Version:              1.17.0
-Release:              1%{?dist}
+Version:              1.17.1
+Release:              0%{?dist}
 License:              2-clause BSD-like license
 Group:                System Environment/Daemons
 URL:                  https://github.com/essentialkaos/webkaos
@@ -97,7 +97,7 @@ BuildRoot:            %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}
 Requires:             initscripts >= 8.36 kaosv >= 2.15
 Requires:             gd libXpm libxslt
 
-BuildRequires:        make perl cmake golang
+BuildRequires:        make perl cmake3 golang
 
 # http://mirror.centos.org/centos/6/sclo/x86_64/rh/devtoolset-3/
 # http://mirror.centos.org/centos/7/sclo/x86_64/rh/devtoolset-3/
@@ -202,7 +202,7 @@ export LUAJIT_INC="$LUAJIT2_DIR/include/luajit-2.1"
 mkdir boringssl/build
 
 pushd boringssl/build &> /dev/null
-  cmake ../
+  cmake3 ../
   %{__make} %{?_smp_mflags}
 popd
 
@@ -573,6 +573,13 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Sat Jun 29 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.1-0
+- Nginx updated to 1.17.1
+- BoringSSL updated to the latest version
+- LuaJIT updated to 2.1-20190626
+- Lua module updated to 0.10.15
+- Using cmake3 for BoringSSL build
+
 * Wed Jun 12 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.0-1
 - Init script improvements