Skip to content

Commit 394abfb

Browse files
andyoneandyone
authored
Merge pull request #96 from essentialkaos/develop
Version 1.17.8
2 parents bbd21f9 + b8ab826 commit 394abfb

File tree

5 files changed

+67
-68
lines changed

5 files changed

+67
-68
lines changed

‎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.17.7-orig/auto/lib/openssl/make nginx-1.17.7/auto/lib/openssl/make
2-
--- nginx-1.17.7-orig/auto/lib/openssl/make 2019-12-24 18:00:09.000000000 +0300
3-
+++ nginx-1.17.7/auto/lib/openssl/make 2019-12-25 02:05:44.840675948 +0300
1+
diff -urN nginx-1.17.8-orig/auto/lib/openssl/make nginx-1.17.8/auto/lib/openssl/make
2+
--- nginx-1.17.8-orig/auto/lib/openssl/make 2020-01-21 16:39:42.000000000 +0300
3+
+++ nginx-1.17.8/auto/lib/openssl/make 2020-02-18 01:00:09.044492148 +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.17.7-orig/auto/lib/openssl/make nginx-1.17.7/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.17.7-orig/src/core/nginx.c nginx-1.17.7/src/core/nginx.c
28-
--- nginx-1.17.7-orig/src/core/nginx.c 2019-12-24 18:00:09.000000000 +0300
29-
+++ nginx-1.17.7/src/core/nginx.c 2019-12-25 02:05:44.846675894 +0300
27+
diff -urN nginx-1.17.8-orig/src/core/nginx.c nginx-1.17.8/src/core/nginx.c
28+
--- nginx-1.17.8-orig/src/core/nginx.c 2020-01-21 16:39:42.000000000 +0300
29+
+++ nginx-1.17.8/src/core/nginx.c 2020-02-18 01:00:09.051492084 +0300
3030
@@ -389,13 +389,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.17.7-orig/src/core/nginx.c nginx-1.17.7/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.17.7-orig/src/core/nginx.h nginx-1.17.7/src/core/nginx.h
49-
--- nginx-1.17.7-orig/src/core/nginx.h 2019-12-24 18:00:09.000000000 +0300
50-
+++ nginx-1.17.7/src/core/nginx.h 2019-12-25 02:07:07.000000000 +0300
48+
diff -urN nginx-1.17.8-orig/src/core/nginx.h nginx-1.17.8/src/core/nginx.h
49+
--- nginx-1.17.8-orig/src/core/nginx.h 2020-01-21 16:39:42.000000000 +0300
50+
+++ nginx-1.17.8/src/core/nginx.h 2020-02-18 01:00:50.000000000 +0300
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1017007
54-
#define NGINX_VERSION "1.17.7"
53+
#define nginx_version 1017008
54+
#define NGINX_VERSION "1.17.8"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

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

6868

69-
diff -urN nginx-1.17.7-orig/src/core/ngx_log.c nginx-1.17.7/src/core/ngx_log.c
70-
--- nginx-1.17.7-orig/src/core/ngx_log.c 2019-12-24 18:00:09.000000000 +0300
71-
+++ nginx-1.17.7/src/core/ngx_log.c 2019-12-25 02:05:44.856675803 +0300
69+
diff -urN nginx-1.17.8-orig/src/core/ngx_log.c nginx-1.17.8/src/core/ngx_log.c
70+
--- nginx-1.17.8-orig/src/core/ngx_log.c 2020-01-21 16:39:42.000000000 +0300
71+
+++ nginx-1.17.8/src/core/ngx_log.c 2020-02-18 01:00:09.062491985 +0300
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.17.7-orig/src/core/ngx_log.c nginx-1.17.7/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.17.7-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.7/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.17.7-orig/src/http/modules/ngx_http_autoindex_module.c 2019-12-24 18:00:09.000000000 +0300
104-
+++ nginx-1.17.7/src/http/modules/ngx_http_autoindex_module.c 2019-12-25 02:05:44.862675750 +0300
102+
diff -urN nginx-1.17.8-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.8/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.17.8-orig/src/http/modules/ngx_http_autoindex_module.c 2020-01-21 16:39:42.000000000 +0300
104+
+++ nginx-1.17.8/src/http/modules/ngx_http_autoindex_module.c 2020-02-18 01:00:09.068491931 +0300
105105
@@ -449,9 +449,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.17.7-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.17.7-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.7/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.17.7-orig/src/http/ngx_http_header_filter_module.c 2019-12-24 18:00:09.000000000 +0300
182-
+++ nginx-1.17.7/src/http/ngx_http_header_filter_module.c 2019-12-25 02:05:44.867675704 +0300
180+
diff -urN nginx-1.17.8-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.8/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.17.8-orig/src/http/ngx_http_header_filter_module.c 2020-01-21 16:39:42.000000000 +0300
182+
+++ nginx-1.17.8/src/http/ngx_http_header_filter_module.c 2020-02-18 01:00:09.075491867 +0300
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.17.7-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.
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.17.7-orig/src/http/ngx_http_special_response.c nginx-1.17.7/src/http/ngx_http_special_response.c
234-
--- nginx-1.17.7-orig/src/http/ngx_http_special_response.c 2019-12-24 18:00:09.000000000 +0300
235-
+++ nginx-1.17.7/src/http/ngx_http_special_response.c 2019-12-25 02:13:18.000000000 +0300
233+
diff -urN nginx-1.17.8-orig/src/http/ngx_http_special_response.c nginx-1.17.8/src/http/ngx_http_special_response.c
234+
--- nginx-1.17.8-orig/src/http/ngx_http_special_response.c 2020-01-21 16:39:42.000000000 +0300
235+
+++ nginx-1.17.8/src/http/ngx_http_special_response.c 2020-02-18 01:00:09.081491813 +0300
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -705,9 +705,9 @@ diff -urN nginx-1.17.7-orig/src/http/ngx_http_special_response.c nginx-1.17.7/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.17.7-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.7/src/http/v2/ngx_http_v2_filter_module.c
709-
--- nginx-1.17.7-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-12-24 18:00:09.000000000 +0300
710-
+++ nginx-1.17.7/src/http/v2/ngx_http_v2_filter_module.c 2019-12-25 02:05:44.877675615 +0300
708+
diff -urN nginx-1.17.8-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.8/src/http/v2/ngx_http_v2_filter_module.c
709+
--- nginx-1.17.8-orig/src/http/v2/ngx_http_v2_filter_module.c 2020-01-21 16:39:42.000000000 +0300
710+
+++ nginx-1.17.8/src/http/v2/ngx_http_v2_filter_module.c 2020-02-18 01:00:09.087491758 +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.17.7-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.7
726726
}
727727

728728
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
729-
diff -urN nginx-1.17.7-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.7/src/os/unix/ngx_setproctitle.c
730-
--- nginx-1.17.7-orig/src/os/unix/ngx_setproctitle.c 2019-12-24 18:00:09.000000000 +0300
731-
+++ nginx-1.17.7/src/os/unix/ngx_setproctitle.c 2019-12-25 02:05:44.882675569 +0300
729+
diff -urN nginx-1.17.8-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.8/src/os/unix/ngx_setproctitle.c
730+
--- nginx-1.17.8-orig/src/os/unix/ngx_setproctitle.c 2020-01-21 16:39:42.000000000 +0300
731+
+++ nginx-1.17.8/src/os/unix/ngx_setproctitle.c 2020-02-18 01:00:09.093491704 +0300
732732
@@ -89,7 +89,7 @@
733733

734734
ngx_os_argv[1] = NULL;

‎centos6.docker‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
FROM centos:6
44

5-
ENV WK_VERSION 1.17.5
5+
ENV WK_VERSION 1.17.8
66

77
LABEL name="WEBKAOS Image on CentOS 6" \
88
vendor="ESSENTIAL KAOS" \
99
maintainer="Anton Novojilov" \
1010
license="EKOL" \
11-
version="2019.11.08"
11+
version="2020.02.18"
1212

1313
RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el6.noarch.rpm && \
1414
yum -y -q install webkaos-${WK_VERSION} webkaos-module-brotli && \
15+
yum clean all && \
1516
rm -rf /var/cache/yum
1617

1718
RUN ln -sf /dev/stdout /var/log/webkaos/access.log \

‎centos7.docker‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
FROM centos:7
44

5-
ENV WK_VERSION 1.17.5
5+
ENV WK_VERSION 1.17.8
66

77
LABEL name="WEBKAOS Image on CentOS 7" \
88
vendor="ESSENTIAL KAOS" \
99
maintainer="Anton Novojilov" \
1010
license="EKOL" \
11-
version="2019.11.08"
11+
version="2020.02.18"
1212

1313
RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
1414
yum -y -q install webkaos-${WK_VERSION} webkaos-module-brotli && \
15+
yum clean all && \
1516
rm -rf /var/cache/yum
1617

1718
RUN ln -sf /dev/stdout /var/log/webkaos/access.log \

‎patch-proc.sh‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,21 @@ CL_DARK="\e[${DARK}m"
2929
###############################################################################
3030

3131
main() {
32-
local cmd="$1"
32+
if [[ $# -ne 4 ]] ; then
33+
usage
34+
exit 0
35+
fi
36+
37+
check "$@"
3338

34-
shift
39+
local choice
3540

36-
case $cmd in
37-
"check") check "$@" ;;
38-
"copy") copy "$@" ;;
39-
*) usage ;;
40-
esac
41+
show "Copy unchanged files? (y/N):" $BOLD
42+
read -p "> " choice
43+
44+
if [[ "$choice" == "Y" || "$choice" == "y" ]] ; then
45+
copy "$@"
46+
fi
4147
}
4248

4349
check() {
@@ -139,11 +145,6 @@ showDiff() {
139145
}
140146

141147
checkArgs() {
142-
if [[ $# -ne 4 ]] ; then
143-
show "Not enough arguments" $YELLOW
144-
exit 1
145-
fi
146-
147148
local patch_file data_dir old_ver new_ver
148149
local old_ver_dir new_ver_dir old_ver_pt_dir new_ver_pt_dir
149150

@@ -196,20 +197,12 @@ show() {
196197

197198
usage() {
198199
show ""
199-
show "${CL_BOLD}Usage:${CL_NORM} ./patch-proc.sh ${CL_YELLOW}{command}${CL_NORM} webkaos.patch data-dir prev-ver new-ver"
200-
show ""
201-
show "Commands" $BOLD
202-
show ""
203-
show " ${CL_YELLOW}check${CL_NORM} Check webkaos patch"
204-
show " ${CL_YELLOW}copy${CL_NORM} Copy unchanged files from previous patched version"
200+
show "${CL_BOLD}Usage:${CL_NORM} ./patch-proc.sh patch data-dir prev-ver new-ver"
205201
show ""
206202
show "Examples" $BOLD
207203
show ""
208-
show " ./patch-proc.sh check SOURCES/webkaos.patch /some/dir 1.11.5 1.11.6"
209-
show " Check patch compatibility with newer version" $DARK
210-
show ""
211-
show " ./patch-proc.sh copy SOURCES/webkaos.patch /some/dir 1.11.5 1.11.6"
212-
show " Copy unchanged files from previous patched version" $DARK
204+
show " ./patch-proc.sh SOURCES/webkaos.patch /some/dir 1.17.5 1.17.6"
205+
show " Check diff and copy unchanged files" $DARK
213206
show ""
214207
}
215208

‎webkaos.spec‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
%define service_name %{name}
4949
%define service_home %{_cachedir}/%{service_name}
5050

51-
%define nginx_version 1.17.7
52-
%define boring_commit 43890dbd693d5d972afbc676860e5adf4a44236a
51+
%define nginx_version 1.17.8
52+
%define boring_commit a12a2497ffc95a4f75e50d6d7e861e7bee7b8a5e
5353
%define lua_module_ver 0.10.15
5454
%define mh_module_ver 0.33
55-
%define pcre_ver 8.43
55+
%define pcre_ver 8.44
5656
%define zlib_ver 1.2.11
57-
%define luajit_ver 2.1-20190912
57+
%define luajit_ver 2.1-20200102
5858
%define brotli_commit e505dce68acc190cc5a1e780a3b0275e39f160ca
5959
%define brotli_ver 1.0.7
6060
%define naxsi_ver 0.56
@@ -116,10 +116,7 @@ Requires: initscripts >= 8.36 kaosv >= 2.15
116116
Requires: gd libXpm libxslt
117117

118118
BuildRequires: make perl cmake3 golang
119-
120-
# http://mirror.centos.org/centos/6/sclo/x86_64/rh/devtoolset-3/
121-
# http://mirror.centos.org/centos/7/sclo/x86_64/rh/devtoolset-3/
122-
BuildRequires: devtoolset-3-gcc-c++ devtoolset-3-binutils
119+
BuildRequires: devtoolset-7-gcc-c++ devtoolset-7-binutils
123120

124121
%if 0%{?rhel} >= 7
125122
Requires: systemd
@@ -170,7 +167,7 @@ Links for nginx compatibility.
170167

171168
Summary: Module for Brotli compression
172169
Version: 0.1.3
173-
Release: 4%{?dist}
170+
Release: 5%{?dist}
174171

175172
Group: System Environment/Daemons
176173
Requires: %{name} = %{nginx_version}
@@ -184,7 +181,7 @@ Module for Brotli compression.
184181

185182
Summary: High performance, low rules maintenance WAF
186183
Version: %{naxsi_ver}
187-
Release: 4%{?dist}
184+
Release: 5%{?dist}
188185

189186
Group: System Environment/Daemons
190187
Requires: %{name} = %{nginx_version}
@@ -239,8 +236,8 @@ mv README NGINX-README
239236
mv lua-nginx-module-%{lua_module_ver}/README.markdown ./LUAMODULE-README.markdown
240237
mv headers-more-nginx-module-%{mh_module_ver}/README.markdown ./HEADERSMORE-README.markdown
241238

242-
# Use gcc and gcc-c++ from DevToolSet 3
243-
export PATH="/opt/rh/devtoolset-3/root/usr/bin:$PATH"
239+
# Use gcc and gcc-c++ from DevToolSet 7
240+
export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH"
244241

245242
# LuaJIT2 Build ################################################################
246243

@@ -696,6 +693,13 @@ rm -rf %{buildroot}
696693
################################################################################
697694

698695
%changelog
696+
* Tue Feb 18 2020 Anton Novojilov <andy@essentialkaos.com> - 1.17.8-0
697+
- Nginx updated to 1.17.8
698+
- LuaJIT updated to 2.1-20200102
699+
- PCRE updated to 8.44
700+
- BoringSSL updated to the latest version
701+
- Using DevToolSet 7 for build
702+
699703
* Wed Dec 25 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.7-0
700704
- Nginx updated to 1.17.7
701705

0 commit comments

Comments
 (0)