Skip to content

Commit cbec9b8

Browse files
andyoneandyone
authored
Merge pull request #42 from essentialkaos/develop
Version 1.13.4
2 parents 0f72a65 + ba29c04 commit cbec9b8

File tree

4 files changed

+54
-175
lines changed

4 files changed

+54
-175
lines changed

‎SOURCES/ngx_pagespeed-build-fix.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff -urN ngx_pagespeed-1.12.34.2-stable-orig/src/ngx_pagespeed.cc ngx_pagespeed-1.12.34.2-stable/src/ngx_pagespeed.cc
2+
--- ngx_pagespeed-1.12.34.2-stable-orig/src/ngx_pagespeed.cc 2017-08-10 01:04:16.318960046 +0200
3+
+++ ngx_pagespeed-1.12.34.2-stable/src/ngx_pagespeed.cc 2017-08-10 01:05:33.000000000 +0200
4+
@@ -3008,8 +3008,7 @@
5+
6+
i = r->phase_handler;
7+
// move handlers before try_files && content phase
8+
- while (ph[i + 1].checker != ngx_http_core_try_files_phase &&
9+
- ph[i + 1].checker != ngx_http_core_content_phase) {
10+
+ while (ph[i + 1].checker != ngx_http_core_content_phase) {
11+
ph[i] = ph[i + 1];
12+
ph[i].next--;
13+
i++;

‎SOURCES/webkaos-1.13.3-lua-build-fix.patch‎

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎SOURCES/webkaos.patch‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN nginx-1.13.3-orig/auto/lib/openssl/make nginx-1.13.3/auto/lib/openssl/make
2-
--- nginx-1.13.3-orig/auto/lib/openssl/make 2017-07-12 00:32:08.254706811 +0200
3-
+++ nginx-1.13.3/auto/lib/openssl/make 2017-07-12 00:32:49.728716092 +0200
1+
diff -urN nginx-1.13.4-orig/auto/lib/openssl/make nginx-1.13.4/auto/lib/openssl/make
2+
--- nginx-1.13.4-orig/auto/lib/openssl/make 2017-08-10 00:31:54.210110415 +0200
3+
+++ nginx-1.13.4/auto/lib/openssl/make 2017-08-10 00:34:07.150096910 +0200
44
@@ -45,18 +45,18 @@
55
/*) ngx_prefix="$OPENSSL/.openssl" ;;
66
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,10 +24,10 @@ diff -urN nginx-1.13.3-orig/auto/lib/openssl/make nginx-1.13.3/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.13.3-orig/src/core/nginx.c nginx-1.13.3/src/core/nginx.c
28-
--- nginx-1.13.3-orig/src/core/nginx.c 2017-07-12 00:32:08.292710139 +0200
29-
+++ nginx-1.13.3/src/core/nginx.c 2017-07-12 00:32:49.750716093 +0200
30-
@@ -382,13 +382,13 @@
27+
diff -urN nginx-1.13.4-orig/src/core/nginx.c nginx-1.13.4/src/core/nginx.c
28+
--- nginx-1.13.4-orig/src/core/nginx.c 2017-08-10 00:31:54.255110544 +0200
29+
+++ nginx-1.13.4/src/core/nginx.c 2017-08-10 00:36:57.000000000 +0200
30+
@@ -388,13 +388,13 @@
3131
static void
3232
ngx_show_version_info(void)
3333
{
@@ -45,13 +45,13 @@ diff -urN nginx-1.13.3-orig/src/core/nginx.c nginx-1.13.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.13.3-orig/src/core/nginx.h nginx-1.13.3/src/core/nginx.h
49-
--- nginx-1.13.3-orig/src/core/nginx.h 2017-07-12 00:32:08.295710326 +0200
50-
+++ nginx-1.13.3/src/core/nginx.h 2017-07-12 00:33:17.000000000 +0200
48+
diff -urN nginx-1.13.4-orig/src/core/nginx.h nginx-1.13.4/src/core/nginx.h
49+
--- nginx-1.13.4-orig/src/core/nginx.h 2017-08-10 00:31:54.258110546 +0200
50+
+++ nginx-1.13.4/src/core/nginx.h 2017-08-10 00:35:31.000000000 +0200
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1013003
54-
#define NGINX_VERSION "1.13.3"
53+
#define nginx_version 1013004
54+
#define NGINX_VERSION "1.13.4"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

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

6868

69-
diff -urN nginx-1.13.3-orig/src/core/ngx_log.c nginx-1.13.3/src/core/ngx_log.c
70-
--- nginx-1.13.3-orig/src/core/ngx_log.c 2017-07-12 00:32:08.294710265 +0200
71-
+++ nginx-1.13.3/src/core/ngx_log.c 2017-07-12 00:32:49.774716095 +0200
69+
diff -urN nginx-1.13.4-orig/src/core/ngx_log.c nginx-1.13.4/src/core/ngx_log.c
70+
--- nginx-1.13.4-orig/src/core/ngx_log.c 2017-08-10 00:31:54.258110546 +0200
71+
+++ nginx-1.13.4/src/core/ngx_log.c 2017-08-10 00:34:07.182096906 +0200
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.13.3-orig/src/core/ngx_log.c nginx-1.13.3/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.13.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.3/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.13.3-orig/src/http/modules/ngx_http_autoindex_module.c 2017-07-12 00:32:08.279709085 +0200
104-
+++ nginx-1.13.3/src/http/modules/ngx_http_autoindex_module.c 2017-07-12 00:32:49.791716097 +0200
102+
diff -urN nginx-1.13.4-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.4/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.13.4-orig/src/http/modules/ngx_http_autoindex_module.c 2017-08-10 00:31:54.240110547 +0200
104+
+++ nginx-1.13.4/src/http/modules/ngx_http_autoindex_module.c 2017-08-10 00:34:07.197096905 +0200
105105
@@ -445,9 +445,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.13.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.13.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.3/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.13.3-orig/src/http/ngx_http_header_filter_module.c 2017-07-12 00:32:08.283709457 +0200
182-
+++ nginx-1.13.3/src/http/ngx_http_header_filter_module.c 2017-07-12 00:32:49.803716098 +0200
180+
diff -urN nginx-1.13.4-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.4/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.13.4-orig/src/http/ngx_http_header_filter_module.c 2017-08-10 00:31:54.248110546 +0200
182+
+++ nginx-1.13.4/src/http/ngx_http_header_filter_module.c 2017-08-10 00:34:07.208096904 +0200
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -221,9 +221,9 @@ diff -urN nginx-1.13.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.
221221
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
222222

223223
ngx_string("500 Internal Server Error"),
224-
diff -urN nginx-1.13.3-orig/src/http/ngx_http_special_response.c nginx-1.13.3/src/http/ngx_http_special_response.c
225-
--- nginx-1.13.3-orig/src/http/ngx_http_special_response.c 2017-07-12 00:32:08.285709626 +0200
226-
+++ nginx-1.13.3/src/http/ngx_http_special_response.c 2017-07-12 00:32:49.818716099 +0200
224+
diff -urN nginx-1.13.4-orig/src/http/ngx_http_special_response.c nginx-1.13.4/src/http/ngx_http_special_response.c
225+
--- nginx-1.13.4-orig/src/http/ngx_http_special_response.c 2017-08-10 00:31:54.249110547 +0200
226+
+++ nginx-1.13.4/src/http/ngx_http_special_response.c 2017-08-10 00:34:07.221096902 +0200
227227
@@ -19,21 +19,21 @@
228228

229229

@@ -712,9 +712,9 @@ diff -urN nginx-1.13.3-orig/src/http/ngx_http_special_response.c nginx-1.13.3/sr
712712
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
713713

714714
ngx_string(ngx_http_error_494_page), /* 494, request header too large */
715-
diff -urN nginx-1.13.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.3/src/http/v2/ngx_http_v2_filter_module.c
716-
--- nginx-1.13.3-orig/src/http/v2/ngx_http_v2_filter_module.c 2017-07-12 00:32:08.288709861 +0200
717-
+++ nginx-1.13.3/src/http/v2/ngx_http_v2_filter_module.c 2017-07-12 00:32:49.837716101 +0200
715+
diff -urN nginx-1.13.4-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.4/src/http/v2/ngx_http_v2_filter_module.c
716+
--- nginx-1.13.4-orig/src/http/v2/ngx_http_v2_filter_module.c 2017-08-10 00:31:54.251110547 +0200
717+
+++ nginx-1.13.4/src/http/v2/ngx_http_v2_filter_module.c 2017-08-10 00:34:07.236096899 +0200
718718
@@ -143,7 +143,7 @@
719719
ngx_http_core_srv_conf_t *cscf;
720720
u_char addr[NGX_SOCKADDR_STRLEN];
@@ -733,9 +733,9 @@ diff -urN nginx-1.13.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.3
733733
}
734734

735735
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
736-
diff -urN nginx-1.13.3-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.3/src/os/unix/ngx_setproctitle.c
737-
--- nginx-1.13.3-orig/src/os/unix/ngx_setproctitle.c 2017-07-12 00:32:08.262707451 +0200
738-
+++ nginx-1.13.3/src/os/unix/ngx_setproctitle.c 2017-07-12 00:32:49.848716102 +0200
736+
diff -urN nginx-1.13.4-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.4/src/os/unix/ngx_setproctitle.c
737+
--- nginx-1.13.4-orig/src/os/unix/ngx_setproctitle.c 2017-08-10 00:31:54.220110552 +0200
738+
+++ nginx-1.13.4/src/os/unix/ngx_setproctitle.c 2017-08-10 00:34:07.248096899 +0200
739739
@@ -89,7 +89,7 @@
740740

741741
ngx_os_argv[1] = NULL;

‎webkaos.spec‎

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

47-
%define boring_commit 2ec3b3154817fbb0a2e6878c9ec605b1854a2bd1
47+
%define boring_commit ca9e8f52f1631fa4906a0d44abdeb55f80fe026d
4848
%define psol_ver 1.12.34.2
49-
%define lua_module_ver 0.10.8
49+
%define lua_module_ver 0.10.10
5050
%define mh_module_ver 0.32
5151
%define pcre_ver 8.41
5252
%define zlib_ver 1.2.11
@@ -58,7 +58,7 @@
5858

5959
Summary: Superb high performance web server
6060
Name: webkaos
61-
Version: 1.13.3
61+
Version: 1.13.4
6262
Release: 0%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
@@ -98,8 +98,8 @@ Patch2: %{name}-dynamic-tls-records.patch
9898
# https://github.com/ajhaydock/BoringNginx/blob/master/patches/1.11.10.patch
9999
Patch3: boring.patch
100100

101-
# https://github.com/openresty/lua-nginx-module/pull/1017
102-
Patch4: %{name}-%{version}-lua-build-fix.patch
101+
# Patch for build with nginx >= 1.13.4
102+
Patch4: ngx_pagespeed-build-fix.patch
103103

104104
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
105105

@@ -170,7 +170,7 @@ mkdir boringssl
170170
%patch2 -p1
171171
%patch3 -p1
172172

173-
pushd lua-nginx-module-%{lua_module_ver}
173+
pushd ngx_pagespeed-%{pagespeed_ver}
174174
%patch4 -p1
175175
popd
176176

@@ -580,6 +580,11 @@ rm -rf %{buildroot}
580580
###############################################################################
581581

582582
%changelog
583+
* Thu Aug 10 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.4-0
584+
- Nginx updated to 1.13.4
585+
- BoringSSL updated to latest version
586+
- Lua module updated to 0.10.10
587+
583588
* Wed Jul 12 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.3-0
584589
- Nginx updated to 1.13.3 with CVE-2017-7529 fix
585590

0 commit comments

Comments
 (0)