Skip to content

Commit 3349a0c

Browse files
andyoneandyone
authored
Merge pull request #17 from essentialkaos/develop
Version 1.11.3
2 parents e9a91c7 + b9faffb commit 3349a0c

File tree

5 files changed

+53
-39
lines changed

5 files changed

+53
-39
lines changed

‎SOURCES/ssl-wildcard.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# config to enable HSTS(HTTP Strict Transport Security) https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
2+
# to avoid ssl stripping https://en.wikipedia.org/wiki/SSL_stripping#SSL_stripping
3+
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload" always;

‎SOURCES/ssl.conf‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
# config to enable HSTS(HTTP Strict Transport Security) https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
22
# to avoid ssl stripping https://en.wikipedia.org/wiki/SSL_stripping#SSL_stripping
3-
add_header Strict-Transport-Security "max-age=31536000; preload";
4-
5-
# For wilcard certs you can use next rule
6-
# add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload";
3+
add_header Strict-Transport-Security "max-age=31536000; preload" always;

‎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.11.2-orig/auto/lib/openssl/make nginx-1.11.2/auto/lib/openssl/make
2-
--- nginx-1.11.2-orig/auto/lib/openssl/make 2016-07-12 18:27:54.827769832 -0400
3-
+++ nginx-1.11.2/auto/lib/openssl/make 2016-07-12 18:54:29.616445352 -0400
1+
diff -urN nginx-1.11.3-orig/auto/lib/openssl/make nginx-1.11.3/auto/lib/openssl/make
2+
--- nginx-1.11.3-orig/auto/lib/openssl/make 2016-07-12 18:27:54.827769832 -0400
3+
+++ nginx-1.11.3/auto/lib/openssl/make 2016-07-12 18:54:29.616445352 -0400
44
@@ -45,18 +45,18 @@
55
/*) ngx_prefix="$OPENSSL/.openssl" ;;
66
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.11.2-orig/auto/lib/openssl/make nginx-1.11.2/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.11.2-orig/src/core/nginx.c nginx-1.11.2/src/core/nginx.c
28-
--- nginx-1.11.2-orig/src/core/nginx.c 2016-07-12 18:27:54.864769825 -0400
29-
+++ nginx-1.11.2/src/core/nginx.c 2016-07-12 18:55:27.651473539 -0400
27+
diff -urN nginx-1.11.3-orig/src/core/nginx.c nginx-1.11.3/src/core/nginx.c
28+
--- nginx-1.11.3-orig/src/core/nginx.c 2016-07-12 18:27:54.864769825 -0400
29+
+++ nginx-1.11.3/src/core/nginx.c 2016-07-12 18:55:27.651473539 -0400
3030
@@ -378,9 +378,9 @@
3131

3232
if (ngx_show_help) {
@@ -40,13 +40,13 @@ diff -urN nginx-1.11.2-orig/src/core/nginx.c nginx-1.11.2/src/core/nginx.c
4040
"Options:" NGX_LINEFEED
4141
" -?,-h : this help" NGX_LINEFEED
4242
" -v : show version and exit" NGX_LINEFEED
43-
diff -urN nginx-1.11.2-orig/src/core/nginx.h nginx-1.11.2/src/core/nginx.h
44-
--- nginx-1.11.2-orig/src/core/nginx.h 2016-07-12 18:27:54.868769825 -0400
45-
+++ nginx-1.11.2/src/core/nginx.h 2016-07-12 18:55:41.000000000 -0400
43+
diff -urN nginx-1.11.3-orig/src/core/nginx.h nginx-1.11.3/src/core/nginx.h
44+
--- nginx-1.11.3-orig/src/core/nginx.h 2016-07-12 18:27:54.868769825 -0400
45+
+++ nginx-1.11.3/src/core/nginx.h 2016-07-12 18:55:41.000000000 -0400
4646
@@ -11,7 +11,7 @@
4747

48-
#define nginx_version 1011002
49-
#define NGINX_VERSION "1.11.2"
48+
#define nginx_version 1011003
49+
#define NGINX_VERSION "1.11.3"
5050
-#define NGINX_VER "nginx/" NGINX_VERSION
5151
+#define NGINX_VER "webkaos/" NGINX_VERSION
5252

@@ -61,9 +61,9 @@ diff -urN nginx-1.11.2-orig/src/core/nginx.h nginx-1.11.2/src/core/nginx.h
6161
#define NGX_OLDPID_EXT ".oldbin"
6262

6363

64-
diff -urN nginx-1.11.2-orig/src/core/ngx_log.c nginx-1.11.2/src/core/ngx_log.c
65-
--- nginx-1.11.2-orig/src/core/ngx_log.c 2016-07-12 18:27:54.867769824 -0400
66-
+++ nginx-1.11.2/src/core/ngx_log.c 2016-07-12 18:57:00.359519372 -0400
64+
diff -urN nginx-1.11.3-orig/src/core/ngx_log.c nginx-1.11.3/src/core/ngx_log.c
65+
--- nginx-1.11.3-orig/src/core/ngx_log.c 2016-07-12 18:27:54.867769824 -0400
66+
+++ nginx-1.11.3/src/core/ngx_log.c 2016-07-12 18:57:00.359519372 -0400
6767
@@ -202,9 +202,9 @@
6868
return;
6969
}
@@ -94,9 +94,9 @@ diff -urN nginx-1.11.2-orig/src/core/ngx_log.c nginx-1.11.2/src/core/ngx_log.c
9494
return NGX_CONF_ERROR;
9595
#endif
9696

97-
diff -urN nginx-1.11.2-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.11.2/src/http/modules/ngx_http_autoindex_module.c
98-
--- nginx-1.11.2-orig/src/http/modules/ngx_http_autoindex_module.c 2016-07-12 18:27:54.850769821 -0400
99-
+++ nginx-1.11.2/src/http/modules/ngx_http_autoindex_module.c 2016-07-12 18:57:24.517531092 -0400
97+
diff -urN nginx-1.11.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.11.3/src/http/modules/ngx_http_autoindex_module.c
98+
--- nginx-1.11.3-orig/src/http/modules/ngx_http_autoindex_module.c 2016-07-12 18:27:54.850769821 -0400
99+
+++ nginx-1.11.3/src/http/modules/ngx_http_autoindex_module.c 2016-07-12 18:57:24.517531092 -0400
100100
@@ -445,9 +445,11 @@
101101
;
102102

@@ -172,9 +172,9 @@ diff -urN nginx-1.11.2-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
172172
tm.ngx_tm_mday,
173173
months[tm.ngx_tm_mon - 1],
174174
tm.ngx_tm_year,
175-
diff -urN nginx-1.11.2-orig/src/http/ngx_http_header_filter_module.c nginx-1.11.2/src/http/ngx_http_header_filter_module.c
176-
--- nginx-1.11.2-orig/src/http/ngx_http_header_filter_module.c 2016-07-12 18:27:54.855769823 -0400
177-
+++ nginx-1.11.2/src/http/ngx_http_header_filter_module.c 2016-07-12 19:01:30.000000000 -0400
175+
diff -urN nginx-1.11.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.11.3/src/http/ngx_http_header_filter_module.c
176+
--- nginx-1.11.3-orig/src/http/ngx_http_header_filter_module.c 2016-07-12 18:27:54.855769823 -0400
177+
+++ nginx-1.11.3/src/http/ngx_http_header_filter_module.c 2016-07-12 19:01:30.000000000 -0400
178178
@@ -46,7 +46,7 @@
179179
};
180180

@@ -228,9 +228,9 @@ diff -urN nginx-1.11.2-orig/src/http/ngx_http_header_filter_module.c nginx-1.11.
228228
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
229229

230230
ngx_string("500 Internal Server Error"),
231-
diff -urN nginx-1.11.2-orig/src/http/ngx_http_special_response.c nginx-1.11.2/src/http/ngx_http_special_response.c
232-
--- nginx-1.11.2-orig/src/http/ngx_http_special_response.c 2016-07-12 18:27:54.857769823 -0400
233-
+++ nginx-1.11.2/src/http/ngx_http_special_response.c 2016-07-12 18:57:48.265543888 -0400
231+
diff -urN nginx-1.11.3-orig/src/http/ngx_http_special_response.c nginx-1.11.3/src/http/ngx_http_special_response.c
232+
--- nginx-1.11.3-orig/src/http/ngx_http_special_response.c 2016-07-12 18:27:54.857769823 -0400
233+
+++ nginx-1.11.3/src/http/ngx_http_special_response.c 2016-07-12 18:57:48.265543888 -0400
234234
@@ -19,14 +19,14 @@
235235

236236

@@ -683,9 +683,9 @@ diff -urN nginx-1.11.2-orig/src/http/ngx_http_special_response.c nginx-1.11.2/sr
683683
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
684684

685685
ngx_string(ngx_http_error_494_page), /* 494, request header too large */
686-
diff -urN nginx-1.11.2-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.11.2/src/http/v2/ngx_http_v2_filter_module.c
687-
--- nginx-1.11.2-orig/src/http/v2/ngx_http_v2_filter_module.c 2016-07-12 18:27:54.860769824 -0400
688-
+++ nginx-1.11.2/src/http/v2/ngx_http_v2_filter_module.c 2016-07-12 19:03:04.000000000 -0400
686+
diff -urN nginx-1.11.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.11.3/src/http/v2/ngx_http_v2_filter_module.c
687+
--- nginx-1.11.3-orig/src/http/v2/ngx_http_v2_filter_module.c 2016-07-12 18:27:54.860769824 -0400
688+
+++ nginx-1.11.3/src/http/v2/ngx_http_v2_filter_module.c 2016-07-12 19:03:04.000000000 -0400
689689
@@ -139,7 +139,7 @@
690690
ngx_http_core_srv_conf_t *cscf;
691691
u_char addr[NGX_SOCKADDR_STRLEN];
@@ -704,9 +704,9 @@ diff -urN nginx-1.11.2-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.11.2
704704

705705
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
706706

707-
diff -urN nginx-1.11.2-orig/src/os/unix/ngx_setproctitle.c nginx-1.11.2/src/os/unix/ngx_setproctitle.c
708-
--- nginx-1.11.2-orig/src/os/unix/ngx_setproctitle.c 2016-07-12 18:27:54.836769823 -0400
709-
+++ nginx-1.11.2/src/os/unix/ngx_setproctitle.c 2016-07-12 18:58:12.202554002 -0400
707+
diff -urN nginx-1.11.3-orig/src/os/unix/ngx_setproctitle.c nginx-1.11.3/src/os/unix/ngx_setproctitle.c
708+
--- nginx-1.11.3-orig/src/os/unix/ngx_setproctitle.c 2016-07-12 18:27:54.836769823 -0400
709+
+++ nginx-1.11.3/src/os/unix/ngx_setproctitle.c 2016-07-12 18:58:12.202554002 -0400
710710
@@ -89,7 +89,7 @@
711711

712712
ngx_os_argv[1] = NULL;

‎webkaos-centos6.spec‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
Summary: Superb high performance web server
6060
Name: webkaos
61-
Version: 1.11.2
61+
Version: 1.11.3
6262
Release: 0%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
@@ -75,8 +75,9 @@ Source20: pagespeed.conf
7575
Source21: pagespeed-enabled.conf
7676
Source22: pagespeed-access.pswd
7777
Source23: ssl.conf
78-
Source24: common.conf
79-
Source25: bots.conf
78+
Source24: ssl-wildcard.conf
79+
Source25: common.conf
80+
Source26: bots.conf
8081

8182
Source30: %{name}-index.html
8283

@@ -331,6 +332,8 @@ install -pm 644 %{SOURCE24} \
331332
%{buildroot}%{_sysconfdir}/%{name}/xtra/
332333
install -pm 644 %{SOURCE25} \
333334
%{buildroot}%{_sysconfdir}/%{name}/xtra/
335+
install -pm 644 %{SOURCE26} \
336+
%{buildroot}%{_sysconfdir}/%{name}/xtra/
334337

335338
install -dm 755 %{buildroot}%{_sysconfdir}/sysconfig
336339

@@ -425,6 +428,7 @@ fi
425428
%config(noreplace) %{_sysconfdir}/%{name}/xtra/pagespeed-enabled.conf
426429
%config %{_sysconfdir}/%{name}/xtra/common.conf
427430
%config %{_sysconfdir}/%{name}/xtra/ssl.conf
431+
%config %{_sysconfdir}/%{name}/xtra/ssl-wildcard.conf
428432
%config %{_sysconfdir}/%{name}/xtra/bots.conf
429433

430434
%config %{_sysconfdir}/%{name}/mime.types
@@ -464,6 +468,9 @@ fi
464468
###############################################################################
465469

466470
%changelog
471+
* Tue Aug 09 2016 Gleb Goncharov <g.goncharov@fun-box.ru> - 1.11.3-0
472+
- Nginx updated to 1.11.3
473+
467474
* Wed Jul 13 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.2-0
468475
- Nginx updated to 1.11.2
469476
- PageSpeed updated to 1.11.33.2

‎webkaos-centos7.spec‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
Summary: Superb high performance web server
6060
Name: webkaos
61-
Version: 1.11.2
61+
Version: 1.11.3
6262
Release: 0%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
@@ -75,8 +75,9 @@ Source20: pagespeed.conf
7575
Source21: pagespeed-enabled.conf
7676
Source22: pagespeed-access.pswd
7777
Source23: ssl.conf
78-
Source24: common.conf
79-
Source25: bots.conf
78+
Source24: ssl-wildcard.conf
79+
Source25: common.conf
80+
Source26: bots.conf
8081

8182
Source30: %{name}-index.html
8283

@@ -327,6 +328,8 @@ install -pm 644 %{SOURCE24} \
327328
%{buildroot}%{_sysconfdir}/%{name}/xtra/
328329
install -pm 644 %{SOURCE25} \
329330
%{buildroot}%{_sysconfdir}/%{name}/xtra/
331+
install -pm 644 %{SOURCE26} \
332+
%{buildroot}%{_sysconfdir}/%{name}/xtra/
330333

331334
install -dm 755 %{buildroot}%{_sysconfdir}/sysconfig
332335

@@ -421,6 +424,7 @@ fi
421424
%config(noreplace) %{_sysconfdir}/%{name}/xtra/pagespeed-enabled.conf
422425
%config %{_sysconfdir}/%{name}/xtra/common.conf
423426
%config %{_sysconfdir}/%{name}/xtra/ssl.conf
427+
%config %{_sysconfdir}/%{name}/xtra/ssl-wildcard.conf
424428
%config %{_sysconfdir}/%{name}/xtra/bots.conf
425429

426430
%config %{_sysconfdir}/%{name}/mime.types
@@ -460,6 +464,9 @@ fi
460464
###############################################################################
461465

462466
%changelog
467+
* Tue Aug 09 2016 Gleb Goncharov <g.goncharov@fun-box.ru> - 1.11.3-0
468+
- Nginx updated to 1.11.3
469+
463470
* Wed Jul 13 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.2-0
464471
- Nginx updated to 1.11.2
465472
- PCRE updated to 8.39

0 commit comments

Comments
 (0)