Merge pull request #45 from essentialkaos/develop

Version 1.13.5

Author: andyone

SOURCES/webkaos.patch

@@ -1,6 +1,6 @@
-diff -urN nginx-1.13.4-orig/auto/lib/openssl/make nginx-1.13.4/auto/lib/openssl/make
---- nginx-1.13.4-orig/auto/lib/openssl/make	2017-08-10 00:31:54.210110415 +0200
-+++ nginx-1.13.4/auto/lib/openssl/make	2017-08-10 00:34:07.150096910 +0200
+diff -urN nginx-1.13.5-orig/auto/lib/openssl/make nginx-1.13.5/auto/lib/openssl/make
+--- nginx-1.13.5-orig/auto/lib/openssl/make	2017-09-20 00:21:12.127130775 +0200
++++ nginx-1.13.5/auto/lib/openssl/make	2017-09-20 00:22:44.417126771 +0200
 @@ -45,18 +45,18 @@
              /*) ngx_prefix="$OPENSSL/.openssl" ;;
              *)  ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.13.4-orig/auto/lib/openssl/make nginx-1.13.4/auto/lib/openssl/
      ;;
 
  esac
-diff -urN nginx-1.13.4-orig/src/core/nginx.c nginx-1.13.4/src/core/nginx.c
---- nginx-1.13.4-orig/src/core/nginx.c	2017-08-10 00:31:54.255110544 +0200
-+++ nginx-1.13.4/src/core/nginx.c	2017-08-10 00:36:57.000000000 +0200
+diff -urN nginx-1.13.5-orig/src/core/nginx.c nginx-1.13.5/src/core/nginx.c
+--- nginx-1.13.5-orig/src/core/nginx.c	2017-09-20 00:21:12.181130543 +0200
++++ nginx-1.13.5/src/core/nginx.c	2017-09-20 00:22:44.446127321 +0200
 @@ -388,13 +388,13 @@
  static void
  ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.13.4-orig/src/core/nginx.c nginx-1.13.4/src/core/nginx.c
              "Options:" NGX_LINEFEED
              "  -?,-h         : this help" NGX_LINEFEED
              "  -v            : show version and exit" NGX_LINEFEED
-diff -urN nginx-1.13.4-orig/src/core/nginx.h nginx-1.13.4/src/core/nginx.h
---- nginx-1.13.4-orig/src/core/nginx.h	2017-08-10 00:31:54.258110546 +0200
-+++ nginx-1.13.4/src/core/nginx.h	2017-08-10 00:35:31.000000000 +0200
+diff -urN nginx-1.13.5-orig/src/core/nginx.h nginx-1.13.5/src/core/nginx.h
+--- nginx-1.13.5-orig/src/core/nginx.h	2017-09-20 00:21:12.184130543 +0200
++++ nginx-1.13.5/src/core/nginx.h	2017-09-20 00:24:09.000000000 +0200
 @@ -11,7 +11,7 @@
 
- #define nginx_version      1013004
- #define NGINX_VERSION      "1.13.4"
+ #define nginx_version      1013005
+ #define NGINX_VERSION      "1.13.5"
 -#define NGINX_VER          "nginx/" NGINX_VERSION
 +#define NGINX_VER          "webkaos/" NGINX_VERSION
 
@@ -66,9 +66,9 @@ diff -urN nginx-1.13.4-orig/src/core/nginx.h nginx-1.13.4/src/core/nginx.h
  #define NGX_OLDPID_EXT     ".oldbin"
 
 
-diff -urN nginx-1.13.4-orig/src/core/ngx_log.c nginx-1.13.4/src/core/ngx_log.c
---- nginx-1.13.4-orig/src/core/ngx_log.c	2017-08-10 00:31:54.258110546 +0200
-+++ nginx-1.13.4/src/core/ngx_log.c	2017-08-10 00:34:07.182096906 +0200
+diff -urN nginx-1.13.5-orig/src/core/ngx_log.c nginx-1.13.5/src/core/ngx_log.c
+--- nginx-1.13.5-orig/src/core/ngx_log.c	2017-09-20 00:21:12.183130543 +0200
++++ nginx-1.13.5/src/core/ngx_log.c	2017-09-20 00:22:44.471127303 +0200
 @@ -202,9 +202,9 @@
          return;
      }
@@ -99,9 +99,9 @@ diff -urN nginx-1.13.4-orig/src/core/ngx_log.c nginx-1.13.4/src/core/ngx_log.c
          return NGX_CONF_ERROR;
  #endif
 
-diff -urN nginx-1.13.4-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.4/src/http/modules/ngx_http_autoindex_module.c
---- nginx-1.13.4-orig/src/http/modules/ngx_http_autoindex_module.c	2017-08-10 00:31:54.240110547 +0200
-+++ nginx-1.13.4/src/http/modules/ngx_http_autoindex_module.c	2017-08-10 00:34:07.197096905 +0200
+diff -urN nginx-1.13.5-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.5/src/http/modules/ngx_http_autoindex_module.c
+--- nginx-1.13.5-orig/src/http/modules/ngx_http_autoindex_module.c	2017-09-20 00:21:12.160130543 +0200
++++ nginx-1.13.5/src/http/modules/ngx_http_autoindex_module.c	2017-09-20 00:22:44.487127303 +0200
 @@ -445,9 +445,11 @@
      ;
 
@@ -177,9 +177,9 @@ diff -urN nginx-1.13.4-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.13.4-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.4/src/http/ngx_http_header_filter_module.c
---- nginx-1.13.4-orig/src/http/ngx_http_header_filter_module.c	2017-08-10 00:31:54.248110546 +0200
-+++ nginx-1.13.4/src/http/ngx_http_header_filter_module.c	2017-08-21 00:13:36.000000000 +0200
+diff -urN nginx-1.13.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.5/src/http/ngx_http_header_filter_module.c
+--- nginx-1.13.5-orig/src/http/ngx_http_header_filter_module.c	2017-09-20 00:21:12.172130543 +0200
++++ nginx-1.13.5/src/http/ngx_http_header_filter_module.c	2017-09-20 00:22:44.507127300 +0200
 @@ -46,7 +46,7 @@
  };
 
@@ -230,9 +230,9 @@ diff -urN nginx-1.13.4-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.
  #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
      ngx_string("500 Internal Server Error"),
-diff -urN nginx-1.13.4-orig/src/http/ngx_http_special_response.c nginx-1.13.4/src/http/ngx_http_special_response.c
---- nginx-1.13.4-orig/src/http/ngx_http_special_response.c	2017-08-10 00:31:54.249110547 +0200
-+++ nginx-1.13.4/src/http/ngx_http_special_response.c	2017-08-21 00:11:47.000000000 +0200
+diff -urN nginx-1.13.5-orig/src/http/ngx_http_special_response.c nginx-1.13.5/src/http/ngx_http_special_response.c
+--- nginx-1.13.5-orig/src/http/ngx_http_special_response.c	2017-09-20 00:21:12.172130543 +0200
++++ nginx-1.13.5/src/http/ngx_http_special_response.c	2017-09-20 00:22:44.526127301 +0200
 @@ -19,21 +19,21 @@
 
 
@@ -739,9 +739,9 @@ diff -urN nginx-1.13.4-orig/src/http/ngx_http_special_response.c nginx-1.13.4/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.13.4-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.4/src/http/v2/ngx_http_v2_filter_module.c
---- nginx-1.13.4-orig/src/http/v2/ngx_http_v2_filter_module.c	2017-08-10 00:31:54.251110547 +0200
-+++ nginx-1.13.4/src/http/v2/ngx_http_v2_filter_module.c	2017-08-10 00:34:07.236096899 +0200
+diff -urN nginx-1.13.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.5/src/http/v2/ngx_http_v2_filter_module.c
+--- nginx-1.13.5-orig/src/http/v2/ngx_http_v2_filter_module.c	2017-09-20 00:21:12.177130542 +0200
++++ nginx-1.13.5/src/http/v2/ngx_http_v2_filter_module.c	2017-09-20 00:22:44.555127300 +0200
 @@ -143,7 +143,7 @@
      ngx_http_core_srv_conf_t  *cscf;
      u_char                     addr[NGX_SOCKADDR_STRLEN];
@@ -760,9 +760,9 @@ diff -urN nginx-1.13.4-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.4
          }
 
          *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
-diff -urN nginx-1.13.4-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.4/src/os/unix/ngx_setproctitle.c
---- nginx-1.13.4-orig/src/os/unix/ngx_setproctitle.c	2017-08-10 00:31:54.220110552 +0200
-+++ nginx-1.13.4/src/os/unix/ngx_setproctitle.c	2017-08-10 00:34:07.248096899 +0200
+diff -urN nginx-1.13.5-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.5/src/os/unix/ngx_setproctitle.c
+--- nginx-1.13.5-orig/src/os/unix/ngx_setproctitle.c	2017-09-20 00:21:12.138130570 +0200
++++ nginx-1.13.5/src/os/unix/ngx_setproctitle.c	2017-09-20 00:22:44.569127301 +0200
 @@ -89,7 +89,7 @@
 
      ngx_os_argv[1] = NULL;

webkaos.spec

@@ -44,7 +44,7 @@
 %define service_name         %{name}
 %define service_home         %{_cachedir}/%{service_name}
 
-%define boring_commit        ca9e8f52f1631fa4906a0d44abdeb55f80fe026d
+%define boring_commit        40b24c81546f44cfc840715e8a1c1b5060d313f3
 %define psol_ver             1.12.34.2
 %define lua_module_ver       0.10.10
 %define mh_module_ver        0.32
@@ -58,8 +58,8 @@
 
 Summary:              Superb high performance web server
 Name:                 webkaos
-Version:              1.13.4
-Release:              2%{?dist}
+Version:              1.13.5
+Release:              0%{?dist}
 License:              2-clause BSD-like license
 Group:                System Environment/Daemons
 Vendor:               Nginx / Google / CloudFlare / ESSENTIALKAOS
@@ -585,6 +585,10 @@ rm -rf %{buildroot}
 ###############################################################################
 
 %changelog
+* Wed Sep 20 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.5-0
+- Nginx updated to 1.13.5
+- BoringSSL updated to latest version
+
 * Mon Aug 21 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.4-2
 - Added support of HTTP status code 418 (I'm a teapot)