Skip to content

Commit

Permalink
Merge pull request #94 from essentialkaos/develop
Browse files Browse the repository at this point in the history 
Version 1.17.6
  • Loading branch information
@andyone
andyone authored Nov 20, 2019
2 parents 939ba13 + c022b31 commit 0403337
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 32 deletions.
58 changes: 29 additions & 29 deletions SOURCES/webkaos.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN nginx-1.17.5-orig/auto/lib/openssl/make nginx-1.17.5/auto/lib/openssl/make
--- nginx-1.17.5-orig/auto/lib/openssl/make 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/auto/lib/openssl/make 2019-11-08 15:01:50.075606846 +0300
diff -urN nginx-1.17.6-orig/auto/lib/openssl/make nginx-1.17.6/auto/lib/openssl/make
--- nginx-1.17.6-orig/auto/lib/openssl/make 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/auto/lib/openssl/make 2019-11-20 12:27:32.873781845 +0300
@@ -45,18 +45,18 @@
/*) ngx_prefix="$OPENSSL/.openssl" ;;
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
Expand All @@ -24,9 +24,9 @@ diff -urN nginx-1.17.5-orig/auto/lib/openssl/make nginx-1.17.5/auto/lib/openssl/
;;

esac
diff -urN nginx-1.17.5-orig/src/core/nginx.c nginx-1.17.5/src/core/nginx.c
--- nginx-1.17.5-orig/src/core/nginx.c 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/core/nginx.c 2019-11-08 15:01:50.081606793 +0300
diff -urN nginx-1.17.6-orig/src/core/nginx.c nginx-1.17.6/src/core/nginx.c
--- nginx-1.17.6-orig/src/core/nginx.c 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/core/nginx.c 2019-11-20 12:27:32.879781790 +0300
@@ -389,13 +389,13 @@
static void
ngx_show_version_info(void)
Expand All @@ -45,13 +45,13 @@ diff -urN nginx-1.17.5-orig/src/core/nginx.c nginx-1.17.5/src/core/nginx.c
"Options:" NGX_LINEFEED
" -?,-h : this help" NGX_LINEFEED
" -v : show version and exit" NGX_LINEFEED
diff -urN nginx-1.17.5-orig/src/core/nginx.h nginx-1.17.5/src/core/nginx.h
--- nginx-1.17.5-orig/src/core/nginx.h 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/core/nginx.h 2019-11-08 15:02:19.000000000 +0300
diff -urN nginx-1.17.6-orig/src/core/nginx.h nginx-1.17.6/src/core/nginx.h
--- nginx-1.17.6-orig/src/core/nginx.h 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/core/nginx.h 2019-11-20 12:28:08.000000000 +0300
@@ -11,7 +11,7 @@

#define nginx_version 1017005
#define NGINX_VERSION "1.17.5"
#define nginx_version 1017006
#define NGINX_VERSION "1.17.6"
-#define NGINX_VER "nginx/" NGINX_VERSION
+#define NGINX_VER "webkaos/" NGINX_VERSION

Expand All @@ -66,9 +66,9 @@ diff -urN nginx-1.17.5-orig/src/core/nginx.h nginx-1.17.5/src/core/nginx.h
#define NGX_OLDPID_EXT ".oldbin"


diff -urN nginx-1.17.5-orig/src/core/ngx_log.c nginx-1.17.5/src/core/ngx_log.c
--- nginx-1.17.5-orig/src/core/ngx_log.c 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/core/ngx_log.c 2019-11-08 15:01:50.091606704 +0300
diff -urN nginx-1.17.6-orig/src/core/ngx_log.c nginx-1.17.6/src/core/ngx_log.c
--- nginx-1.17.6-orig/src/core/ngx_log.c 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/core/ngx_log.c 2019-11-20 12:27:32.889781700 +0300
@@ -202,9 +202,9 @@
return;
}
Expand Down Expand Up @@ -99,9 +99,9 @@ diff -urN nginx-1.17.5-orig/src/core/ngx_log.c nginx-1.17.5/src/core/ngx_log.c
return NGX_CONF_ERROR;
#endif

diff -urN nginx-1.17.5-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.5/src/http/modules/ngx_http_autoindex_module.c
--- nginx-1.17.5-orig/src/http/modules/ngx_http_autoindex_module.c 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/http/modules/ngx_http_autoindex_module.c 2019-11-08 15:01:50.097606651 +0300
diff -urN nginx-1.17.6-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.6/src/http/modules/ngx_http_autoindex_module.c
--- nginx-1.17.6-orig/src/http/modules/ngx_http_autoindex_module.c 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/http/modules/ngx_http_autoindex_module.c 2019-11-20 12:27:32.895781646 +0300
@@ -449,9 +449,11 @@
;

Expand Down Expand Up @@ -177,9 +177,9 @@ diff -urN nginx-1.17.5-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
tm.ngx_tm_mday,
months[tm.ngx_tm_mon - 1],
tm.ngx_tm_year,
diff -urN nginx-1.17.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.5/src/http/ngx_http_header_filter_module.c
--- nginx-1.17.5-orig/src/http/ngx_http_header_filter_module.c 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/http/ngx_http_header_filter_module.c 2019-11-08 15:01:50.102606607 +0300
diff -urN nginx-1.17.6-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.6/src/http/ngx_http_header_filter_module.c
--- nginx-1.17.6-orig/src/http/ngx_http_header_filter_module.c 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/http/ngx_http_header_filter_module.c 2019-11-20 12:27:32.900781600 +0300
@@ -46,7 +46,7 @@
};

Expand Down Expand Up @@ -230,9 +230,9 @@ diff -urN nginx-1.17.5-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)

ngx_string("500 Internal Server Error"),
diff -urN nginx-1.17.5-orig/src/http/ngx_http_special_response.c nginx-1.17.5/src/http/ngx_http_special_response.c
--- nginx-1.17.5-orig/src/http/ngx_http_special_response.c 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/http/ngx_http_special_response.c 2019-11-08 15:01:50.108606554 +0300
diff -urN nginx-1.17.6-orig/src/http/ngx_http_special_response.c nginx-1.17.6/src/http/ngx_http_special_response.c
--- nginx-1.17.6-orig/src/http/ngx_http_special_response.c 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/http/ngx_http_special_response.c 2019-11-20 12:27:32.906781546 +0300
@@ -19,21 +19,21 @@


Expand Down Expand Up @@ -705,9 +705,9 @@ diff -urN nginx-1.17.5-orig/src/http/ngx_http_special_response.c nginx-1.17.5/sr
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)

ngx_string(ngx_http_error_494_page), /* 494, request header too large */
diff -urN nginx-1.17.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.5/src/http/v2/ngx_http_v2_filter_module.c
--- nginx-1.17.5-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/http/v2/ngx_http_v2_filter_module.c 2019-11-08 15:01:50.114606501 +0300
diff -urN nginx-1.17.6-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.6/src/http/v2/ngx_http_v2_filter_module.c
--- nginx-1.17.6-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/http/v2/ngx_http_v2_filter_module.c 2019-11-20 12:27:32.912781492 +0300
@@ -148,7 +148,7 @@
ngx_http_core_srv_conf_t *cscf;
u_char addr[NGX_SOCKADDR_STRLEN];
Expand All @@ -726,9 +726,9 @@ diff -urN nginx-1.17.5-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.5
}

*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
diff -urN nginx-1.17.5-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.5/src/os/unix/ngx_setproctitle.c
--- nginx-1.17.5-orig/src/os/unix/ngx_setproctitle.c 2019-10-22 18:16:08.000000000 +0300
+++ nginx-1.17.5/src/os/unix/ngx_setproctitle.c 2019-11-08 15:01:50.119606456 +0300
diff -urN nginx-1.17.6-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.6/src/os/unix/ngx_setproctitle.c
--- nginx-1.17.6-orig/src/os/unix/ngx_setproctitle.c 2019-11-19 17:18:58.000000000 +0300
+++ nginx-1.17.6/src/os/unix/ngx_setproctitle.c 2019-11-20 12:27:32.917781446 +0300
@@ -89,7 +89,7 @@

ngx_os_argv[1] = NULL;
Expand Down
9 changes: 6 additions & 3 deletions webkaos.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
%define service_name %{name}
%define service_home %{_cachedir}/%{service_name}

%define nginx_version 1.17.5
%define nginx_version 1.17.6
%define boring_commit 43890dbd693d5d972afbc676860e5adf4a44236a
%define lua_module_ver 0.10.15
%define mh_module_ver 0.33
Expand Down Expand Up @@ -170,7 +170,7 @@ Links for nginx compatibility.

Summary: Module for Brotli compression
Version: 0.1.3
Release: 2%{?dist}
Release: 3%{?dist}

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

Summary: High performance, low rules maintenance WAF
Version: %{naxsi_ver}
Release: 2%{?dist}
Release: 3%{?dist}

Group: System Environment/Daemons
Requires: %{name} = %{nginx_version}
Expand Down Expand Up @@ -696,6 +696,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Wed Nov 20 2019 Anton Novojilov <[email protected]> - 1.17.6-0
- Nginx updated to 1.17.6

* Fri Nov 08 2019 Anton Novojilov <[email protected]> - 1.17.5-0
- Nginx updated to 1.17.5
- BoringSSL updated to the latest version
Expand Down

0 comments on commit 0403337

Please sign in to comment.