Skip to content

Commit 8f46ee2

Browse files
andyoneandyone
committed
Version 1.17.4
1 parent e7ec343 commit 8f46ee2

File tree

2 files changed

+41
-36
lines changed

2 files changed

+41
-36
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.3-orig/auto/lib/openssl/make nginx-1.17.3/auto/lib/openssl/make
2-
--- nginx-1.17.3-orig/auto/lib/openssl/make 2019-08-13 15:45:57.000000000 +0300
3-
+++ nginx-1.17.3/auto/lib/openssl/make 2019-08-14 00:37:59.958675974 +0300
1+
diff -urN nginx-1.17.4-orig/auto/lib/openssl/make nginx-1.17.4/auto/lib/openssl/make
2+
--- nginx-1.17.4-orig/auto/lib/openssl/make 2019-09-24 18:08:48.000000000 +0300
3+
+++ nginx-1.17.4/auto/lib/openssl/make 2019-09-25 00:52:11.846220618 +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.3-orig/auto/lib/openssl/make nginx-1.17.3/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.17.3-orig/src/core/nginx.c nginx-1.17.3/src/core/nginx.c
28-
--- nginx-1.17.3-orig/src/core/nginx.c 2019-08-13 15:45:57.000000000 +0300
29-
+++ nginx-1.17.3/src/core/nginx.c 2019-08-14 00:37:59.964675924 +0300
27+
diff -urN nginx-1.17.4-orig/src/core/nginx.c nginx-1.17.4/src/core/nginx.c
28+
--- nginx-1.17.4-orig/src/core/nginx.c 2019-09-24 18:08:48.000000000 +0300
29+
+++ nginx-1.17.4/src/core/nginx.c 2019-09-25 00:52:11.852220569 +0300
3030
@@ -389,13 +389,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.17.3-orig/src/core/nginx.c nginx-1.17.3/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.3-orig/src/core/nginx.h nginx-1.17.3/src/core/nginx.h
49-
--- nginx-1.17.3-orig/src/core/nginx.h 2019-08-13 15:45:57.000000000 +0300
50-
+++ nginx-1.17.3/src/core/nginx.h 2019-08-14 00:40:25.000000000 +0300
48+
diff -urN nginx-1.17.4-orig/src/core/nginx.h nginx-1.17.4/src/core/nginx.h
49+
--- nginx-1.17.4-orig/src/core/nginx.h 2019-09-24 18:08:48.000000000 +0300
50+
+++ nginx-1.17.4/src/core/nginx.h 2019-09-25 00:53:54.000000000 +0300
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1017003
54-
#define NGINX_VERSION "1.17.3"
53+
#define nginx_version 1017004
54+
#define NGINX_VERSION "1.17.4"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

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

6868

69-
diff -urN nginx-1.17.3-orig/src/core/ngx_log.c nginx-1.17.3/src/core/ngx_log.c
70-
--- nginx-1.17.3-orig/src/core/ngx_log.c 2019-08-13 15:45:57.000000000 +0300
71-
+++ nginx-1.17.3/src/core/ngx_log.c 2019-08-14 00:37:59.974675841 +0300
69+
diff -urN nginx-1.17.4-orig/src/core/ngx_log.c nginx-1.17.4/src/core/ngx_log.c
70+
--- nginx-1.17.4-orig/src/core/ngx_log.c 2019-09-24 18:08:48.000000000 +0300
71+
+++ nginx-1.17.4/src/core/ngx_log.c 2019-09-25 00:52:11.862220487 +0300
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.17.3-orig/src/core/ngx_log.c nginx-1.17.3/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.17.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.3/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.17.3-orig/src/http/modules/ngx_http_autoindex_module.c 2019-08-13 15:45:57.000000000 +0300
104-
+++ nginx-1.17.3/src/http/modules/ngx_http_autoindex_module.c 2019-08-14 00:37:59.980675792 +0300
102+
diff -urN nginx-1.17.4-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.4/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.17.4-orig/src/http/modules/ngx_http_autoindex_module.c 2019-09-24 18:08:48.000000000 +0300
104+
+++ nginx-1.17.4/src/http/modules/ngx_http_autoindex_module.c 2019-09-25 00:52:11.868220438 +0300
105105
@@ -449,9 +449,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.17.3-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.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.3/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.17.3-orig/src/http/ngx_http_header_filter_module.c 2019-08-13 15:45:57.000000000 +0300
182-
+++ nginx-1.17.3/src/http/ngx_http_header_filter_module.c 2019-08-14 00:37:59.985675750 +0300
180+
diff -urN nginx-1.17.4-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.4/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.17.4-orig/src/http/ngx_http_header_filter_module.c 2019-09-24 18:08:48.000000000 +0300
182+
+++ nginx-1.17.4/src/http/ngx_http_header_filter_module.c 2019-09-25 00:52:11.873220397 +0300
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.17.3-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.3-orig/src/http/ngx_http_special_response.c nginx-1.17.3/src/http/ngx_http_special_response.c
234-
--- nginx-1.17.3-orig/src/http/ngx_http_special_response.c 2019-08-13 15:45:57.000000000 +0300
235-
+++ nginx-1.17.3/src/http/ngx_http_special_response.c 2019-08-14 00:37:59.991675700 +0300
233+
diff -urN nginx-1.17.4-orig/src/http/ngx_http_special_response.c nginx-1.17.4/src/http/ngx_http_special_response.c
234+
--- nginx-1.17.4-orig/src/http/ngx_http_special_response.c 2019-09-24 18:08:48.000000000 +0300
235+
+++ nginx-1.17.4/src/http/ngx_http_special_response.c 2019-09-25 00:52:11.879220348 +0300
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -705,9 +705,9 @@ diff -urN nginx-1.17.3-orig/src/http/ngx_http_special_response.c nginx-1.17.3/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.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.3/src/http/v2/ngx_http_v2_filter_module.c
709-
--- nginx-1.17.3-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-08-13 15:45:57.000000000 +0300
710-
+++ nginx-1.17.3/src/http/v2/ngx_http_v2_filter_module.c 2019-08-14 00:39:56.000000000 +0300
708+
diff -urN nginx-1.17.4-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.4/src/http/v2/ngx_http_v2_filter_module.c
709+
--- nginx-1.17.4-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-09-24 18:08:48.000000000 +0300
710+
+++ nginx-1.17.4/src/http/v2/ngx_http_v2_filter_module.c 2019-09-25 00:55:06.000000000 +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.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.3
726726
}
727727

728728
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
729-
diff -urN nginx-1.17.3-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.3/src/os/unix/ngx_setproctitle.c
730-
--- nginx-1.17.3-orig/src/os/unix/ngx_setproctitle.c 2019-08-13 15:45:57.000000000 +0300
731-
+++ nginx-1.17.3/src/os/unix/ngx_setproctitle.c 2019-08-14 00:38:00.001675618 +0300
729+
diff -urN nginx-1.17.4-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.4/src/os/unix/ngx_setproctitle.c
730+
--- nginx-1.17.4-orig/src/os/unix/ngx_setproctitle.c 2019-09-24 18:08:48.000000000 +0300
731+
+++ nginx-1.17.4/src/os/unix/ngx_setproctitle.c 2019-09-25 00:52:11.889220266 +0300
732732
@@ -89,7 +89,7 @@
733733

734734
ngx_os_argv[1] = NULL;

‎webkaos.spec‎

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

51-
%define nginx_version 1.17.3
52-
%define boring_commit eca48e52edc684db1433c2cfbca02bb9468d81af
51+
%define nginx_version 1.17.4
52+
%define boring_commit 1f1af82f409cd05450b3491865af0c770830cd76
5353
%define lua_module_ver 0.10.15
5454
%define mh_module_ver 0.33
5555
%define pcre_ver 8.43
5656
%define zlib_ver 1.2.11
57-
%define luajit_ver 2.1-20190626
58-
%define brotli_commit 7fab0418dedd1c4230877b357a1ca7cc7c355d84
57+
%define luajit_ver 2.1-20190912
58+
%define brotli_commit e505dce68acc190cc5a1e780a3b0275e39f160ca
5959
%define brotli_ver 1.0.7
6060
%define naxsi_ver 0.56
6161

@@ -64,7 +64,7 @@
6464
Summary: Superb high performance web server
6565
Name: webkaos
6666
Version: %{nginx_version}
67-
Release: 1%{?dist}
67+
Release: 0%{?dist}
6868
License: 2-clause BSD-like license
6969
Group: System Environment/Daemons
7070
URL: https://github.com/essentialkaos/webkaos
@@ -92,7 +92,7 @@ Source52: https://github.com/openresty/headers-more-nginx-module/arc
9292
Source53: https://ftp.pcre.org/pub/pcre/pcre-%{pcre_ver}.tar.gz
9393
Source54: https://zlib.net/zlib-%{zlib_ver}.tar.gz
9494
Source55: https://github.com/openresty/luajit2/archive/v%{luajit_ver}.tar.gz
95-
Source56: https://github.com/eustas/ngx_brotli/archive/%{brotli_commit}.tar.gz
95+
Source56: https://github.com/google/ngx_brotli/archive/%{brotli_commit}.tar.gz
9696
Source57: https://github.com/google/brotli/archive/v%{brotli_ver}.tar.gz
9797
Source58: https://github.com/nbs-system/naxsi/archive/%{naxsi_ver}.tar.gz
9898

@@ -166,7 +166,7 @@ Links for nginx compatibility.
166166

167167
Summary: Module for Brotli compression
168168
Version: 0.1.3
169-
Release: 0%{?dist}
169+
Release: 1%{?dist}
170170

171171
Group: System Environment/Daemons
172172
Requires: %{name} >= %{nginx_version}
@@ -691,6 +691,11 @@ rm -rf %{buildroot}
691691
################################################################################
692692

693693
%changelog
694+
* Wed Sep 25 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.4-0
695+
- Nginx updated to 1.17.4
696+
- BoringSSL updated to the latest version
697+
- Switched to official ngx_brotli repository
698+
694699
* Thu Aug 29 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.3-1
695700
- Improved dynamic modules support
696701
- Added brotli dynamic module

0 commit comments

Comments
 (0)