From b10bdc6fc74968b98cd479d60077991621cec910 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 26 Jul 2018 16:20:09 +0300 Subject: [PATCH] Version 1.15.2 --- SOURCES/webkaos.patch | 58 +++++++++++++++++++++---------------------- webkaos.spec | 12 ++++++--- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/SOURCES/webkaos.patch b/SOURCES/webkaos.patch index e280f45..f9e841f 100644 --- a/SOURCES/webkaos.patch +++ b/SOURCES/webkaos.patch @@ -1,6 +1,6 @@ -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 +diff -urN nginx-1.15.2-orig/auto/lib/openssl/make nginx-1.15.2/auto/lib/openssl/make +--- nginx-1.15.2-orig/auto/lib/openssl/make 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/auto/lib/openssl/make 2018-07-26 15:08:05.484784550 +0300 @@ -45,18 +45,18 @@ /*) ngx_prefix="$OPENSSL/.openssl" ;; *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;; @@ -24,9 +24,9 @@ diff -urN nginx-1.15.1-orig/auto/lib/openssl/make nginx-1.15.1/auto/lib/openssl/ ;; esac -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 +diff -urN nginx-1.15.2-orig/src/core/nginx.c nginx-1.15.2/src/core/nginx.c +--- nginx-1.15.2-orig/src/core/nginx.c 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/core/nginx.c 2018-07-26 15:08:05.489784513 +0300 @@ -389,13 +389,13 @@ static void ngx_show_version_info(void) @@ -45,13 +45,13 @@ diff -urN nginx-1.15.1-orig/src/core/nginx.c nginx-1.15.1/src/core/nginx.c "Options:" NGX_LINEFEED " -?,-h : this help" NGX_LINEFEED " -v : show version and exit" NGX_LINEFEED -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 +diff -urN nginx-1.15.2-orig/src/core/nginx.h nginx-1.15.2/src/core/nginx.h +--- nginx-1.15.2-orig/src/core/nginx.h 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/core/nginx.h 2018-07-26 15:24:34.000000000 +0300 @@ -11,7 +11,7 @@ - #define nginx_version 1015001 - #define NGINX_VERSION "1.15.1" + #define nginx_version 1015002 + #define NGINX_VERSION "1.15.2" -#define NGINX_VER "nginx/" NGINX_VERSION +#define NGINX_VER "webkaos/" NGINX_VERSION @@ -66,9 +66,9 @@ diff -urN nginx-1.15.1-orig/src/core/nginx.h nginx-1.15.1/src/core/nginx.h #define NGX_OLDPID_EXT ".oldbin" -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 +diff -urN nginx-1.15.2-orig/src/core/ngx_log.c nginx-1.15.2/src/core/ngx_log.c +--- nginx-1.15.2-orig/src/core/ngx_log.c 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/core/ngx_log.c 2018-07-26 15:08:05.498784447 +0300 @@ -202,9 +202,9 @@ return; } @@ -99,9 +99,9 @@ diff -urN nginx-1.15.1-orig/src/core/ngx_log.c nginx-1.15.1/src/core/ngx_log.c return NGX_CONF_ERROR; #endif -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 +diff -urN nginx-1.15.2-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.2/src/http/modules/ngx_http_autoindex_module.c +--- nginx-1.15.2-orig/src/http/modules/ngx_http_autoindex_module.c 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/http/modules/ngx_http_autoindex_module.c 2018-07-26 15:08:05.503784410 +0300 @@ -451,9 +451,11 @@ ; @@ -177,9 +177,9 @@ diff -urN nginx-1.15.1-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.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 +diff -urN nginx-1.15.2-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.2/src/http/ngx_http_header_filter_module.c +--- nginx-1.15.2-orig/src/http/ngx_http_header_filter_module.c 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/http/ngx_http_header_filter_module.c 2018-07-26 15:08:05.508784374 +0300 @@ -46,7 +46,7 @@ }; @@ -230,9 +230,9 @@ diff -urN nginx-1.15.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.15. #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX) ngx_string("500 Internal Server Error"), -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 +diff -urN nginx-1.15.2-orig/src/http/ngx_http_special_response.c nginx-1.15.2/src/http/ngx_http_special_response.c +--- nginx-1.15.2-orig/src/http/ngx_http_special_response.c 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/http/ngx_http_special_response.c 2018-07-26 15:08:05.513784337 +0300 @@ -19,21 +19,21 @@ @@ -739,9 +739,9 @@ diff -urN nginx-1.15.1-orig/src/http/ngx_http_special_response.c nginx-1.15.1/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.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 +diff -urN nginx-1.15.2-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.2/src/http/v2/ngx_http_v2_filter_module.c +--- nginx-1.15.2-orig/src/http/v2/ngx_http_v2_filter_module.c 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/http/v2/ngx_http_v2_filter_module.c 2018-07-26 15:25:40.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.15.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.1 } *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX); -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 +diff -urN nginx-1.15.2-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.2/src/os/unix/ngx_setproctitle.c +--- nginx-1.15.2-orig/src/os/unix/ngx_setproctitle.c 2018-07-24 16:11:00.000000000 +0300 ++++ nginx-1.15.2/src/os/unix/ngx_setproctitle.c 2018-07-26 15:08:05.522784271 +0300 @@ -89,7 +89,7 @@ ngx_os_argv[1] = NULL; diff --git a/webkaos.spec b/webkaos.spec index fbfe61b..f27f1f3 100644 --- a/webkaos.spec +++ b/webkaos.spec @@ -51,7 +51,7 @@ %define service_name %{name} %define service_home %{_cachedir}/%{service_name} -%define boring_commit 2e74fdaa4a847a6ed2d89f57eaf9936e05bd5169 +%define boring_commit f3bfab0035fe671889250c1cc52973109bfc104f %define psol_ver 1.12.34.2 %define lua_module_ver 0.10.13 %define mh_module_ver 0.33 @@ -65,8 +65,8 @@ Summary: Superb high performance web server Name: webkaos -Version: 1.15.1 -Release: 1%{?dist} +Version: 1.15.2 +Release: 0%{?dist} License: 2-clause BSD-like license Group: System Environment/Daemons URL: https://github.com/essentialkaos/webkaos @@ -95,7 +95,7 @@ Source52: https://github.com/openresty/lua-nginx-module/archive/v%{l Source53: https://boringssl.googlesource.com/boringssl/+archive/%{boring_commit}.tar.gz Source54: https://github.com/openresty/headers-more-nginx-module/archive/v%{mh_module_ver}.tar.gz Source55: https://ftp.pcre.org/pub/pcre/pcre-%{pcre_ver}.tar.gz -Source56: http://zlib.net/zlib-%{zlib_ver}.tar.gz +Source56: https://zlib.net/zlib-%{zlib_ver}.tar.gz Patch0: %{name}.patch Patch1: mime.patch @@ -599,6 +599,10 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Jul 26 2018 Anton Novojilov - 1.15.2-0 +- Nginx updated to 1.15.2 +- BoringSSL updated to latest version + * Wed Jul 04 2018 Anton Novojilov - 1.15.1-1 - Dropped TLSv1 support - Dropped support of TLS_RSA_WITH_AES_256_CBC_SHA and