Skip to content

Commit 5be85a2

Browse files
andyoneandyone
authored
Merge pull request #46 from essentialkaos/develop
Version 1.13.6
2 parents a36c577 + 3bf0a4a commit 5be85a2

File tree

4 files changed

+62
-57
lines changed

4 files changed

+62
-57
lines changed

‎SOURCES/mime.patch‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
diff -urN mime-orig/conf/mime.types mime/conf/mime.types
2-
--- mime-orig/conf/mime.types 2014-10-28 16:04:47.000000000 +0100
3-
+++ mime/conf/mime.types 2014-10-30 22:41:49.000000000 +0100
4-
@@ -21,7 +21,7 @@
5-
image/x-icon ico;
6-
image/x-jng jng;
7-
image/x-ms-bmp bmp;
8-
- image/svg+xml svg svgz;
9-
+ image/svg+xml svg svgz xng;
10-
image/webp webp;
1+
diff -urN nginx-1.13.6-orig/conf/mime.types nginx-1.13.6/conf/mime.types
2+
--- nginx-1.13.6-orig/conf/mime.types 2017-10-10 17:22:51.000000000 +0200
3+
+++ nginx-1.13.6/conf/mime.types 2017-10-14 00:16:51.000000000 +0200
4+
@@ -16,7 +16,7 @@
5+
text/x-component htc;
116

12-
application/font-woff woff;
13-
@@ -86,4 +86,7 @@
14-
video/x-ms-asf asx asf;
15-
video/x-ms-wmv wmv;
16-
video/x-msvideo avi;
17-
+
18-
+ application/x-font-ttf ttf;
19-
+ application/vnd.ms-opentype otf;
20-
}
7+
image/png png;
8+
- image/svg+xml svg svgz;
9+
+ image/svg+xml svg svgz xng;
10+
image/tiff tif tiff;
11+
image/vnd.wap.wbmp wbmp;
12+
image/webp webp;
13+
@@ -24,6 +24,8 @@
14+
image/x-jng jng;
15+
image/x-ms-bmp bmp;
16+
17+
+ application/x-font-ttf ttf;
18+
+ application/vnd.ms-opentype otf;
19+
application/font-woff woff;
20+
application/java-archive jar war ear;
21+
application/json json;

‎SOURCES/webkaos.init‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ kv.disableOutputRedirect "start" "pre"
8787
prepare() {
8888
local has_errors=""
8989

90-
[[ ! -x $binary ]] && has_errors=true && kv.error "<BINARY> must be executable file."
91-
[[ ! -r $conf_file ]] && has_errors=true && kv.error "<CONF_FILE> must be readable file."
92-
[[ ! -s $conf_file ]] && has_errors=true && kv.error "<CONF_FILE> can't be empty."
90+
[[ ! -x $binary ]] && has_errors=true && kv.error "<BINARY> must be executable file"
91+
[[ ! -r $conf_file ]] && has_errors=true && kv.error "<CONF_FILE> must be readable file"
92+
[[ ! -s $conf_file ]] && has_errors=true && kv.error "<CONF_FILE> can't be empty"
9393

9494
if kv.isRoot ; then
95-
[[ ! -w $cache_dir ]] && has_errors=true && kv.error "<CACHE_DIR> must be writable directory."
96-
[[ ! -w $pagespeed_cache ]] && has_errors=true && kv.error "<PAGESPEED_CACHE> must be writable directory."
95+
[[ ! -w $cache_dir ]] && has_errors=true && kv.error "<CACHE_DIR> must be writable directory"
96+
[[ ! -w $pagespeed_cache ]] && has_errors=true && kv.error "<PAGESPEED_CACHE> must be writable directory"
9797
fi
9898

9999
[[ $has_errors ]] && kv.exit $ACTION_ERROR

‎SOURCES/webkaos.patch‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN nginx-1.13.5-orig/auto/lib/openssl/make nginx-1.13.5/auto/lib/openssl/make
2-
--- nginx-1.13.5-orig/auto/lib/openssl/make 2017-09-20 00:21:12.127130775 +0200
3-
+++ nginx-1.13.5/auto/lib/openssl/make 2017-09-20 00:22:44.417126771 +0200
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
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.5-orig/auto/lib/openssl/make nginx-1.13.5/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.13.5-orig/src/core/nginx.c nginx-1.13.5/src/core/nginx.c
28-
--- nginx-1.13.5-orig/src/core/nginx.c 2017-09-20 00:21:12.181130543 +0200
29-
+++ nginx-1.13.5/src/core/nginx.c 2017-09-20 00:22:44.446127321 +0200
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
3030
@@ -388,13 +388,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.13.5-orig/src/core/nginx.c nginx-1.13.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.13.5-orig/src/core/nginx.h nginx-1.13.5/src/core/nginx.h
49-
--- nginx-1.13.5-orig/src/core/nginx.h 2017-09-20 00:21:12.184130543 +0200
50-
+++ nginx-1.13.5/src/core/nginx.h 2017-09-20 00:24:09.000000000 +0200
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
5151
@@ -11,7 +11,7 @@
5252

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

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

6868

69-
diff -urN nginx-1.13.5-orig/src/core/ngx_log.c nginx-1.13.5/src/core/ngx_log.c
70-
--- nginx-1.13.5-orig/src/core/ngx_log.c 2017-09-20 00:21:12.183130543 +0200
71-
+++ nginx-1.13.5/src/core/ngx_log.c 2017-09-20 00:22:44.471127303 +0200
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
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.13.5-orig/src/core/ngx_log.c nginx-1.13.5/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.13.5-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.5/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.13.5-orig/src/http/modules/ngx_http_autoindex_module.c 2017-09-20 00:21:12.160130543 +0200
104-
+++ nginx-1.13.5/src/http/modules/ngx_http_autoindex_module.c 2017-09-20 00:22:44.487127303 +0200
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
105105
@@ -445,9 +445,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.13.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.13.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.5/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.13.5-orig/src/http/ngx_http_header_filter_module.c 2017-09-20 00:21:12.172130543 +0200
182-
+++ nginx-1.13.5/src/http/ngx_http_header_filter_module.c 2017-09-20 00:22:44.507127300 +0200
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
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.13.5-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.5-orig/src/http/ngx_http_special_response.c nginx-1.13.5/src/http/ngx_http_special_response.c
234-
--- nginx-1.13.5-orig/src/http/ngx_http_special_response.c 2017-09-20 00:21:12.172130543 +0200
235-
+++ nginx-1.13.5/src/http/ngx_http_special_response.c 2017-09-20 00:22:44.526127301 +0200
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
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -739,10 +739,10 @@ diff -urN nginx-1.13.5-orig/src/http/ngx_http_special_response.c nginx-1.13.5/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.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.5/src/http/v2/ngx_http_v2_filter_module.c
743-
--- nginx-1.13.5-orig/src/http/v2/ngx_http_v2_filter_module.c 2017-09-20 00:21:12.177130542 +0200
744-
+++ nginx-1.13.5/src/http/v2/ngx_http_v2_filter_module.c 2017-09-20 00:22:44.555127300 +0200
745-
@@ -143,7 +143,7 @@
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
745+
@@ -144,7 +144,7 @@
746746
ngx_http_core_srv_conf_t *cscf;
747747
u_char addr[NGX_SOCKADDR_STRLEN];
748748

@@ -751,7 +751,7 @@ diff -urN nginx-1.13.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.5
751751
#if (NGX_HTTP_GZIP)
752752
static const u_char accept_encoding[12] =
753753
"\x8b\x84\x84\x2d\x69\x5b\x05\x44\x3c\x86\xaa\x6f";
754-
@@ -450,7 +450,7 @@
754+
@@ -462,7 +462,7 @@
755755

756756
} else {
757757
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
@@ -760,9 +760,9 @@ diff -urN nginx-1.13.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.5
760760
}
761761

762762
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
763-
diff -urN nginx-1.13.5-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.5/src/os/unix/ngx_setproctitle.c
764-
--- nginx-1.13.5-orig/src/os/unix/ngx_setproctitle.c 2017-09-20 00:21:12.138130570 +0200
765-
+++ nginx-1.13.5/src/os/unix/ngx_setproctitle.c 2017-09-20 00:22:44.569127301 +0200
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
766766
@@ -89,7 +89,7 @@
767767

768768
ngx_os_argv[1] = NULL;

‎webkaos.spec‎

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

47-
%define boring_commit 40b24c81546f44cfc840715e8a1c1b5060d313f3
47+
%define boring_commit e1068b76bd1d7f6ea06c90faa523ad8d562ec11b
4848
%define psol_ver 1.12.34.2
4949
%define lua_module_ver 0.10.10
5050
%define mh_module_ver 0.32
@@ -58,7 +58,7 @@
5858

5959
Summary: Superb high performance web server
6060
Name: webkaos
61-
Version: 1.13.5
61+
Version: 1.13.6
6262
Release: 0%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
@@ -585,6 +585,10 @@ rm -rf %{buildroot}
585585
###############################################################################
586586

587587
%changelog
588+
* Sat Oct 14 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.6-0
589+
- Nginx updated to 1.13.5
590+
- BoringSSL updated to latest version
591+
588592
* Wed Sep 20 2017 Anton Novojilov <andy@essentialkaos.com> - 1.13.5-0
589593
- Nginx updated to 1.13.5
590594
- BoringSSL updated to latest version

0 commit comments

Comments
 (0)