Merge pull request #65 from essentialkaos/develop

Version 1.15.1
essentialkaos · Jul 3, 2018 · 112126c · 112126c
2 parents 8a647f6 + e8f0c15
commit 112126c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 37 deletions.
diff --git a/SOURCES/mime.patch b/SOURCES/mime.patch
@@ -1,6 +1,6 @@
-diff -urN nginx-1.13.6-orig/conf/mime.types nginx-1.13.6/conf/mime.types
---- nginx-1.13.6-orig/conf/mime.types	2017-10-10 17:22:51.000000000 +0200
-+++ nginx-1.13.6/conf/mime.types	2017-10-14 00:16:51.000000000 +0200
+diff -urN nginx-1.15.1-orig/conf/mime.types nginx-1.15.1/conf/mime.types
+--- nginx-1.15.1-orig/conf/mime.types	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/conf/mime.types	2018-07-04 02:10:22.000000000 +0300
 @@ -16,7 +16,7 @@
      text/x-component                                 htc;
 
@@ -16,6 +16,6 @@ diff -urN nginx-1.13.6-orig/conf/mime.types nginx-1.13.6/conf/mime.types
 
 +    application/x-font-ttf                           ttf;
 +    application/vnd.ms-opentype                      otf;
-     application/font-woff                            woff;
-     application/java-archive                         jar war ear;
-     application/json                                 json;
+     font/woff                                        woff;
+     font/woff2                                       woff2;
+
diff --git a/SOURCES/webkaos.patch b/SOURCES/webkaos.patch
@@ -1,6 +1,6 @@
-diff -urN nginx-1.14.0-orig/auto/lib/openssl/make nginx-1.14.0/auto/lib/openssl/make
---- nginx-1.14.0-orig/auto/lib/openssl/make	2018-05-31 14:30:07.808697638 +0300
-+++ nginx-1.14.0/auto/lib/openssl/make	2018-05-31 14:30:20.309595197 +0300
+diff -urN nginx-1.15.1-orig/auto/lib/openssl/make nginx-1.15.1/auto/lib/openssl/make
+--- nginx-1.15.1-orig/auto/lib/openssl/make	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/auto/lib/openssl/make	2018-07-04 01:39:45.552129243 +0300
 @@ -45,18 +45,18 @@
              /*) ngx_prefix="$OPENSSL/.openssl" ;;
              *)  ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.14.0-orig/auto/lib/openssl/make nginx-1.14.0/auto/lib/openssl/
      ;;
 
  esac
-diff -urN nginx-1.14.0-orig/src/core/nginx.c nginx-1.14.0/src/core/nginx.c
---- nginx-1.14.0-orig/src/core/nginx.c	2018-05-31 14:30:07.812697605 +0300
-+++ nginx-1.14.0/src/core/nginx.c	2018-05-31 14:30:20.316595139 +0300
+diff -urN nginx-1.15.1-orig/src/core/nginx.c nginx-1.15.1/src/core/nginx.c
+--- nginx-1.15.1-orig/src/core/nginx.c	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/core/nginx.c	2018-07-04 01:39:45.558129194 +0300
 @@ -389,13 +389,13 @@
  static void
  ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.14.0-orig/src/core/nginx.c nginx-1.14.0/src/core/nginx.c
              "Options:" NGX_LINEFEED
              "  -?,-h         : this help" NGX_LINEFEED
              "  -v            : show version and exit" NGX_LINEFEED
-diff -urN nginx-1.14.0-orig/src/core/nginx.h nginx-1.14.0/src/core/nginx.h
---- nginx-1.14.0-orig/src/core/nginx.h	2018-05-31 14:30:07.812697605 +0300
-+++ nginx-1.14.0/src/core/nginx.h	2018-05-31 14:30:58.000000000 +0300
+diff -urN nginx-1.15.1-orig/src/core/nginx.h nginx-1.15.1/src/core/nginx.h
+--- nginx-1.15.1-orig/src/core/nginx.h	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/core/nginx.h	2018-07-04 01:40:37.000000000 +0300
 @@ -11,7 +11,7 @@
 
- #define nginx_version      1014000
- #define NGINX_VERSION      "1.14.0"
+ #define nginx_version      1015001
+ #define NGINX_VERSION      "1.15.1"
 -#define NGINX_VER          "nginx/" NGINX_VERSION
 +#define NGINX_VER          "webkaos/" NGINX_VERSION
 
@@ -66,9 +66,9 @@ diff -urN nginx-1.14.0-orig/src/core/nginx.h nginx-1.14.0/src/core/nginx.h
  #define NGX_OLDPID_EXT     ".oldbin"
 
 
-diff -urN nginx-1.14.0-orig/src/core/ngx_log.c nginx-1.14.0/src/core/ngx_log.c
---- nginx-1.14.0-orig/src/core/ngx_log.c	2018-05-31 14:30:07.814697588 +0300
-+++ nginx-1.14.0/src/core/ngx_log.c	2018-05-31 14:30:20.326595057 +0300
+diff -urN nginx-1.15.1-orig/src/core/ngx_log.c nginx-1.15.1/src/core/ngx_log.c
+--- nginx-1.15.1-orig/src/core/ngx_log.c	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/core/ngx_log.c	2018-07-04 01:39:45.566129129 +0300
 @@ -202,9 +202,9 @@
          return;
      }
@@ -99,9 +99,9 @@ diff -urN nginx-1.14.0-orig/src/core/ngx_log.c nginx-1.14.0/src/core/ngx_log.c
          return NGX_CONF_ERROR;
  #endif
 
-diff -urN nginx-1.14.0-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.14.0/src/http/modules/ngx_http_autoindex_module.c
---- nginx-1.14.0-orig/src/http/modules/ngx_http_autoindex_module.c	2018-05-31 14:30:07.819697547 +0300
-+++ nginx-1.14.0/src/http/modules/ngx_http_autoindex_module.c	2018-05-31 14:30:20.332595008 +0300
+diff -urN nginx-1.15.1-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.1/src/http/modules/ngx_http_autoindex_module.c
+--- nginx-1.15.1-orig/src/http/modules/ngx_http_autoindex_module.c	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/http/modules/ngx_http_autoindex_module.c	2018-07-04 01:39:45.571129088 +0300
 @@ -451,9 +451,11 @@
      ;
 
@@ -177,9 +177,9 @@ diff -urN nginx-1.14.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.14.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.14.0/src/http/ngx_http_header_filter_module.c
---- nginx-1.14.0-orig/src/http/ngx_http_header_filter_module.c	2018-05-31 14:30:07.826697490 +0300
-+++ nginx-1.14.0/src/http/ngx_http_header_filter_module.c	2018-05-31 14:30:20.337594967 +0300
+diff -urN nginx-1.15.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.1/src/http/ngx_http_header_filter_module.c
+--- nginx-1.15.1-orig/src/http/ngx_http_header_filter_module.c	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/http/ngx_http_header_filter_module.c	2018-07-04 01:39:45.576129048 +0300
 @@ -46,7 +46,7 @@
  };
 
@@ -230,9 +230,9 @@ diff -urN nginx-1.14.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.14.
  #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
      ngx_string("500 Internal Server Error"),
-diff -urN nginx-1.14.0-orig/src/http/ngx_http_special_response.c nginx-1.14.0/src/http/ngx_http_special_response.c
---- nginx-1.14.0-orig/src/http/ngx_http_special_response.c	2018-05-31 14:30:07.826697490 +0300
-+++ nginx-1.14.0/src/http/ngx_http_special_response.c	2018-05-31 14:30:20.343594918 +0300
+diff -urN nginx-1.15.1-orig/src/http/ngx_http_special_response.c nginx-1.15.1/src/http/ngx_http_special_response.c
+--- nginx-1.15.1-orig/src/http/ngx_http_special_response.c	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/http/ngx_http_special_response.c	2018-07-04 01:39:45.581129007 +0300
 @@ -19,21 +19,21 @@
 
 
@@ -739,9 +739,9 @@ diff -urN nginx-1.14.0-orig/src/http/ngx_http_special_response.c nginx-1.14.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.14.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.14.0/src/http/v2/ngx_http_v2_filter_module.c
---- nginx-1.14.0-orig/src/http/v2/ngx_http_v2_filter_module.c	2018-05-31 14:30:07.827697481 +0300
-+++ nginx-1.14.0/src/http/v2/ngx_http_v2_filter_module.c	2018-05-31 14:30:20.349594869 +0300
+diff -urN nginx-1.15.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.1/src/http/v2/ngx_http_v2_filter_module.c
+--- nginx-1.15.1-orig/src/http/v2/ngx_http_v2_filter_module.c	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/http/v2/ngx_http_v2_filter_module.c	2018-07-04 01:47:55.000000000 +0300
 @@ -148,7 +148,7 @@
      ngx_http_core_srv_conf_t  *cscf;
      u_char                     addr[NGX_SOCKADDR_STRLEN];
@@ -760,9 +760,9 @@ diff -urN nginx-1.14.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.14.0
          }
 
          *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
-diff -urN nginx-1.14.0-orig/src/os/unix/ngx_setproctitle.c nginx-1.14.0/src/os/unix/ngx_setproctitle.c
---- nginx-1.14.0-orig/src/os/unix/ngx_setproctitle.c	2018-05-31 14:30:07.832697440 +0300
-+++ nginx-1.14.0/src/os/unix/ngx_setproctitle.c	2018-05-31 14:30:20.354594828 +0300
+diff -urN nginx-1.15.1-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.1/src/os/unix/ngx_setproctitle.c
+--- nginx-1.15.1-orig/src/os/unix/ngx_setproctitle.c	2018-07-03 18:07:44.000000000 +0300
++++ nginx-1.15.1/src/os/unix/ngx_setproctitle.c	2018-07-04 01:39:45.590128934 +0300
 @@ -89,7 +89,7 @@
 
      ngx_os_argv[1] = NULL;

diff --git a/webkaos.spec b/webkaos.spec
@@ -51,7 +51,7 @@
 %define service_name         %{name}
 %define service_home         %{_cachedir}/%{service_name}
 
-%define boring_commit        fe7a17440fe7560511615c6bd59d299a0e5d45a4
+%define boring_commit        2e74fdaa4a847a6ed2d89f57eaf9936e05bd5169
 %define psol_ver             1.12.34.2
 %define lua_module_ver       0.10.13
 %define mh_module_ver        0.33
@@ -65,7 +65,7 @@
 
 Summary:              Superb high performance web server
 Name:                 webkaos
-Version:              1.14.0
+Version:              1.15.1
 Release:              0%{?dist}
 License:              2-clause BSD-like license
 Group:                System Environment/Daemons
@@ -599,6 +599,10 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Wed Jul 04 2018 Anton Novojilov <[email protected]> - 1.15.1-0
+- Nginx updated to 1.15.1
+- BoringSSL updated to latest version
+
 * Thu May 31 2018 Anton Novojilov <[email protected]> - 1.14.0-0
 - Nginx updated to 1.14.0
 - Lua module updated to 0.10.13