Skip to content

Commit 8840324

Browse files
andyoneandyone
authored
Merge pull request #12 from essentialkaos/develop
Version 1.11.2
2 parents af34332 + dc9993e commit 8840324

File tree

5 files changed

+130
-61
lines changed

5 files changed

+130
-61
lines changed

‎SOURCES/pagespeed-config-1.9.32.14.patch‎

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

‎SOURCES/webkaos.patch‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN nginx-1.11.1-orig/auto/lib/openssl/make nginx-1.11.1/auto/lib/openssl/make
2-
--- nginx-1.11.1-orig/auto/lib/openssl/make 2016-06-01 07:31:55.597143474 -0400
3-
+++ nginx-1.11.1/auto/lib/openssl/make 2016-04-27 06:35:03.000000000 -0400
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
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.1-orig/auto/lib/openssl/make nginx-1.11.1/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.11.1-orig/src/core/nginx.c nginx-1.11.1/src/core/nginx.c
28-
--- nginx-1.11.1-orig/src/core/nginx.c 2016-06-01 07:31:55.631143491 -0400
29-
+++ nginx-1.11.1/src/core/nginx.c 2016-06-01 09:18:45.000000000 -0400
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
3030
@@ -378,9 +378,9 @@
3131

3232
if (ngx_show_help) {
@@ -40,13 +40,13 @@ diff -urN nginx-1.11.1-orig/src/core/nginx.c nginx-1.11.1/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.1-orig/src/core/nginx.h nginx-1.11.1/src/core/nginx.h
44-
--- nginx-1.11.1-orig/src/core/nginx.h 2016-06-01 07:31:55.636143493 -0400
45-
+++ nginx-1.11.1/src/core/nginx.h 2016-06-01 09:18:22.000000000 -0400
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
4646
@@ -11,7 +11,7 @@
4747

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

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

6363

64-
diff -urN nginx-1.11.1-orig/src/core/ngx_log.c nginx-1.11.1/src/core/ngx_log.c
65-
--- nginx-1.11.1-orig/src/core/ngx_log.c 2016-06-01 07:31:55.634143491 -0400
66-
+++ nginx-1.11.1/src/core/ngx_log.c 2016-06-01 09:20:32.000000000 -0400
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
6767
@@ -202,9 +202,9 @@
6868
return;
6969
}
@@ -94,9 +94,9 @@ diff -urN nginx-1.11.1-orig/src/core/ngx_log.c nginx-1.11.1/src/core/ngx_log.c
9494
return NGX_CONF_ERROR;
9595
#endif
9696

97-
diff -urN nginx-1.11.1-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.11.1/src/http/modules/ngx_http_autoindex_module.c
98-
--- nginx-1.11.1-orig/src/http/modules/ngx_http_autoindex_module.c 2016-06-01 07:31:55.617143484 -0400
99-
+++ nginx-1.11.1/src/http/modules/ngx_http_autoindex_module.c 2014-12-29 08:19:39.000000000 -0500
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
100100
@@ -445,9 +445,11 @@
101101
;
102102

@@ -172,9 +172,9 @@ diff -urN nginx-1.11.1-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.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.11.1/src/http/ngx_http_header_filter_module.c
176-
--- nginx-1.11.1-orig/src/http/ngx_http_header_filter_module.c 2016-06-01 07:31:55.623143487 -0400
177-
+++ nginx-1.11.1/src/http/ngx_http_header_filter_module.c 2016-06-01 09:32:39.000000000 -0400
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
178178
@@ -46,7 +46,7 @@
179179
};
180180

@@ -228,9 +228,9 @@ diff -urN nginx-1.11.1-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.1-orig/src/http/ngx_http_special_response.c nginx-1.11.1/src/http/ngx_http_special_response.c
232-
--- nginx-1.11.1-orig/src/http/ngx_http_special_response.c 2016-06-01 07:31:55.624143487 -0400
233-
+++ nginx-1.11.1/src/http/ngx_http_special_response.c 2016-06-01 09:49:41.000000000 -0400
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
234234
@@ -19,14 +19,14 @@
235235

236236

@@ -683,19 +683,19 @@ diff -urN nginx-1.11.1-orig/src/http/ngx_http_special_response.c nginx-1.11.1/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.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.11.1/src/http/v2/ngx_http_v2_filter_module.c
687-
--- nginx-1.11.1-orig/src/http/v2/ngx_http_v2_filter_module.c 2016-06-01 07:31:55.626143488 -0400
688-
+++ nginx-1.11.1/src/http/v2/ngx_http_v2_filter_module.c 2016-06-01 10:28:47.000000000 -0400
689-
@@ -143,7 +143,7 @@
690-
#endif
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
689+
@@ -139,7 +139,7 @@
690+
ngx_http_core_srv_conf_t *cscf;
691691
u_char addr[NGX_SOCKADDR_STRLEN];
692692

693693
- static const u_char nginx[5] = "\x84\xaa\x63\x55\xe7";
694694
+ static const u_char nginx[6] = "\x85\xf0\x58\xfa\x8c\xe8";
695695
#if (NGX_HTTP_GZIP)
696696
static const u_char accept_encoding[12] =
697697
"\x8b\x84\x84\x2d\x69\x5b\x05\x44\x3c\x86\xaa\x6f";
698-
@@ -437,7 +437,7 @@
698+
@@ -416,7 +416,7 @@
699699
if (r->headers_out.server == NULL) {
700700
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
701701
"http2 output header: \"server: %s\"",
@@ -704,9 +704,9 @@ diff -urN nginx-1.11.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.11.1
704704

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

707-
diff -urN nginx-1.11.1-orig/src/os/unix/ngx_setproctitle.c nginx-1.11.1/src/os/unix/ngx_setproctitle.c
708-
--- nginx-1.11.1-orig/src/os/unix/ngx_setproctitle.c 2016-06-01 07:31:55.603143476 -0400
709-
+++ nginx-1.11.1/src/os/unix/ngx_setproctitle.c 2016-06-01 09:54:30.000000000 -0400
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
710710
@@ -89,7 +89,7 @@
711711

712712
ngx_os_argv[1] = NULL;

‎patch-check.sh‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
5+
NORM=0
6+
BOLD=1
7+
UNLN=4
8+
RED=31
9+
GREEN=32
10+
BROWN=33
11+
BLUE=34
12+
MAG=35
13+
CYAN=36
14+
GREY=37
15+
16+
CL_NORM="\e[${NORM}m"
17+
CL_RED="\e[0;${RED};49m"
18+
CL_GREEN="\e[0;${GREEN};49m"
19+
CL_BROWN="\e[0;${BROWN};49m"
20+
CL_BLUE="\e[0;${BLUE};49m"
21+
CL_MAG="\e[0;${MAG};49m"
22+
CL_CYAN="\e[0;${CYAN};49m"
23+
CL_GREY="\e[0;${GREY};49m"
24+
CL_BL_RED="\e[1;${RED};49m"
25+
CL_BL_GREEN="\e[1;${GREEN};49m"
26+
CL_BL_BROWN="\e[1;${BROWN};49m"
27+
CL_BL_BLUE="\e[1;${BLUE};49m"
28+
CL_BL_MAG="\e[1;${MAG};49m"
29+
CL_BL_CYAN="\e[1;${CYAN};49m"
30+
CL_BL_GREY="\e[1;${GREY};49m"
31+
32+
###############################################################################
33+
34+
main() {
35+
if [[ $# -ne 3 ]] ; then
36+
echo "Usage: ./patch-check.sh webkaos.patch old-ver-dir new-ver-dir"
37+
exit 0
38+
fi
39+
40+
local patch_file="$1"
41+
local old_ver_dir="$2"
42+
local new_ver_dir="$3"
43+
44+
local sources=$(grep '+++' "$patch_file" | tr "\t" " " | cut -f2 -d" " | cut -f2-99 -d "/")
45+
46+
show ""
47+
48+
for source_file in $sources ; do
49+
local old_ver_hash=$(getHash "$old_ver_dir/$source_file")
50+
local new_ver_hash=$(getHash "$new_ver_dir/$source_file")
51+
52+
if [[ "$old_ver_hash" == "$new_ver_hash" ]] ; then
53+
show " ${CL_GREEN}✔${CL_NORM} $source_file"
54+
else
55+
local diff_size=$(diff -U 0 "$old_ver_dir/$source_file" "$new_ver_dir/$source_file" | grep -v ^@ | wc -l)
56+
show " ${CL_RED}✖${CL_NORM} $source_file ${CL_GREY}($diff_size lines)${CL_NORM}"
57+
fi
58+
done
59+
60+
show ""
61+
}
62+
63+
getHash() {
64+
sha256sum "$1" | cut -f1 -d" "
65+
}
66+
67+
show() {
68+
if [[ -n "$2" ]] ; then
69+
echo -e "\e[${2}m${1}${CL_NORM}"
70+
else
71+
echo -e "$@"
72+
fi
73+
}
74+
75+
###############################################################################
76+
77+
main $@

‎webkaos-centos6.spec‎

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

4646
%define open_ssl_ver 1.0.2h
47-
%define psol_ver 1.9.32.14
47+
%define psol_ver 1.11.33.2
4848
%define lua_module_ver 0.10.5
4949
%define mh_module_ver 0.30
50-
%define pcre_ver 8.38
50+
%define pcre_ver 8.39
5151
%define zlib_ver 1.2.8
5252

5353
%define pagespeed_ver %{psol_ver}-beta
@@ -58,8 +58,8 @@
5858

5959
Summary: Superb high performance web server
6060
Name: webkaos
61-
Version: 1.11.1
62-
Release: 1%{?dist}
61+
Version: 1.11.2
62+
Release: 0%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
6565
Vendor: Nginx / Google / CloudFlare / ESSENTIALKAOS
@@ -91,14 +91,14 @@ Source56: http://zlib.net/zlib-%{zlib_ver}.tar.gz
9191
Patch0: %{name}.patch
9292
Patch1: %{name}-dynamic-tls-records.patch
9393
Patch2: mime.patch
94-
Patch3: pagespeed-config-%{psol_ver}.patch
9594

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

9897
Requires: initscripts >= 8.36 kaosv >= 2.8
9998
Requires: gd libXpm libxslt libluajit
10099

101-
BuildRequires: make gcc-c++ perl libluajit-devel
100+
BuildRequires: make devtoolset-2-gcc-c++ devtoolset-2-binutils
101+
BuildRequires: perl libluajit-devel
102102

103103
Requires(pre): shadow-utils
104104
Requires(post): chkconfig
@@ -152,10 +152,6 @@ Links for nginx compatibility.
152152
%patch1 -p1
153153
%patch2 -p1
154154

155-
pushd ngx_pagespeed-%{pagespeed_fullver}
156-
%patch3 -p1
157-
popd
158-
159155
%build
160156

161157
# Fixed bug with ngx_pagespeed comilation on i386
@@ -177,6 +173,9 @@ popd
177173

178174
%{__mv} headers-more-nginx-module-%{mh_module_ver}/README.markdown ./HEADERSMORE-README.markdown
179175

176+
# Use gcc and gcc-c++ from devtoolset for build
177+
export PATH="/opt/rh/devtoolset-2/root/usr/bin:$PATH"
178+
180179
./configure \
181180
--prefix=%{_sysconfdir}/%{name} \
182181
--sbin-path=%{_sbindir}/%{name} \
@@ -465,6 +464,11 @@ fi
465464
###############################################################################
466465

467466
%changelog
467+
* Wed Jul 13 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.2-0
468+
- Nginx updated to 1.11.2
469+
- PageSpeed updated to 1.11.33.2
470+
- PCRE updated to 8.39
471+
468472
* Tue Jun 14 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.1-1
469473
- Added patch for dynamic TLS records size
470474

‎webkaos-centos7.spec‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
%define psol_ver 1.11.33.2
4848
%define lua_module_ver 0.10.5
4949
%define mh_module_ver 0.30
50-
%define pcre_ver 8.38
50+
%define pcre_ver 8.39
5151
%define zlib_ver 1.2.8
5252

5353
%define pagespeed_ver %{psol_ver}-beta
@@ -58,8 +58,8 @@
5858

5959
Summary: Superb high performance web server
6060
Name: webkaos
61-
Version: 1.11.1
62-
Release: 2%{?dist}
61+
Version: 1.11.2
62+
Release: 0%{?dist}
6363
License: 2-clause BSD-like license
6464
Group: System Environment/Daemons
6565
Vendor: Nginx / Google / CloudFlare / ESSENTIALKAOS
@@ -460,6 +460,10 @@ fi
460460
###############################################################################
461461

462462
%changelog
463+
* Wed Jul 13 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.2-0
464+
- Nginx updated to 1.11.2
465+
- PCRE updated to 8.39
466+
463467
* Fri Jun 17 2016 Anton Novojilov <andy@essentialkaos.com> - 1.11.1-2
464468
- Added TCP Fast Open support
465469

0 commit comments

Comments
 (0)