Skip to content

Commit 0403337

Browse files
andyoneandyone
authored
Merge pull request #94 from essentialkaos/develop
Version 1.17.6
2 parents 939ba13 + c022b31 commit 0403337

File tree

2 files changed

+35
-32
lines changed

2 files changed

+35
-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.17.5-orig/auto/lib/openssl/make nginx-1.17.5/auto/lib/openssl/make
2-
--- nginx-1.17.5-orig/auto/lib/openssl/make 2019-10-22 18:16:08.000000000 +0300
3-
+++ nginx-1.17.5/auto/lib/openssl/make 2019-11-08 15:01:50.075606846 +0300
1+
diff -urN nginx-1.17.6-orig/auto/lib/openssl/make nginx-1.17.6/auto/lib/openssl/make
2+
--- nginx-1.17.6-orig/auto/lib/openssl/make 2019-11-19 17:18:58.000000000 +0300
3+
+++ nginx-1.17.6/auto/lib/openssl/make 2019-11-20 12:27:32.873781845 +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.17.5-orig/auto/lib/openssl/make nginx-1.17.5/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.17.5-orig/src/core/nginx.c nginx-1.17.5/src/core/nginx.c
28-
--- nginx-1.17.5-orig/src/core/nginx.c 2019-10-22 18:16:08.000000000 +0300
29-
+++ nginx-1.17.5/src/core/nginx.c 2019-11-08 15:01:50.081606793 +0300
27+
diff -urN nginx-1.17.6-orig/src/core/nginx.c nginx-1.17.6/src/core/nginx.c
28+
--- nginx-1.17.6-orig/src/core/nginx.c 2019-11-19 17:18:58.000000000 +0300
29+
+++ nginx-1.17.6/src/core/nginx.c 2019-11-20 12:27:32.879781790 +0300
3030
@@ -389,13 +389,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.17.5-orig/src/core/nginx.c nginx-1.17.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.17.5-orig/src/core/nginx.h nginx-1.17.5/src/core/nginx.h
49-
--- nginx-1.17.5-orig/src/core/nginx.h 2019-10-22 18:16:08.000000000 +0300
50-
+++ nginx-1.17.5/src/core/nginx.h 2019-11-08 15:02:19.000000000 +0300
48+
diff -urN nginx-1.17.6-orig/src/core/nginx.h nginx-1.17.6/src/core/nginx.h
49+
--- nginx-1.17.6-orig/src/core/nginx.h 2019-11-19 17:18:58.000000000 +0300
50+
+++ nginx-1.17.6/src/core/nginx.h 2019-11-20 12:28:08.000000000 +0300
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1017005
54-
#define NGINX_VERSION "1.17.5"
53+
#define nginx_version 1017006
54+
#define NGINX_VERSION "1.17.6"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

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

6868

69-
diff -urN nginx-1.17.5-orig/src/core/ngx_log.c nginx-1.17.5/src/core/ngx_log.c
70-
--- nginx-1.17.5-orig/src/core/ngx_log.c 2019-10-22 18:16:08.000000000 +0300
71-
+++ nginx-1.17.5/src/core/ngx_log.c 2019-11-08 15:01:50.091606704 +0300
69+
diff -urN nginx-1.17.6-orig/src/core/ngx_log.c nginx-1.17.6/src/core/ngx_log.c
70+
--- nginx-1.17.6-orig/src/core/ngx_log.c 2019-11-19 17:18:58.000000000 +0300
71+
+++ nginx-1.17.6/src/core/ngx_log.c 2019-11-20 12:27:32.889781700 +0300
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.17.5-orig/src/core/ngx_log.c nginx-1.17.5/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.17.5-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.5/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.17.5-orig/src/http/modules/ngx_http_autoindex_module.c 2019-10-22 18:16:08.000000000 +0300
104-
+++ nginx-1.17.5/src/http/modules/ngx_http_autoindex_module.c 2019-11-08 15:01:50.097606651 +0300
102+
diff -urN nginx-1.17.6-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.6/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.17.6-orig/src/http/modules/ngx_http_autoindex_module.c 2019-11-19 17:18:58.000000000 +0300
104+
+++ nginx-1.17.6/src/http/modules/ngx_http_autoindex_module.c 2019-11-20 12:27:32.895781646 +0300
105105
@@ -449,9 +449,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.17.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.17.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.5/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.17.5-orig/src/http/ngx_http_header_filter_module.c 2019-10-22 18:16:08.000000000 +0300
182-
+++ nginx-1.17.5/src/http/ngx_http_header_filter_module.c 2019-11-08 15:01:50.102606607 +0300
180+
diff -urN nginx-1.17.6-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.6/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.17.6-orig/src/http/ngx_http_header_filter_module.c 2019-11-19 17:18:58.000000000 +0300
182+
+++ nginx-1.17.6/src/http/ngx_http_header_filter_module.c 2019-11-20 12:27:32.900781600 +0300
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.17.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.
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.17.5-orig/src/http/ngx_http_special_response.c nginx-1.17.5/src/http/ngx_http_special_response.c
234-
--- nginx-1.17.5-orig/src/http/ngx_http_special_response.c 2019-10-22 18:16:08.000000000 +0300
235-
+++ nginx-1.17.5/src/http/ngx_http_special_response.c 2019-11-08 15:01:50.108606554 +0300
233+
diff -urN nginx-1.17.6-orig/src/http/ngx_http_special_response.c nginx-1.17.6/src/http/ngx_http_special_response.c
234+
--- nginx-1.17.6-orig/src/http/ngx_http_special_response.c 2019-11-19 17:18:58.000000000 +0300
235+
+++ nginx-1.17.6/src/http/ngx_http_special_response.c 2019-11-20 12:27:32.906781546 +0300
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -705,9 +705,9 @@ diff -urN nginx-1.17.5-orig/src/http/ngx_http_special_response.c nginx-1.17.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.17.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.5/src/http/v2/ngx_http_v2_filter_module.c
709-
--- nginx-1.17.5-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-10-22 18:16:08.000000000 +0300
710-
+++ nginx-1.17.5/src/http/v2/ngx_http_v2_filter_module.c 2019-11-08 15:01:50.114606501 +0300
708+
diff -urN nginx-1.17.6-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.6/src/http/v2/ngx_http_v2_filter_module.c
709+
--- nginx-1.17.6-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-11-19 17:18:58.000000000 +0300
710+
+++ nginx-1.17.6/src/http/v2/ngx_http_v2_filter_module.c 2019-11-20 12:27:32.912781492 +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.17.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.5
726726
}
727727

728728
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
729-
diff -urN nginx-1.17.5-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.5/src/os/unix/ngx_setproctitle.c
730-
--- nginx-1.17.5-orig/src/os/unix/ngx_setproctitle.c 2019-10-22 18:16:08.000000000 +0300
731-
+++ nginx-1.17.5/src/os/unix/ngx_setproctitle.c 2019-11-08 15:01:50.119606456 +0300
729+
diff -urN nginx-1.17.6-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.6/src/os/unix/ngx_setproctitle.c
730+
--- nginx-1.17.6-orig/src/os/unix/ngx_setproctitle.c 2019-11-19 17:18:58.000000000 +0300
731+
+++ nginx-1.17.6/src/os/unix/ngx_setproctitle.c 2019-11-20 12:27:32.917781446 +0300
732732
@@ -89,7 +89,7 @@
733733

734734
ngx_os_argv[1] = NULL;

‎webkaos.spec‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
%define service_name %{name}
4949
%define service_home %{_cachedir}/%{service_name}
5050

51-
%define nginx_version 1.17.5
51+
%define nginx_version 1.17.6
5252
%define boring_commit 43890dbd693d5d972afbc676860e5adf4a44236a
5353
%define lua_module_ver 0.10.15
5454
%define mh_module_ver 0.33
@@ -170,7 +170,7 @@ Links for nginx compatibility.
170170

171171
Summary: Module for Brotli compression
172172
Version: 0.1.3
173-
Release: 2%{?dist}
173+
Release: 3%{?dist}
174174

175175
Group: System Environment/Daemons
176176
Requires: %{name} = %{nginx_version}
@@ -184,7 +184,7 @@ Module for Brotli compression.
184184

185185
Summary: High performance, low rules maintenance WAF
186186
Version: %{naxsi_ver}
187-
Release: 2%{?dist}
187+
Release: 3%{?dist}
188188

189189
Group: System Environment/Daemons
190190
Requires: %{name} = %{nginx_version}
@@ -696,6 +696,9 @@ rm -rf %{buildroot}
696696
################################################################################
697697

698698
%changelog
699+
* Wed Nov 20 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.6-0
700+
- Nginx updated to 1.17.6
701+
699702
* Fri Nov 08 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.5-0
700703
- Nginx updated to 1.17.5
701704
- BoringSSL updated to the latest version

0 commit comments

Comments
 (0)