Skip to content

Commit 9158edd

Browse files
andyoneandyone
authored
Merge pull request #80 from essentialkaos/develop
Version 1.15.10
2 parents 3e6ac59 + 0a0e8ed commit 9158edd

File tree

3 files changed

+46
-40
lines changed

3 files changed

+46
-40
lines changed

‎SOURCES/boringssl-tls13-support.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
diff -urN boringssl-orig/ssl/s3_lib.cc boringssl/ssl/s3_lib.cc
2-
--- boringssl-orig/ssl/s3_lib.cc 2017-11-27 23:19:17.297484878 +0100
3-
+++ boringssl/ssl/s3_lib.cc 2017-11-27 23:20:24.000000000 +0100
4-
@@ -199,7 +199,7 @@
2+
--- boringssl-orig/ssl/s3_lib.cc 2019-04-09 00:27:58.157453794 +0300
3+
+++ boringssl/ssl/s3_lib.cc 2019-04-09 00:29:57.000000000 +0300
4+
@@ -202,7 +202,7 @@
55
// TODO(davidben): Move this field into |s3|, have it store the normalized
66
// protocol version, and implement this pre-negotiation quirk in |SSL_version|
77
// at the API boundary rather than in internal state.
@@ -11,14 +11,14 @@ diff -urN boringssl-orig/ssl/s3_lib.cc boringssl/ssl/s3_lib.cc
1111
}
1212

1313
diff -urN boringssl-orig/ssl/ssl_versions.cc boringssl/ssl/ssl_versions.cc
14-
--- boringssl-orig/ssl/ssl_versions.cc 2017-11-27 23:19:17.294484878 +0100
15-
+++ boringssl/ssl/ssl_versions.cc 2017-11-27 23:21:15.000000000 +0100
16-
@@ -209,7 +209,7 @@
14+
--- boringssl-orig/ssl/ssl_versions.cc 2019-04-09 00:27:58.158453785 +0300
15+
+++ boringssl/ssl/ssl_versions.cc 2019-04-09 00:41:47.000000000 +0300
16+
@@ -158,7 +158,7 @@
1717
uint16_t version) {
1818
// Zero is interpreted as the default maximum version.
1919
if (version == 0) {
20-
- *out = TLS1_2_VERSION;
21-
+ *out = TLS1_3_VERSION;
20+
- *out = method->is_dtls ? DTLS1_2_VERSION : TLS1_2_VERSION;
21+
+ *out = method->is_dtls ? DTLS1_2_VERSION : TLS1_3_VERSION;
2222
return true;
2323
}
2424

‎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.9-orig/auto/lib/openssl/make nginx-1.15.9/auto/lib/openssl/make
2-
--- nginx-1.15.9-orig/auto/lib/openssl/make 2019-02-26 18:29:22.000000000 +0300
3-
+++ nginx-1.15.9/auto/lib/openssl/make 2019-02-28 02:43:00.775768195 +0300
1+
diff -urN nginx-1.15.10-orig/auto/lib/openssl/make nginx-1.15.10/auto/lib/openssl/make
2+
--- nginx-1.15.10-orig/auto/lib/openssl/make 2019-03-26 17:06:55.000000000 +0300
3+
+++ nginx-1.15.10/auto/lib/openssl/make 2019-04-09 00:03:13.912783334 +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.9-orig/auto/lib/openssl/make nginx-1.15.9/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.15.9-orig/src/core/nginx.c nginx-1.15.9/src/core/nginx.c
28-
--- nginx-1.15.9-orig/src/core/nginx.c 2019-02-26 18:29:22.000000000 +0300
29-
+++ nginx-1.15.9/src/core/nginx.c 2019-02-28 02:43:00.781768140 +0300
27+
diff -urN nginx-1.15.10-orig/src/core/nginx.c nginx-1.15.10/src/core/nginx.c
28+
--- nginx-1.15.10-orig/src/core/nginx.c 2019-03-26 17:06:55.000000000 +0300
29+
+++ nginx-1.15.10/src/core/nginx.c 2019-04-09 00:03:13.918783280 +0300
3030
@@ -389,13 +389,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.15.9-orig/src/core/nginx.c nginx-1.15.9/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.9-orig/src/core/nginx.h nginx-1.15.9/src/core/nginx.h
49-
--- nginx-1.15.9-orig/src/core/nginx.h 2019-02-26 18:29:22.000000000 +0300
50-
+++ nginx-1.15.9/src/core/nginx.h 2019-02-28 02:44:00.000000000 +0300
48+
diff -urN nginx-1.15.10-orig/src/core/nginx.h nginx-1.15.10/src/core/nginx.h
49+
--- nginx-1.15.10-orig/src/core/nginx.h 2019-03-26 17:06:55.000000000 +0300
50+
+++ nginx-1.15.10/src/core/nginx.h 2019-04-09 00:07:45.000000000 +0300
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1015009
54-
#define NGINX_VERSION "1.15.9"
53+
#define nginx_version 1015010
54+
#define NGINX_VERSION "1.15.10"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

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

6868

69-
diff -urN nginx-1.15.9-orig/src/core/ngx_log.c nginx-1.15.9/src/core/ngx_log.c
70-
--- nginx-1.15.9-orig/src/core/ngx_log.c 2019-02-26 18:29:22.000000000 +0300
71-
+++ nginx-1.15.9/src/core/ngx_log.c 2019-02-28 02:43:00.790768056 +0300
69+
diff -urN nginx-1.15.10-orig/src/core/ngx_log.c nginx-1.15.10/src/core/ngx_log.c
70+
--- nginx-1.15.10-orig/src/core/ngx_log.c 2019-03-26 17:06:55.000000000 +0300
71+
+++ nginx-1.15.10/src/core/ngx_log.c 2019-04-09 00:03:13.928783190 +0300
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.15.9-orig/src/core/ngx_log.c nginx-1.15.9/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.15.9-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.9/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.15.9-orig/src/http/modules/ngx_http_autoindex_module.c 2019-02-26 18:29:22.000000000 +0300
104-
+++ nginx-1.15.9/src/http/modules/ngx_http_autoindex_module.c 2019-02-28 02:43:00.796768001 +0300
102+
diff -urN nginx-1.15.10-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.10/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.15.10-orig/src/http/modules/ngx_http_autoindex_module.c 2019-03-26 17:06:55.000000000 +0300
104+
+++ nginx-1.15.10/src/http/modules/ngx_http_autoindex_module.c 2019-04-09 00:03:13.934783136 +0300
105105
@@ -449,9 +449,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.15.9-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.9-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.9/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.15.9-orig/src/http/ngx_http_header_filter_module.c 2019-02-26 18:29:22.000000000 +0300
182-
+++ nginx-1.15.9/src/http/ngx_http_header_filter_module.c 2019-02-28 02:43:00.802767945 +0300
180+
diff -urN nginx-1.15.10-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.10/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.15.10-orig/src/http/ngx_http_header_filter_module.c 2019-03-26 17:06:55.000000000 +0300
182+
+++ nginx-1.15.10/src/http/ngx_http_header_filter_module.c 2019-04-09 00:03:13.939783091 +0300
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.15.9-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.9-orig/src/http/ngx_http_special_response.c nginx-1.15.9/src/http/ngx_http_special_response.c
234-
--- nginx-1.15.9-orig/src/http/ngx_http_special_response.c 2019-02-26 18:29:22.000000000 +0300
235-
+++ nginx-1.15.9/src/http/ngx_http_special_response.c 2019-02-28 02:43:00.807767899 +0300
233+
diff -urN nginx-1.15.10-orig/src/http/ngx_http_special_response.c nginx-1.15.10/src/http/ngx_http_special_response.c
234+
--- nginx-1.15.10-orig/src/http/ngx_http_special_response.c 2019-03-26 17:06:55.000000000 +0300
235+
+++ nginx-1.15.10/src/http/ngx_http_special_response.c 2019-04-09 00:03:13.945783037 +0300
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -705,9 +705,9 @@ diff -urN nginx-1.15.9-orig/src/http/ngx_http_special_response.c nginx-1.15.9/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.9-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.9/src/http/v2/ngx_http_v2_filter_module.c
709-
--- nginx-1.15.9-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-02-26 18:29:22.000000000 +0300
710-
+++ nginx-1.15.9/src/http/v2/ngx_http_v2_filter_module.c 2019-02-28 02:43:00.813767843 +0300
708+
diff -urN nginx-1.15.10-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.10/src/http/v2/ngx_http_v2_filter_module.c
709+
--- nginx-1.15.10-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-03-26 17:06:55.000000000 +0300
710+
+++ nginx-1.15.10/src/http/v2/ngx_http_v2_filter_module.c 2019-04-09 00:03:13.951782983 +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.9-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.9
726726
}
727727

728728
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
729-
diff -urN nginx-1.15.9-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.9/src/os/unix/ngx_setproctitle.c
730-
--- nginx-1.15.9-orig/src/os/unix/ngx_setproctitle.c 2019-02-26 18:29:22.000000000 +0300
731-
+++ nginx-1.15.9/src/os/unix/ngx_setproctitle.c 2019-02-28 02:43:00.819767788 +0300
729+
diff -urN nginx-1.15.10-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.10/src/os/unix/ngx_setproctitle.c
730+
--- nginx-1.15.10-orig/src/os/unix/ngx_setproctitle.c 2019-03-26 17:06:55.000000000 +0300
731+
+++ nginx-1.15.10/src/os/unix/ngx_setproctitle.c 2019-04-09 00:03:13.956782939 +0300
732732
@@ -89,7 +89,7 @@
733733

734734
ngx_os_argv[1] = NULL;

‎webkaos.spec‎

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

47-
%define boring_commit a6124742d008e7cd4613833350a16d68537687c9
47+
%define boring_commit a26d01719b4c56241424c8cfed2ca326ea229790
4848
%define lua_module_ver 0.10.14
4949
%define mh_module_ver 0.33
5050
%define pcre_ver 8.43
5151
%define zlib_ver 1.2.11
52-
%define luajit_ver 2.1-20190221
52+
%define luajit_ver 2.1-20190329
5353

5454
################################################################################
5555

5656
Summary: Superb high performance web server
5757
Name: webkaos
58-
Version: 1.15.9
58+
Version: 1.15.10
5959
Release: 0%{?dist}
6060
License: 2-clause BSD-like license
6161
Group: System Environment/Daemons
@@ -578,6 +578,12 @@ rm -rf %{buildroot}
578578
################################################################################
579579

580580
%changelog
581+
* Tue Apr 09 2019 Anton Novojilov <andy@essentialkaos.com> - 1.5.10-0
582+
- Nginx updated to 1.15.10
583+
- BoringSSL updated to the latest version
584+
- LuaJIT updated to 2.1-20190329
585+
- Updated BoringSSL patch for compatibility with the latest version
586+
581587
* Thu Feb 28 2019 Anton Novojilov <andy@essentialkaos.com> - 1.15.9-0
582588
- Nginx updated to 1.15.9
583589
- LuaJIT replaced by OpenResty's fork

0 commit comments

Comments
 (0)