Skip to content

Commit 4dc9d61

Browse files
committed
Version 1.15.6
1 parent 295e0b0 commit 4dc9d61

File tree

2 files changed

+37
-32
lines changed

2 files changed

+37
-32
lines changed

SOURCES/webkaos.patch

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN nginx-1.15.5-orig/auto/lib/openssl/make nginx-1.15.5/auto/lib/openssl/make
2-
--- nginx-1.15.5-orig/auto/lib/openssl/make 2018-10-02 18:13:52.000000000 +0300
3-
+++ nginx-1.15.5/auto/lib/openssl/make 2018-10-02 21:04:04.832042352 +0300
1+
diff -urN nginx-1.15.6-orig/auto/lib/openssl/make nginx-1.15.6/auto/lib/openssl/make
2+
--- nginx-1.15.6-orig/auto/lib/openssl/make 2018-11-06 16:32:09.000000000 +0300
3+
+++ nginx-1.15.6/auto/lib/openssl/make 2018-11-08 00:25:05.654775814 +0300
44
@@ -45,18 +45,18 @@
55
/*) ngx_prefix="$OPENSSL/.openssl" ;;
66
*) 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/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.15.5-orig/src/core/nginx.c nginx-1.15.5/src/core/nginx.c
28-
--- nginx-1.15.5-orig/src/core/nginx.c 2018-10-02 18:13:52.000000000 +0300
29-
+++ nginx-1.15.5/src/core/nginx.c 2018-10-02 21:04:04.838042306 +0300
27+
diff -urN nginx-1.15.6-orig/src/core/nginx.c nginx-1.15.6/src/core/nginx.c
28+
--- nginx-1.15.6-orig/src/core/nginx.c 2018-11-06 16:32:09.000000000 +0300
29+
+++ nginx-1.15.6/src/core/nginx.c 2018-11-08 00:25:05.660775770 +0300
3030
@@ -389,13 +389,13 @@
3131
static void
3232
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
4545
"Options:" NGX_LINEFEED
4646
" -?,-h : this help" NGX_LINEFEED
4747
" -v : show version and exit" NGX_LINEFEED
48-
diff -urN nginx-1.15.5-orig/src/core/nginx.h nginx-1.15.5/src/core/nginx.h
49-
--- nginx-1.15.5-orig/src/core/nginx.h 2018-10-02 18:13:52.000000000 +0300
50-
+++ nginx-1.15.5/src/core/nginx.h 2018-10-02 21:04:41.000000000 +0300
48+
diff -urN nginx-1.15.6-orig/src/core/nginx.h nginx-1.15.6/src/core/nginx.h
49+
--- nginx-1.15.6-orig/src/core/nginx.h 2018-11-06 16:32:09.000000000 +0300
50+
+++ nginx-1.15.6/src/core/nginx.h 2018-11-08 00:24:53.000000000 +0300
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1015005
54-
#define NGINX_VERSION "1.15.5"
53+
#define nginx_version 1015006
54+
#define NGINX_VERSION "1.15.6"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

@@ -66,9 +66,9 @@ diff -urN nginx-1.15.5-orig/src/core/nginx.h nginx-1.15.5/src/core/nginx.h
6666
#define NGX_OLDPID_EXT ".oldbin"
6767

6868

69-
diff -urN nginx-1.15.5-orig/src/core/ngx_log.c nginx-1.15.5/src/core/ngx_log.c
70-
--- nginx-1.15.5-orig/src/core/ngx_log.c 2018-10-02 18:13:52.000000000 +0300
71-
+++ nginx-1.15.5/src/core/ngx_log.c 2018-10-02 21:04:04.847042237 +0300
69+
diff -urN nginx-1.15.6-orig/src/core/ngx_log.c nginx-1.15.6/src/core/ngx_log.c
70+
--- nginx-1.15.6-orig/src/core/ngx_log.c 2018-11-06 16:32:09.000000000 +0300
71+
+++ nginx-1.15.6/src/core/ngx_log.c 2018-11-08 00:25:05.668775711 +0300
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -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
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
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
103-
--- nginx-1.15.5-orig/src/http/modules/ngx_http_autoindex_module.c 2018-10-02 18:13:52.000000000 +0300
104-
+++ nginx-1.15.5/src/http/modules/ngx_http_autoindex_module.c 2018-10-02 21:04:04.852042198 +0300
102+
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
103+
--- nginx-1.15.6-orig/src/http/modules/ngx_http_autoindex_module.c 2018-11-06 16:32:09.000000000 +0300
104+
+++ nginx-1.15.6/src/http/modules/ngx_http_autoindex_module.c 2018-11-08 00:25:05.673775675 +0300
105105
@@ -451,9 +451,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.15.5-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
177177
tm.ngx_tm_mday,
178178
months[tm.ngx_tm_mon - 1],
179179
tm.ngx_tm_year,
180-
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
181-
--- nginx-1.15.5-orig/src/http/ngx_http_header_filter_module.c 2018-10-02 18:13:52.000000000 +0300
182-
+++ nginx-1.15.5/src/http/ngx_http_header_filter_module.c 2018-10-02 21:04:04.857042159 +0300
180+
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
181+
--- nginx-1.15.6-orig/src/http/ngx_http_header_filter_module.c 2018-11-06 16:32:09.000000000 +0300
182+
+++ nginx-1.15.6/src/http/ngx_http_header_filter_module.c 2018-11-08 00:25:05.678775638 +0300
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.15.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.
230230
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
231231

232232
ngx_string("500 Internal Server Error"),
233-
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
234-
--- nginx-1.15.5-orig/src/http/ngx_http_special_response.c 2018-10-02 18:13:52.000000000 +0300
235-
+++ nginx-1.15.5/src/http/ngx_http_special_response.c 2018-10-02 21:04:04.862042121 +0300
233+
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
234+
--- nginx-1.15.6-orig/src/http/ngx_http_special_response.c 2018-11-06 16:32:09.000000000 +0300
235+
+++ nginx-1.15.6/src/http/ngx_http_special_response.c 2018-11-08 00:25:05.684775594 +0300
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -705,9 +705,9 @@ diff -urN nginx-1.15.5-orig/src/http/ngx_http_special_response.c nginx-1.15.5/sr
705705
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
706706

707707
ngx_string(ngx_http_error_494_page), /* 494, request header too large */
708-
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
709-
--- nginx-1.15.5-orig/src/http/v2/ngx_http_v2_filter_module.c 2018-10-02 18:13:52.000000000 +0300
710-
+++ nginx-1.15.5/src/http/v2/ngx_http_v2_filter_module.c 2018-10-02 21:04:04.867042083 +0300
708+
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
709+
--- nginx-1.15.6-orig/src/http/v2/ngx_http_v2_filter_module.c 2018-11-06 16:32:09.000000000 +0300
710+
+++ nginx-1.15.6/src/http/v2/ngx_http_v2_filter_module.c 2018-11-08 00:25:05.689775557 +0300
711711
@@ -148,7 +148,7 @@
712712
ngx_http_core_srv_conf_t *cscf;
713713
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
726726
}
727727

728728
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
729-
diff -urN nginx-1.15.5-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.5/src/os/unix/ngx_setproctitle.c
730-
--- nginx-1.15.5-orig/src/os/unix/ngx_setproctitle.c 2018-10-02 18:13:52.000000000 +0300
731-
+++ nginx-1.15.5/src/os/unix/ngx_setproctitle.c 2018-10-02 21:04:04.872042044 +0300
729+
diff -urN nginx-1.15.6-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.6/src/os/unix/ngx_setproctitle.c
730+
--- nginx-1.15.6-orig/src/os/unix/ngx_setproctitle.c 2018-11-06 16:32:09.000000000 +0300
731+
+++ nginx-1.15.6/src/os/unix/ngx_setproctitle.c 2018-11-08 00:25:05.694775520 +0300
732732
@@ -89,7 +89,7 @@
733733

734734
ngx_os_argv[1] = NULL;

webkaos.spec

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
%define service_name %{name}
4545
%define service_home %{_cachedir}/%{service_name}
4646

47-
%define boring_commit e1ee0f5b477a2ed39e810384f98aa5e587bb2e37
47+
%define boring_commit 384d0eaf1930af1ebc47eda751f0c78dfcba1c03
4848
%define psol_ver 1.12.34.2
4949
%define lua_module_ver 0.10.13
5050
%define mh_module_ver 0.33
@@ -55,8 +55,8 @@
5555

5656
Summary: Superb high performance web server
5757
Name: webkaos
58-
Version: 1.15.5
59-
Release: 1%{?dist}
58+
Version: 1.15.6
59+
Release: 0%{?dist}
6060
License: 2-clause BSD-like license
6161
Group: System Environment/Daemons
6262
URL: https://github.com/essentialkaos/webkaos
@@ -559,6 +559,11 @@ rm -rf %{buildroot}
559559
################################################################################
560560

561561
%changelog
562+
* Thu Nov 08 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.6-0
563+
- Nginx updated to 1.15.6 with fixes for CVE-2018-16843, CVE-2018-16844
564+
and CVE-2018-16845
565+
- BoringSSL updated to the latest version
566+
562567
* Wed Oct 03 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.5-1
563568
- BoringSSL updated to the latest version
564569

0 commit comments

Comments
 (0)