Merge pull request #138 from essentialkaos/develop

Version 1.23.1
essentialkaos · Aug 10, 2022 · 4aeaf98 · 4aeaf98
2 parents e193caf + c882fc0
commit 4aeaf98
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 65 deletions.
diff --git a/.bibop/webkaos.recipe b/.bibop/webkaos.recipe
@@ -229,15 +229,21 @@ command "systemctl start {service_name}-debug" "Start debug version of service"
   service-works {service_name}-debug
 
 command "-" "Make HTTP requests"
+  http-set-header Accept-Encoding "gzip, deflate, br"
   http-status GET "http://127.0.0.1" 200
   http-header GET "http://127.0.0.1" server webkaos
+  http-header GET "http://127.0.0.1/mh" server bibop
+  http-header GET "http://127.0.0.1" Content-Encoding br
   http-contains GET "http://127.0.0.1/lua" "LUA MODULE WORKS"
   !empty {log_dir}/access.log
   truncate {log_dir}/access.log
 
 command "-" "Make HTTPS requests"
+  http-set-header Accept-Encoding "gzip, deflate, br"
   http-status GET "https://127.0.0.1" 200
   http-header GET "https://127.0.0.1" server webkaos
+  http-header GET "https://127.0.0.1/mh" server bibop
+  http-header GET "https://127.0.0.1" Content-Encoding br
   http-contains GET "https://127.0.0.1/lua" "LUA MODULE WORKS"
   !empty {log_dir}/access.log
   truncate {log_dir}/access.log

diff --git a/SOURCES/boringssl.patch b/SOURCES/boringssl.patch
@@ -1,7 +1,7 @@
-diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.c nginx-1.15.4-boring/src/event/ngx_event_openssl.c
---- nginx-1.15.4-orig/src/event/ngx_event_openssl.c	2018-09-25 18:11:39.000000000 +0300
-+++ nginx-1.15.4-boring/src/event/ngx_event_openssl.c	2018-09-27 14:21:12.000000000 +0300
-@@ -2591,7 +2591,9 @@
+diff -urN nginx-1.23.1-orig/src/event/ngx_event_openssl.c nginx-1.23.1-boring/src/event/ngx_event_openssl.c
+--- nginx-1.23.1-orig/src/event/ngx_event_openssl.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1-boring/src/event/ngx_event_openssl.c	2022-08-02 15:19:58.000000000 +0300
+@@ -3352,7 +3352,9 @@
  #ifdef SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM
              || n == SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM            /*  118 */
  #endif
@@ -11,13 +11,13 @@ diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.c nginx-1.15.4-boring/sr
              || n == SSL_R_DIGEST_CHECK_FAILED                        /*  149 */
              || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              /*  151 */
              || n == SSL_R_EXCESSIVE_MESSAGE_SIZE                     /*  152 */
-@@ -2601,7 +2603,9 @@
+@@ -3362,7 +3364,9 @@
  #ifdef SSL_R_NO_CIPHERS_PASSED
              || n == SSL_R_NO_CIPHERS_PASSED                          /*  182 */
  #endif
 +#ifdef SSL_R_NO_CIPHERS_SPECIFIED
              || n == SSL_R_NO_CIPHERS_SPECIFIED                       /*  183 */
 +#endif
-             || n == SSL_R_NO_COMPRESSION_SPECIFIED                   /*  187 */
-             || n == SSL_R_NO_SHARED_CIPHER                           /*  193 */
-             || n == SSL_R_RECORD_LENGTH_MISMATCH                     /*  213 */
+ #ifdef SSL_R_BAD_CIPHER
+             || n == SSL_R_BAD_CIPHER                                 /*  186 */
+ #endif
diff --git a/SOURCES/headers-more-nginx-module-compat.patch b/SOURCES/headers-more-nginx-module-compat.patch
diff --git a/SOURCES/webkaos.patch b/SOURCES/webkaos.patch
@@ -1,6 +1,6 @@
-diff -urN nginx-1.23.0-orig/auto/lib/openssl/make nginx-1.23.0/auto/lib/openssl/make
---- nginx-1.23.0-orig/auto/lib/openssl/make	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/auto/lib/openssl/make	2022-07-04 12:51:02.001986904 +0300
+diff -urN nginx-1.23.1-orig/auto/lib/openssl/make nginx-1.23.1/auto/lib/openssl/make
+--- nginx-1.23.1-orig/auto/lib/openssl/make	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/auto/lib/openssl/make	2022-08-02 14:33:10.562002372 +0300
 @@ -45,18 +45,18 @@
              /*) ngx_prefix="$OPENSSL/.openssl" ;;
              *)  ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.23.0-orig/auto/lib/openssl/make nginx-1.23.0/auto/lib/openssl/
      ;;
 
  esac
-diff -urN nginx-1.23.0-orig/src/core/nginx.c nginx-1.23.0/src/core/nginx.c
---- nginx-1.23.0-orig/src/core/nginx.c	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/core/nginx.c	2022-07-04 12:51:02.008986883 +0300
+diff -urN nginx-1.23.1-orig/src/core/nginx.c nginx-1.23.1/src/core/nginx.c
+--- nginx-1.23.1-orig/src/core/nginx.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/core/nginx.c	2022-08-02 14:33:10.571002343 +0300
 @@ -390,13 +390,13 @@
  static void
  ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.23.0-orig/src/core/nginx.c nginx-1.23.0/src/core/nginx.c
              "Options:" NGX_LINEFEED
              "  -?,-h         : this help" NGX_LINEFEED
              "  -v            : show version and exit" NGX_LINEFEED
-diff -urN nginx-1.23.0-orig/src/core/nginx.h nginx-1.23.0/src/core/nginx.h
---- nginx-1.23.0-orig/src/core/nginx.h	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/core/nginx.h	2022-07-04 12:51:53.000000000 +0300
+diff -urN nginx-1.23.1-orig/src/core/nginx.h nginx-1.23.1/src/core/nginx.h
+--- nginx-1.23.1-orig/src/core/nginx.h	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/core/nginx.h	2022-08-02 14:33:38.000000000 +0300
 @@ -11,7 +11,7 @@
 
- #define nginx_version      1023000
- #define NGINX_VERSION      "1.23.0"
+ #define nginx_version      1023001
+ #define NGINX_VERSION      "1.23.1"
 -#define NGINX_VER          "nginx/" NGINX_VERSION
 +#define NGINX_VER          "webkaos/" NGINX_VERSION
 
@@ -66,9 +66,9 @@ diff -urN nginx-1.23.0-orig/src/core/nginx.h nginx-1.23.0/src/core/nginx.h
  #define NGX_OLDPID_EXT     ".oldbin"
 
 
-diff -urN nginx-1.23.0-orig/src/core/ngx_log.c nginx-1.23.0/src/core/ngx_log.c
---- nginx-1.23.0-orig/src/core/ngx_log.c	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/core/ngx_log.c	2022-07-04 12:51:02.019986851 +0300
+diff -urN nginx-1.23.1-orig/src/core/ngx_log.c nginx-1.23.1/src/core/ngx_log.c
+--- nginx-1.23.1-orig/src/core/ngx_log.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/core/ngx_log.c	2022-08-02 14:33:10.584002302 +0300
 @@ -202,9 +202,9 @@
          return;
      }
@@ -99,9 +99,9 @@ diff -urN nginx-1.23.0-orig/src/core/ngx_log.c nginx-1.23.0/src/core/ngx_log.c
          return NGX_CONF_ERROR;
  #endif
 
-diff -urN nginx-1.23.0-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.23.0/src/http/modules/ngx_http_autoindex_module.c
---- nginx-1.23.0-orig/src/http/modules/ngx_http_autoindex_module.c	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/http/modules/ngx_http_autoindex_module.c	2022-07-04 12:51:02.025986833 +0300
+diff -urN nginx-1.23.1-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.23.1/src/http/modules/ngx_http_autoindex_module.c
+--- nginx-1.23.1-orig/src/http/modules/ngx_http_autoindex_module.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/http/modules/ngx_http_autoindex_module.c	2022-08-02 14:33:10.590002282 +0300
 @@ -449,9 +449,11 @@
      ;
 
@@ -177,9 +177,9 @@ diff -urN nginx-1.23.0-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.23.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.23.0/src/http/ngx_http_header_filter_module.c
---- nginx-1.23.0-orig/src/http/ngx_http_header_filter_module.c	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/http/ngx_http_header_filter_module.c	2022-07-04 12:51:02.032986812 +0300
+diff -urN nginx-1.23.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.23.1/src/http/ngx_http_header_filter_module.c
+--- nginx-1.23.1-orig/src/http/ngx_http_header_filter_module.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/http/ngx_http_header_filter_module.c	2022-08-02 14:33:10.597002260 +0300
 @@ -46,7 +46,7 @@
  };
 
@@ -230,9 +230,9 @@ diff -urN nginx-1.23.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.23.
  #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
 
      ngx_string("500 Internal Server Error"),
-diff -urN nginx-1.23.0-orig/src/http/ngx_http_special_response.c nginx-1.23.0/src/http/ngx_http_special_response.c
---- nginx-1.23.0-orig/src/http/ngx_http_special_response.c	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/http/ngx_http_special_response.c	2022-07-04 12:54:24.000000000 +0300
+diff -urN nginx-1.23.1-orig/src/http/ngx_http_special_response.c nginx-1.23.1/src/http/ngx_http_special_response.c
+--- nginx-1.23.1-orig/src/http/ngx_http_special_response.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/http/ngx_http_special_response.c	2022-08-02 14:33:10.603002240 +0300
 @@ -19,21 +19,21 @@
 
 
@@ -705,9 +705,9 @@ diff -urN nginx-1.23.0-orig/src/http/ngx_http_special_response.c nginx-1.23.0/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.23.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.23.0/src/http/v2/ngx_http_v2_filter_module.c
---- nginx-1.23.0-orig/src/http/v2/ngx_http_v2_filter_module.c	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/http/v2/ngx_http_v2_filter_module.c	2022-07-04 12:55:28.000000000 +0300
+diff -urN nginx-1.23.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.23.1/src/http/v2/ngx_http_v2_filter_module.c
+--- nginx-1.23.1-orig/src/http/v2/ngx_http_v2_filter_module.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/http/v2/ngx_http_v2_filter_module.c	2022-08-02 14:33:10.610002218 +0300
 @@ -148,7 +148,7 @@
      ngx_http_core_srv_conf_t  *cscf;
      u_char                     addr[NGX_SOCKADDR_STRLEN];
@@ -726,9 +726,9 @@ diff -urN nginx-1.23.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.23.0
          }
 
          *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
-diff -urN nginx-1.23.0-orig/src/os/unix/ngx_setproctitle.c nginx-1.23.0/src/os/unix/ngx_setproctitle.c
---- nginx-1.23.0-orig/src/os/unix/ngx_setproctitle.c	2022-06-21 17:25:37.000000000 +0300
-+++ nginx-1.23.0/src/os/unix/ngx_setproctitle.c	2022-07-04 12:51:02.047986768 +0300
+diff -urN nginx-1.23.1-orig/src/os/unix/ngx_setproctitle.c nginx-1.23.1/src/os/unix/ngx_setproctitle.c
+--- nginx-1.23.1-orig/src/os/unix/ngx_setproctitle.c	2022-07-19 17:05:27.000000000 +0300
++++ nginx-1.23.1/src/os/unix/ngx_setproctitle.c	2022-08-02 14:33:10.617002195 +0300
 @@ -89,7 +89,7 @@
 
      ngx_os_argv[1] = NULL;

diff --git a/webkaos.spec b/webkaos.spec
@@ -52,12 +52,12 @@
 %define service_name         %{name}
 %define service_home         %{_cachedir}/%{service_name}
 
-%define nginx_version        1.23.0
+%define nginx_version        1.23.1
 %define boring_commit        c239ffd0552179f358de31517391679e9b62ccd3
 %define lua_module_ver       0.10.21
 %define lua_resty_core_ver   0.1.23
 %define lua_resty_lru_ver    0.13
-%define mh_module_ver        0.33
+%define mh_module_ver        0.34
 %define pcre_ver             8.45
 %define zlib_ver             1.2.11
 %define luajit_ver           2.1-20220411
@@ -118,7 +118,6 @@ Patch3:               boringssl.patch
 Patch5:               boringssl-tls13-support.patch
 Patch8:               boringssl-urand-test-disable.patch
 
-Patch10:              headers-more-nginx-module-compat.patch
 Patch11:              lua-nginx-module-compat.patch
 Patch12:              naxsi-compat.patch
 
@@ -174,7 +173,7 @@ Links for nginx compatibility.
 
 Summary:           Module for Brotli compression
 Version:           0.1.5
-Release:           10%{?dist}
+Release:           11%{?dist}
 
 Group:             System Environment/Daemons
 Requires:          %{name} = %{nginx_version}
@@ -188,7 +187,7 @@ Module for Brotli compression.
 
 Summary:           High performance, low rules maintenance WAF
 Version:           %{naxsi_ver}
-Release:           9%{?dist}
+Release:           10%{?dist}
 
 Group:             System Environment/Daemons
 Requires:          %{name} = %{nginx_version}
@@ -227,10 +226,6 @@ pushd boringssl
 %patch8 -p1
 popd
 
-pushd headers-more-nginx-module-%{mh_module_ver}
-%patch10 -p1
-popd
-
 pushd lua-nginx-module-%{lua_module_ver}
 %patch11 -p1
 popd
@@ -693,6 +688,10 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Tue Aug 02 2022 Anton Novojilov <andy@essentialkaos.com> - 1.23.1-0
+- Nginx updated to 1.23.1
+- More Headers module updated to 0.34
+
 * Mon Jul 04 2022 Anton Novojilov <andy@essentialkaos.com> - 1.23.0-0
 - Nginx updated to 1.23.0
 - BoringSSL updated to the latest stable version