From 4dc9d61ecf9bb76e7e6bd47c9f169621e1cdbbd8 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 8 Nov 2018 01:08:17 +0300 Subject: [PATCH] Version 1.15.6 --- SOURCES/webkaos.patch | 58 +++++++++++++++++++++---------------------- webkaos.spec | 11 +++++--- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/SOURCES/webkaos.patch b/SOURCES/webkaos.patch index c696344..66f6d66 100644 --- a/SOURCES/webkaos.patch +++ b/SOURCES/webkaos.patch @@ -1,6 +1,6 @@ -diff -urN nginx-1.15.5-orig/auto/lib/openssl/make nginx-1.15.5/auto/lib/openssl/make ---- nginx-1.15.5-orig/auto/lib/openssl/make 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/auto/lib/openssl/make 2018-10-02 21:04:04.832042352 +0300 +diff -urN nginx-1.15.6-orig/auto/lib/openssl/make nginx-1.15.6/auto/lib/openssl/make +--- nginx-1.15.6-orig/auto/lib/openssl/make 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/auto/lib/openssl/make 2018-11-08 00:25:05.654775814 +0300 @@ -45,18 +45,18 @@ /*) ngx_prefix="$OPENSSL/.openssl" ;; *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;; @@ -24,9 +24,9 @@ diff -urN nginx-1.15.5-orig/auto/lib/openssl/make nginx-1.15.5/auto/lib/openssl/ ;; esac -diff -urN nginx-1.15.5-orig/src/core/nginx.c nginx-1.15.5/src/core/nginx.c ---- nginx-1.15.5-orig/src/core/nginx.c 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/core/nginx.c 2018-10-02 21:04:04.838042306 +0300 +diff -urN nginx-1.15.6-orig/src/core/nginx.c nginx-1.15.6/src/core/nginx.c +--- nginx-1.15.6-orig/src/core/nginx.c 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/core/nginx.c 2018-11-08 00:25:05.660775770 +0300 @@ -389,13 +389,13 @@ static void ngx_show_version_info(void) @@ -45,13 +45,13 @@ diff -urN nginx-1.15.5-orig/src/core/nginx.c nginx-1.15.5/src/core/nginx.c "Options:" NGX_LINEFEED " -?,-h : this help" NGX_LINEFEED " -v : show version and exit" NGX_LINEFEED -diff -urN nginx-1.15.5-orig/src/core/nginx.h nginx-1.15.5/src/core/nginx.h ---- nginx-1.15.5-orig/src/core/nginx.h 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/core/nginx.h 2018-10-02 21:04:41.000000000 +0300 +diff -urN nginx-1.15.6-orig/src/core/nginx.h nginx-1.15.6/src/core/nginx.h +--- nginx-1.15.6-orig/src/core/nginx.h 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/core/nginx.h 2018-11-08 00:24:53.000000000 +0300 @@ -11,7 +11,7 @@ - #define nginx_version 1015005 - #define NGINX_VERSION "1.15.5" + #define nginx_version 1015006 + #define NGINX_VERSION "1.15.6" -#define NGINX_VER "nginx/" NGINX_VERSION +#define NGINX_VER "webkaos/" NGINX_VERSION @@ -66,9 +66,9 @@ diff -urN nginx-1.15.5-orig/src/core/nginx.h nginx-1.15.5/src/core/nginx.h #define NGX_OLDPID_EXT ".oldbin" -diff -urN nginx-1.15.5-orig/src/core/ngx_log.c nginx-1.15.5/src/core/ngx_log.c ---- nginx-1.15.5-orig/src/core/ngx_log.c 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/core/ngx_log.c 2018-10-02 21:04:04.847042237 +0300 +diff -urN nginx-1.15.6-orig/src/core/ngx_log.c nginx-1.15.6/src/core/ngx_log.c +--- nginx-1.15.6-orig/src/core/ngx_log.c 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/core/ngx_log.c 2018-11-08 00:25:05.668775711 +0300 @@ -202,9 +202,9 @@ return; } @@ -99,9 +99,9 @@ diff -urN nginx-1.15.5-orig/src/core/ngx_log.c nginx-1.15.5/src/core/ngx_log.c return NGX_CONF_ERROR; #endif -diff -urN nginx-1.15.5-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.5/src/http/modules/ngx_http_autoindex_module.c ---- nginx-1.15.5-orig/src/http/modules/ngx_http_autoindex_module.c 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/http/modules/ngx_http_autoindex_module.c 2018-10-02 21:04:04.852042198 +0300 +diff -urN nginx-1.15.6-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.6/src/http/modules/ngx_http_autoindex_module.c +--- nginx-1.15.6-orig/src/http/modules/ngx_http_autoindex_module.c 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/http/modules/ngx_http_autoindex_module.c 2018-11-08 00:25:05.673775675 +0300 @@ -451,9 +451,11 @@ ; @@ -177,9 +177,9 @@ diff -urN nginx-1.15.5-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.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.5/src/http/ngx_http_header_filter_module.c ---- nginx-1.15.5-orig/src/http/ngx_http_header_filter_module.c 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/http/ngx_http_header_filter_module.c 2018-10-02 21:04:04.857042159 +0300 +diff -urN nginx-1.15.6-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.6/src/http/ngx_http_header_filter_module.c +--- nginx-1.15.6-orig/src/http/ngx_http_header_filter_module.c 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/http/ngx_http_header_filter_module.c 2018-11-08 00:25:05.678775638 +0300 @@ -46,7 +46,7 @@ }; @@ -230,9 +230,9 @@ diff -urN nginx-1.15.5-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.5-orig/src/http/ngx_http_special_response.c nginx-1.15.5/src/http/ngx_http_special_response.c ---- nginx-1.15.5-orig/src/http/ngx_http_special_response.c 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/http/ngx_http_special_response.c 2018-10-02 21:04:04.862042121 +0300 +diff -urN nginx-1.15.6-orig/src/http/ngx_http_special_response.c nginx-1.15.6/src/http/ngx_http_special_response.c +--- nginx-1.15.6-orig/src/http/ngx_http_special_response.c 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/http/ngx_http_special_response.c 2018-11-08 00:25:05.684775594 +0300 @@ -19,21 +19,21 @@ @@ -705,9 +705,9 @@ diff -urN nginx-1.15.5-orig/src/http/ngx_http_special_response.c nginx-1.15.5/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.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.5/src/http/v2/ngx_http_v2_filter_module.c ---- nginx-1.15.5-orig/src/http/v2/ngx_http_v2_filter_module.c 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/http/v2/ngx_http_v2_filter_module.c 2018-10-02 21:04:04.867042083 +0300 +diff -urN nginx-1.15.6-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.6/src/http/v2/ngx_http_v2_filter_module.c +--- nginx-1.15.6-orig/src/http/v2/ngx_http_v2_filter_module.c 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/http/v2/ngx_http_v2_filter_module.c 2018-11-08 00:25:05.689775557 +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.15.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.5 } *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX); -diff -urN nginx-1.15.5-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.5/src/os/unix/ngx_setproctitle.c ---- nginx-1.15.5-orig/src/os/unix/ngx_setproctitle.c 2018-10-02 18:13:52.000000000 +0300 -+++ nginx-1.15.5/src/os/unix/ngx_setproctitle.c 2018-10-02 21:04:04.872042044 +0300 +diff -urN nginx-1.15.6-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.6/src/os/unix/ngx_setproctitle.c +--- nginx-1.15.6-orig/src/os/unix/ngx_setproctitle.c 2018-11-06 16:32:09.000000000 +0300 ++++ nginx-1.15.6/src/os/unix/ngx_setproctitle.c 2018-11-08 00:25:05.694775520 +0300 @@ -89,7 +89,7 @@ ngx_os_argv[1] = NULL; diff --git a/webkaos.spec b/webkaos.spec index 02db4a7..8fd90e9 100644 --- a/webkaos.spec +++ b/webkaos.spec @@ -44,7 +44,7 @@ %define service_name %{name} %define service_home %{_cachedir}/%{service_name} -%define boring_commit e1ee0f5b477a2ed39e810384f98aa5e587bb2e37 +%define boring_commit 384d0eaf1930af1ebc47eda751f0c78dfcba1c03 %define psol_ver 1.12.34.2 %define lua_module_ver 0.10.13 %define mh_module_ver 0.33 @@ -55,8 +55,8 @@ Summary: Superb high performance web server Name: webkaos -Version: 1.15.5 -Release: 1%{?dist} +Version: 1.15.6 +Release: 0%{?dist} License: 2-clause BSD-like license Group: System Environment/Daemons URL: https://github.com/essentialkaos/webkaos @@ -559,6 +559,11 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Thu Nov 08 2018 Anton Novojilov - 1.15.6-0 +- Nginx updated to 1.15.6 with fixes for CVE-2018-16843, CVE-2018-16844 + and CVE-2018-16845 +- BoringSSL updated to the latest version + * Wed Oct 03 2018 Anton Novojilov - 1.15.5-1 - BoringSSL updated to the latest version