Skip to content

Commit 9de7081

Browse files
andyoneandyone
authored
Merge pull request #49 from essentialkaos/develop
Version 1.13.7
2 parents 6cc4c2d + 3bdb9cf commit 9de7081

File tree

4 files changed

+65
-46
lines changed

4 files changed

+65
-46
lines changed

‎SOURCES/boringssl-tls13-support.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
diff -urN boringssl-orig/ssl/s3_lib.cc boringssl/ssl/s3_lib.cc
2-
--- boringssl-orig/ssl/s3_lib.cc 2017-10-14 00:05:58.000000000 +0200
3-
+++ boringssl/ssl/s3_lib.cc 2017-10-17 23:21:59.187526554 +0200
4-
@@ -194,7 +194,7 @@
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 @@
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.
88
- ssl->version = TLS1_2_VERSION;
99
+ ssl->version = TLS1_3_VERSION;
10-
return 1;
10+
return true;
1111
}
1212

1313
diff -urN boringssl-orig/ssl/ssl_versions.cc boringssl/ssl/ssl_versions.cc
14-
--- boringssl-orig/ssl/ssl_versions.cc 2017-10-14 00:05:58.000000000 +0200
15-
+++ boringssl/ssl/ssl_versions.cc 2017-10-18 00:45:56.000000000 +0200
16-
@@ -199,7 +199,7 @@
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 @@
1717
uint16_t version) {
1818
// Zero is interpreted as the default maximum version.
1919
if (version == 0) {

‎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.13.6-orig/auto/lib/openssl/make nginx-1.13.6/auto/lib/openssl/make
2-
--- nginx-1.13.6-orig/auto/lib/openssl/make 2017-10-10 17:22:51.000000000 +0200
3-
+++ nginx-1.13.6/auto/lib/openssl/make 2017-10-13 23:48:34.072611151 +0200
1+
diff -urN nginx-1.13.7-orig/auto/lib/openssl/make nginx-1.13.7/auto/lib/openssl/make
2+
--- nginx-1.13.7-orig/auto/lib/openssl/make 2017-11-27 23:04:57.710526238 +0100
3+
+++ nginx-1.13.7/auto/lib/openssl/make 2017-11-27 23:07:50.246505745 +0100
44
@@ -45,18 +45,18 @@
55
/*) ngx_prefix="$OPENSSL/.openssl" ;;
66
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.13.6-orig/auto/lib/openssl/make nginx-1.13.6/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.13.6-orig/src/core/nginx.c nginx-1.13.6/src/core/nginx.c
28-
--- nginx-1.13.6-orig/src/core/nginx.c 2017-10-10 17:22:51.000000000 +0200
29-
+++ nginx-1.13.6/src/core/nginx.c 2017-10-13 23:48:34.093611455 +0200
27+
diff -urN nginx-1.13.7-orig/src/core/nginx.c nginx-1.13.7/src/core/nginx.c
28+
--- nginx-1.13.7-orig/src/core/nginx.c 2017-11-27 23:04:57.743525843 +0100
29+
+++ nginx-1.13.7/src/core/nginx.c 2017-11-27 23:07:50.266506656 +0100
3030
@@ -388,13 +388,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.13.6-orig/src/core/nginx.c nginx-1.13.6/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.6-orig/src/core/nginx.h nginx-1.13.6/src/core/nginx.h
49-
--- nginx-1.13.6-orig/src/core/nginx.h 2017-10-10 17:22:51.000000000 +0200
50-
+++ nginx-1.13.6/src/core/nginx.h 2017-10-13 23:52:02.000000000 +0200
48+
diff -urN nginx-1.13.7-orig/src/core/nginx.h nginx-1.13.7/src/core/nginx.h
49+
--- nginx-1.13.7-orig/src/core/nginx.h 2017-11-27 23:04:57.745525842 +0100
50+
+++ nginx-1.13.7/src/core/nginx.h 2017-11-27 23:05:31.000000000 +0100
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1013006
54-
#define NGINX_VERSION "1.13.6"
53+
#define nginx_version 1013007
54+
#define NGINX_VERSION "1.13.7"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

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

6868

69-
diff -urN nginx-1.13.6-orig/src/core/ngx_log.c nginx-1.13.6/src/core/ngx_log.c
70-
--- nginx-1.13.6-orig/src/core/ngx_log.c 2017-10-10 17:22:51.000000000 +0200
71-
+++ nginx-1.13.6/src/core/ngx_log.c 2017-10-13 23:48:34.117611464 +0200
69+
diff -urN nginx-1.13.7-orig/src/core/ngx_log.c nginx-1.13.7/src/core/ngx_log.c
70+
--- nginx-1.13.7-orig/src/core/ngx_log.c 2017-11-27 23:04:57.744525843 +0100
71+
+++ nginx-1.13.7/src/core/ngx_log.c 2017-11-27 23:07:50.292507154 +0100
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.13.6-orig/src/core/ngx_log.c nginx-1.13.6/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.13.6-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.6/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.13.6-orig/src/http/modules/ngx_http_autoindex_module.c 2017-10-10 17:22:52.000000000 +0200
104-
+++ nginx-1.13.6/src/http/modules/ngx_http_autoindex_module.c 2017-10-13 23:48:34.132611467 +0200
102+
diff -urN nginx-1.13.7-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.7/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.13.7-orig/src/http/modules/ngx_http_autoindex_module.c 2017-11-27 23:04:57.732525833 +0100
104+
+++ nginx-1.13.7/src/http/modules/ngx_http_autoindex_module.c 2017-11-27 23:07:50.308507152 +0100
105105
@@ -445,9 +445,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.13.6-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.6-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.6/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.13.6-orig/src/http/ngx_http_header_filter_module.c 2017-10-10 17:22:52.000000000 +0200
182-
+++ nginx-1.13.6/src/http/ngx_http_header_filter_module.c 2017-10-13 23:48:34.147611471 +0200
180+
diff -urN nginx-1.13.7-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.7/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.13.7-orig/src/http/ngx_http_header_filter_module.c 2017-11-27 23:04:57.737525851 +0100
182+
+++ nginx-1.13.7/src/http/ngx_http_header_filter_module.c 2017-11-27 23:07:50.322507152 +0100
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.13.6-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.
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.13.6-orig/src/http/ngx_http_special_response.c nginx-1.13.6/src/http/ngx_http_special_response.c
234-
--- nginx-1.13.6-orig/src/http/ngx_http_special_response.c 2017-10-10 17:22:52.000000000 +0200
235-
+++ nginx-1.13.6/src/http/ngx_http_special_response.c 2017-10-13 23:48:34.165611472 +0200
233+
diff -urN nginx-1.13.7-orig/src/http/ngx_http_special_response.c nginx-1.13.7/src/http/ngx_http_special_response.c
234+
--- nginx-1.13.7-orig/src/http/ngx_http_special_response.c 2017-11-27 23:04:57.738525848 +0100
235+
+++ nginx-1.13.7/src/http/ngx_http_special_response.c 2017-11-27 23:07:50.337507151 +0100
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -739,9 +739,9 @@ diff -urN nginx-1.13.6-orig/src/http/ngx_http_special_response.c nginx-1.13.6/sr
739739
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
740740

741741
ngx_string(ngx_http_error_494_page), /* 494, request header too large */
742-
diff -urN nginx-1.13.6-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.6/src/http/v2/ngx_http_v2_filter_module.c
743-
--- nginx-1.13.6-orig/src/http/v2/ngx_http_v2_filter_module.c 2017-10-10 17:22:52.000000000 +0200
744-
+++ nginx-1.13.6/src/http/v2/ngx_http_v2_filter_module.c 2017-10-13 23:51:36.000000000 +0200
742+
diff -urN nginx-1.13.7-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.7/src/http/v2/ngx_http_v2_filter_module.c
743+
--- nginx-1.13.7-orig/src/http/v2/ngx_http_v2_filter_module.c 2017-11-27 23:04:57.739525844 +0100
744+
+++ nginx-1.13.7/src/http/v2/ngx_http_v2_filter_module.c 2017-11-27 23:07:24.000000000 +0100
745745
@@ -144,7 +144,7 @@
746746
ngx_http_core_srv_conf_t *cscf;
747747
u_char addr[NGX_SOCKADDR_STRLEN];
@@ -760,9 +760,9 @@ diff -urN nginx-1.13.6-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.6
760760
}
761761

762762
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
763-
diff -urN nginx-1.13.6-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.6/src/os/unix/ngx_setproctitle.c
764-
--- nginx-1.13.6-orig/src/os/unix/ngx_setproctitle.c 2017-10-10 17:22:52.000000000 +0200
765-
+++ nginx-1.13.6/src/os/unix/ngx_setproctitle.c 2017-10-13 23:48:34.187611480 +0200
763+
diff -urN nginx-1.13.7-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.7/src/os/unix/ngx_setproctitle.c
764+
--- nginx-1.13.7-orig/src/os/unix/ngx_setproctitle.c 2017-11-27 23:04:57.719526031 +0100
765+
+++ nginx-1.13.7/src/os/unix/ngx_setproctitle.c 2017-11-27 23:07:50.361507151 +0100
766766
@@ -89,7 +89,7 @@
767767

768768
ngx_os_argv[1] = NULL;

‎patch-proc.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ check() {
5454
old_ver_dir="${data_dir}/nginx-${old_ver}-orig"
5555
new_ver_dir="${data_dir}/nginx-${new_ver}-orig"
5656

57+
if [[ ! -e "$old_ver_dir" ]] ; then
58+
show "Directory $old_ver_dir doesn't exist" $RED
59+
exit 1
60+
fi
61+
62+
if [[ ! -e "$new_ver_dir" ]] ; then
63+
show "Directory $new_ver_dir doesn't exist" $RED
64+
exit 1
65+
fi
66+
5767
sources=$(grep '+++' "$patch_file" | tr "\t" " " | cut -f2 -d" " | cut -f2-99 -d "/")
5868

5969
show ""

‎webkaos.spec‎

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

47-
%define boring_commit e1068b76bd1d7f6ea06c90faa523ad8d562ec11b
47+
%define boring_commit 8c9ceadc58f425bd5edc71c349ef55e1a516302d
4848
%define psol_ver 1.12.34.2
49-
%define lua_module_ver 0.10.10
50-
%define mh_module_ver 0.32
49+
%define lua_module_ver 0.10.11
50+
%define mh_module_ver 0.33
5151
%define pcre_ver 8.41
5252
%define zlib_ver 1.2.11
5353

@@ -58,8 +58,8 @@
5858

5959
Summary: Superb high performance web server
6060
Name: webkaos
61-
Version: 1.13.6
62-
Release: 2%{?dist}
61+
Version: 1.13.7
62+
Release: 0%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
6565
Vendor: Nginx / Google / CloudFlare / ESSENTIALKAOS
@@ -100,8 +100,6 @@ Patch3: boringssl.patch
100100
# https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__1.13.0_http2_spdy.patch
101101
Patch4: %{name}-http2-spdy.patch
102102
Patch5: boringssl-tls13-support.patch
103-
104-
105103
# Patch for build with nginx >= 1.13.4
106104
Patch6: ngx_pagespeed-build-fix.patch
107105

@@ -458,7 +456,11 @@ exit 0
458456
%{__chown} root:root %{_logdir}/%{name}
459457

460458
if [[ $1 -eq 1 ]] ; then
461-
%{__sysctl} enable %{name}.service &>/dev/null || :
459+
%if 0%{?rhel} >= 7
460+
%{__sysctl} enable %{name}.service &>/dev/null || :
461+
%else
462+
%{__chkconfig} --add %{name} &>/dev/null || :
463+
%endif
462464

463465
# Generate unique nonce for common.conf
464466
sed -i "s/{RANDOM}/`mktemp -u XXXXXXXXXXXX`/" \
@@ -510,7 +512,7 @@ if [[ $1 -ge 1 ]] ; then
510512
%if 0%{?rhel} >= 7
511513
%{__sysctl} daemon-reload &>/dev/null || :
512514
%endif
513-
%{__service} %{service_name} upgrade &>/dev/null || :
515+
%{__service} %{service_name} upgrade &>/dev/null || :
514516
fi
515517

516518

@@ -596,6 +598,13 @@ rm -rf %{buildroot}
596598
###############################################################################
597599

598600
%changelog
601+
* Tue Nov 28 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.7-0
602+
- Nginx updated to 1.13.7
603+
- BoringSSL updated to latest version
604+
- Lua module updated to 0.10.11
605+
- More Headers module updated to 0.33
606+
- Fixed bug with autostart on CentOS6
607+
599608
* Tue Nov 07 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.6-2
600609
- Added '--with-compat' option for improved compatibility with dynamic modules
601610
- Improved extended preferences
@@ -604,7 +613,7 @@ rm -rf %{buildroot}
604613
- Fixed TLS 1.3 support
605614

606615
* Sat Oct 14 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.6-0
607-
- Nginx updated to 1.13.5
616+
- Nginx updated to 1.13.6
608617
- BoringSSL updated to latest version
609618

610619
* Wed Sep 20 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.5-0

0 commit comments

Comments
 (0)