From c461fa9b47b3bfcc4c8e054c1bd0714796e531aa Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 8 May 2023 21:45:55 +0200 Subject: [PATCH] Prepare for release v3.7.1 --- CHANGELOG.md | 14 ++++++++++++++ README.md | 14 ++++++-------- docs/index.md | 13 +++++-------- nginx-build.sh | 48 +++--------------------------------------------- 4 files changed, 28 insertions(+), 61 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cb85b4..5f3290d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] - XX-XX-XX +## [3.7.1] - 2023-05-08 + +### Changed + +- Nginx stable bumped to 1.24.0 +- Remove pagespeed module because deprecated + +### Fixed + +- Nginx compilation with ngx_http_redis module +- RTMP module compilation with gcc version +- Naxsi compilation + + ## [3.6.7] - 2020-08-18 ### Changed diff --git a/README.md b/README.md index 38c7770..a183fb5 100644 --- a/README.md +++ b/README.md @@ -60,14 +60,15 @@ Automated Nginx compilation from sources with additional modules support ## Additional Third-party modules -Nginx current mainline release : **v1.23.2** -Nginx current stable release : **v1.22.1** +Nginx current mainline release : **v1.23.4** +Nginx current stable release : **v1.24.0** * [ngx_cache_purge](https://github.com/FRiCKLE/ngx_cache_purge) * [headers-more-nginx-module](https://github.com/openresty/headers-more-nginx-module) * [ngx_brotli](https://github.com/google/ngx_brotli) * [memc-nginx-module](https://github.com/openresty/memc-nginx-module.git) * [ngx-devel-kit](https://github.com/simpl/ngx_devel_kit.git) +* [ngx_http_redis](https://github.com/centminmod/ngx_http_redis) * [srcache-nginx-module](https://github.com/openresty/srcache-nginx-module) * [ngx_http_substitutions_filter_module](https://github.com/yaoweibin/ngx_http_substitutions_filter_module) * [nginx_dynamic_tls_records](https://github.com/nginx-modules/ngx_http_tls_dyn_size) @@ -84,7 +85,6 @@ For Nginx http_ssl_module : Optional modules : -* [ngx_pagespeed](https://github.com/apache/incubator-pagespeed-ngx) * [naxsi WAF](https://github.com/nbs-system/naxsi) * [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module) @@ -131,7 +131,6 @@ Optional modules : * mainline release * openssl from system -* without pagespeed * without naxsi * without rtmp @@ -157,10 +156,10 @@ bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee) --interactive ### Custom installation -Example : Nginx stable release with pagespeed and naxsi +Example : Nginx stable release with naxsi ```bash -bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee) --stable --pagespeed --naxsi +bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee) --stable --naxsi ``` #### Options available @@ -168,13 +167,12 @@ bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee) --stable --pagespe Nginx build options : * `--stable` : compile Nginx stable release -* `--full` : Naxsi + PageSpeed + RTMP +* `--full` : Naxsi + RTMP * `--dynamic` : Compile Nginx modules as dynamic modules * `--noconf` : Compile Nginx without any configuring. Useful when you use devops tools like ansible. Optional third-party modules : -* `--pagespeed`: compile nginx with ngx_pagespeed latest-stable * `--naxsi` : compile nginx with naxsi * `--rtmp` : compile nginx with rtmp module * `--libressl` : compile nginx with LibreSSL instead of OpenSSL diff --git a/docs/index.md b/docs/index.md index be6aed3..1a72305 100644 --- a/docs/index.md +++ b/docs/index.md @@ -53,8 +53,8 @@ Automated Nginx compilation from sources with additional modules support

Additional Third-party modules

-

Nginx current mainline release : v1.23.2 -Nginx current stable release : v1.22.1

+

Nginx current mainline release : v1.23.4 +Nginx current stable release : v1.24.0

Optional modules :

@@ -117,7 +116,6 @@ Nginx current stable release : v1.22.1

@@ -133,19 +131,18 @@ sudo bash nginx-build.sh 
bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee) --interactive

Custom installation

-

Example : Nginx stable release with pagespeed and naxsi

-
bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee) --stable --pagespeed --naxsi
+
Example : Nginx stable release with naxsi

+
bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee) --stable --naxsi
 

 
Options available

 
Nginx build options :

 
    
 
  • --stable : compile Nginx stable release
    • 
-
  • --full : Naxsi + PageSpeed + RTMP
    • 
+
  • --full : Naxsi + RTMP
    • 
 
  • --dynamic : Compile Nginx modules as dynamic modules
    • 
 

 
Optional third-party modules :

 
    
-
  • --pagespeed: compile nginx with ngx_pagespeed latest-stable
    • 
 
  • --naxsi : compile nginx with naxsi
    • 
 
  • --rtmp : compile nginx with rtmp module
    • 
 
  • --libressl : compile nginx with LibreSSL instead of OpenSSL
    • 
diff --git a/nginx-build.sh b/nginx-build.sh
index 8adf957..6734f8d 100755
--- a/nginx-build.sh
+++ b/nginx-build.sh
@@ -7,7 +7,7 @@
 # Copyright (c) 2019-2020 VirtuBox 
 # This script is licensed under M.I.T
 # -------------------------------------------------------------------------
-# Version 3.7.0 - 2022-12-03
+# Version 3.8.0 - 2023-05-08
 # -------------------------------------------------------------------------
 
 ##################################
@@ -141,7 +141,7 @@ DIR_SRC="/usr/local/src"
 NGINX_EE_VER=$(curl -m 5 --retry 3 -sL https://api.github.com/repos/VirtuBox/nginx-ee/releases/latest 2>&1 | jq -r '.tag_name')
 NGINX_MAINLINE="$(curl -sL https://nginx.org/en/download.html 2>&1 | grep -E -o 'nginx\-[0-9.]+\.tar[.a-z]*' | awk -F "nginx-" '/.tar.gz$/ {print $2}' | sed -e 's|.tar.gz||g' | head -n 1 2>&1)"
 NGINX_STABLE="$(curl -sL https://nginx.org/en/download.html 2>&1 | grep -E -o 'nginx\-[0-9.]+\.tar[.a-z]*' | awk -F "nginx-" '/.tar.gz$/ {print $2}' | sed -e 's|.tar.gz||g' | head -n 2 | grep 1.24 2>&1)"
-LIBRESSL_VER="3.5.3"
+LIBRESSL_VER="3.7.2"
 if command_exists openssl; then
     OPENSSL_BIN_VER=$(openssl version)
     OPENSSL_VER=${OPENSSL_BIN_VER:0:15}
@@ -475,11 +475,7 @@ _gcc_setup() {
         echo -ne '       Installing gcc                         [..]\r'
         if {
             echo "### installing gcc ###"
-            if [ "$DISTRO_CODENAME" = "xenial" ]; then
-                apt-get install gcc-8 g++-8 -y
-            else
                 apt-get install gcc g++ -y
-            fi
         } >>/dev/null 2>&1; then
             echo -ne "       Installing gcc                         [${CGREEN}OK${CEND}]\\r"
             echo -ne '\n'
@@ -497,15 +493,7 @@ _gcc_setup() {
 _rtmp_setup() {
     echo -ne '       Installing FFMPEG for RTMP module      [..]\r'
     if {
-
-        if [ "$DISTRO_ID" = "Ubuntu" ] && [ "$DISTRO_CODENAME" != "focal" ] && [ "$DISTRO_CODENAME" != "jammy" ]; then
-            if [ ! -f /etc/apt/sources.list.d/jonathonf-ubuntu-ffmpeg-4-"$(lsb_release -sc)".list ]; then
-                add-apt-repository -y ppa:jonathonf/ffmpeg-4 -u
-                apt-get install ffmpeg -y
-            fi
-        else
             apt-get install ffmpeg -y
-        fi
     } >>/dev/null 2>&1; then
         echo -ne "       Installing FFMPEG for RMTP module      [${CGREEN}OK${CEND}]\\r"
         echo -ne '\n'
@@ -757,36 +745,6 @@ _download_naxsi() {
 
 }
 
-##################################
-# Download Pagespeed
-##################################
-
-_download_pagespeed() {
-
-    cd "$DIR_SRC" || exit 1
-    if {
-        echo -ne '       Downloading pagespeed                  [..]\r'
-
-        {
-            wget -O build_ngx_pagespeed.sh https://raw.githubusercontent.com/pagespeed/ngx_pagespeed/master/scripts/build_ngx_pagespeed.sh
-            chmod +x build_ngx_pagespeed.sh
-            if [ "$PAGESPEED_RELEASE" = "1" ]; then
-                ./build_ngx_pagespeed.sh --ngx-pagespeed-version latest-beta -b "$DIR_SRC" -y
-            else
-                ./build_ngx_pagespeed.sh --ngx-pagespeed-version latest-stable -b "$DIR_SRC" -y
-            fi
-        } >>/tmp/nginx-ee.log 2>&1
-
-    }; then
-        echo -ne "       Downloading pagespeed                  [${CGREEN}OK${CEND}]\\r"
-        echo -ne '\n'
-    else
-        echo -e "       Downloading pagespeed                  [${CRED}FAIL${CEND}]"
-        echo -e '\n      Please look at /tmp/nginx-ee.log\n'
-        exit 1
-    fi
-}
-
 ##################################
 # Download Nginx
 ##################################
@@ -890,6 +848,7 @@ _configure_nginx() {
         --add-dynamic-module=../redis2-nginx-module \
         --add-dynamic-module=../memc-nginx-module \
         --add-module=../ngx_devel_kit \
+        --add-module=../ngx_http_redis \
         --add-module=../set-misc-nginx-module \
         --add-dynamic-module=../ngx_http_auth_pam_module \
         --add-module=../nginx-module-vts \
@@ -934,7 +893,6 @@ _configure_nginx() {
                     --with-pcre-jit \
                     $NGINX_INCLUDED_MODULES \
                     $NGINX_THIRD_MODULES \
-                    $NGX_PAGESPEED \
                     $NGX_RTMP \
                     --add-module=../echo-nginx-module \
                     --add-module=../headers-more-nginx-module \