From ac95c3f652c6e03e1fd0b7ad2deeeaca9afc9a64 Mon Sep 17 00:00:00 2001
From: VirtuBox
Date: Fri, 24 Jan 2020 18:17:53 +0100
Subject: [PATCH 1/6] Fix message displayed about nginx-ee nginx-wo package
---
README.md | 11 ++++-------
nginx-build.sh | 6 +++---
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 166b80b..ef582a6 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Automated Nginx compilation from sources with additional modules support
## Additional Third-party modules
-Nginx current mainline release : **v1.17.5**
+Nginx current mainline release : **v1.17.8**
Nginx current stable release : **v1.16.1**
* [ngx_cache_purge](https://github.com/FRiCKLE/ngx_cache_purge)
@@ -101,9 +101,6 @@ Optional modules :
#### Also compatible
* Ubuntu 19.10 (Eoan)
-* Ubuntu 19.04 (Disco)
-* Ubuntu 18.10 (Cosmic)
-* Ubuntu 17.10 ()
* Ubuntu 16.04 LTS (Xenial)
* Debian 9 (Stretch)
* Debian 8 (Jessie)
@@ -119,7 +116,7 @@ Optional modules :
#### Plesk
-* 17.5.x
+* 17.5.x (Onyx)
* 17.8.x
* 17.9.x
* 18.x (Obsidian)
@@ -139,7 +136,7 @@ Optional modules :
* without rtmp
```bash
-bash <(wget -O - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee)
+bash <(wget -qO - vtb.cx/nginx-ee || curl -sL vtb.cx/nginx-ee)
```
### Alternative Install Method
@@ -201,10 +198,10 @@ Extras :
* [x] Add support for Plesk servers
* [x] Add Nginx modules choice
* [x] Add support for Debian 9
-* [ ] Add support for config.inc build configuration
* [x] Add openssl release choice
* [x] Add more compilation presets
* [x] Add support for LibreSSL
+* [ ] Add support for config.inc build configuration
---
diff --git a/nginx-build.sh b/nginx-build.sh
index db8eead..e72c00b 100755
--- a/nginx-build.sh
+++ b/nginx-build.sh
@@ -1163,7 +1163,7 @@ _final_tasks() {
# block sw-nginx package updates from APT repository
echo -e 'Package: sw-nginx*\nPin: release *\nPin-Priority: -1' >/etc/apt/preferences.d/nginx-block
apt-mark hold sw-nginx
- } >>/tmp/nginx-ee.log
+ } >>/tmp/nginx-ee.log 2>&1
elif [ "$NGINX_EASYENGINE" = "1" ]; then
{
# update nginx ssl_protocols
@@ -1173,7 +1173,7 @@ _final_tasks() {
# block nginx package updates from APT repository
echo -e 'Package: nginx*\nPin: release *\nPin-Priority: -1' >/etc/apt/preferences.d/nginx-block
apt-mark hold nginx-ee nginx-common nginx-custom
- } >>/tmp/nginx-ee.log
+ } >>/tmp/nginx-ee.log 2>&1
elif [ "$WO_VALID" = "1" ]; then
{
# update nginx ssl_protocols
@@ -1188,7 +1188,7 @@ _final_tasks() {
else
apt-mark hold nginx-ee nginx-common nginx-custom
fi
- } >>/tmp/nginx-ee.log
+ } >>/tmp/nginx-ee.log 2>&1
fi
{
From a7321f84099317c901d69f9c9b3b1cf817a9b88d Mon Sep 17 00:00:00 2001
From: VirtuBox
Date: Sat, 2 May 2020 01:48:40 +0200
Subject: [PATCH 2/6] Update to Nginx 1.18 stable
Update openssl to latest stable 1.1.1g
---
.gitattributes | 39 +++++++++++++++++++++++++++++++++++++++
README.md | 10 ++++++----
nginx-build.sh | 4 ++--
3 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 .gitattributes
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b8caf52
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,39 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Documents
+*.md text eol=lf
+*.tex text diff=tex
+*.adoc text
+*.textile text
+*.mustache text eol=lf
+*.csv text
+*.tab text
+*.tsv text
+*.txt text
+*.sql text
+
+# Scripts
+*.bash text eol=lf
+*.fish text eol=lf
+*.sh text eol=lf
+
+# Source files
+# ============
+*.pxd text diff=python
+*.py text diff=python
+*.py3 text diff=python
+*.pyc text diff=python
+*.pyd text diff=python
+*.pyo text diff=python
+*.pyw text diff=python
+*.pyx text diff=python
+*.pyz text diff=python
+
+
+#
+# Exclude files from exporting
+#
+
+.gitattributes export-ignore
+.gitignore export-ignore
\ No newline at end of file
diff --git a/README.md b/README.md
index ef582a6..91f9473 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Automated Nginx compilation from sources with additional modules support
* Dynamic modules support
* Brotli Support
* TLS v1.3 support (Final)
-* OpenSSL (1.1.1d or 3.0.0-dev or from system-lib) or LibreSSL
+* OpenSSL (1.1.1g or 3.0.0-dev or from system-lib) or LibreSSL
* Cloudflare HPACK
* Cloudflare zlib
* Automated nginx updates cronjob
@@ -59,8 +59,8 @@ Automated Nginx compilation from sources with additional modules support
## Additional Third-party modules
-Nginx current mainline release : **v1.17.8**
-Nginx current stable release : **v1.16.1**
+Nginx current mainline release : **v1.17.10**
+Nginx current stable release : **v1.18.0**
* [ngx_cache_purge](https://github.com/FRiCKLE/ngx_cache_purge)
* [headers-more-nginx-module](https://github.com/openresty/headers-more-nginx-module)
@@ -95,6 +95,7 @@ Optional modules :
#### Recommended
+* Ubuntu 20.04 LTS (Focal)
* Ubuntu 18.04 LTS (Bionic)
* Debian 10 (Buster)
@@ -130,7 +131,7 @@ Optional modules :
**Default settings** :
* mainline release
-* openssl stable : 1.1.1d
+* openssl stable : 1.1.1g
* without pagespeed
* without naxsi
* without rtmp
@@ -202,6 +203,7 @@ Extras :
* [x] Add more compilation presets
* [x] Add support for LibreSSL
* [ ] Add support for config.inc build configuration
+* [ ] Add HTTP/3 QUIC support
---
diff --git a/nginx-build.sh b/nginx-build.sh
index e72c00b..bda02c8 100755
--- a/nginx-build.sh
+++ b/nginx-build.sh
@@ -158,9 +158,9 @@ fi
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.16 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.18 2>&1)"
LIBRESSL_VER="3.0.2"
-OPENSSL_VER="1.1.1d"
+OPENSSL_VER="1.1.1g"
TLS13_CIPHERS="TLS13+AESGCM+AES256:TLS13+AESGCM+AES128:TLS13+CHACHA20:EECDH+CHACHA20:EECDH+AESGCM:EECDH+AES"
readonly OS_ARCH="$(uname -m)"
OS_DISTRO_FULL="$(lsb_release -ds)"
From 2b948769d6cdbf97219b5b284856fa6c6b48bf5b Mon Sep 17 00:00:00 2001
From: VirtuBox
Date: Sat, 2 May 2020 02:14:14 +0200
Subject: [PATCH 3/6] Fix openssl3.0.0-dev patch
---
nginx-build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nginx-build.sh b/nginx-build.sh
index bda02c8..eec79e6 100755
--- a/nginx-build.sh
+++ b/nginx-build.sh
@@ -4,10 +4,10 @@
# -------------------------------------------------------------------------
# Website: https://virtubox.net
# GitHub: https://github.com/VirtuBox/nginx-ee
-# Copyright (c) 2019 VirtuBox
+# Copyright (c) 2019-2020 VirtuBox
# This script is licensed under M.I.T
# -------------------------------------------------------------------------
-# Version 3.6.5 - 2019-11-18
+# Version 3.6.6 - 2020-05-02
# -------------------------------------------------------------------------
##################################
@@ -167,7 +167,7 @@ OS_DISTRO_FULL="$(lsb_release -ds)"
readonly DISTRO_ID="$(lsb_release -si)"
readonly DISTRO_CODENAME="$(lsb_release -sc)"
readonly DISTRO_NUMBER="$(lsb_release -sr)"
-OPENSSL_COMMIT="6f02932edba62186a6866e8c9f0f0714674f6bab"
+OPENSSL_COMMIT="7fa8bcfe4342df41919f5564b315f9c85d0a02d6"
# Colors
CSI='\033['
From cdb892d647b203e5d7ee9d7c71beca308d98d88b Mon Sep 17 00:00:00 2001
From: VirtuBox
Date: Sat, 2 May 2020 16:17:32 +0200
Subject: [PATCH 4/6] revert patch
---
nginx-build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nginx-build.sh b/nginx-build.sh
index eec79e6..839b307 100755
--- a/nginx-build.sh
+++ b/nginx-build.sh
@@ -771,14 +771,14 @@ _download_openssl_dev() {
git clone --depth=50 https://github.com/openssl/openssl.git /usr/local/src/openssl
cd /usr/local/src/openssl || exit 1
echo "### git checkout commit ###"
- git checkout $OPENSSL_COMMIT
+ #git checkout $OPENSSL_COMMIT
else
cd /usr/local/src/openssl || exit 1
echo "### reset openssl to master and clean patches ###"
git fetch --all
git reset --hard origin/master
git clean -f
- git checkout $OPENSSL_COMMIT
+ #git checkout $OPENSSL_COMMIT
fi
else
echo "### cloning openssl ###"
@@ -799,7 +799,7 @@ _download_openssl_dev() {
cd /usr/local/src/openssl || exit 1
# apply openssl ciphers patch
echo "### openssl ciphers patch ###"
- patch -p1 <../openssl-patch/openssl-equal-3.0.0-dev_ciphers.patch
+ #patch -p1 <../openssl-patch/openssl-equal-3.0.0-dev_ciphers.patch
} >>/tmp/nginx-ee.log 2>&1
}; then
From 6c5ca245417fbb2eb4864087441d5acbadb806de Mon Sep 17 00:00:00 2001
From: VirtuBox
Date: Sat, 2 May 2020 16:23:53 +0200
Subject: [PATCH 5/6] Fix openssl checkout
---
docs/index.md | 9 +++++----
nginx-build.sh | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/docs/index.md b/docs/index.md
index 8e74f49..bd1e36e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -44,7 +44,7 @@ Automated Nginx compilation from sources with additional modules support
Dynamic modules support
Brotli Support
TLS v1.3 support (Final)
-OpenSSL (1.1.1d or 3.0.0-dev or from system-lib) or LibreSSL
+OpenSSL (1.1.1g or 3.0.0-dev or from system-lib) or LibreSSL
Cloudflare HPACK
Cloudflare zlib
Automated nginx updates cronjob
@@ -53,8 +53,8 @@ Automated Nginx compilation from sources with additional modules support
Additional Third-party modules
-Nginx current mainline release : v1.17.5
-Nginx current stable release : v1.16.1
+Nginx current mainline release : v1.17.10
+Nginx current stable release : v1.18.0
Operating System
Recommended
+- Ubuntu 20.04 LTS (Focal)
- Ubuntu 18.04 LTS (Bionic)
- Debian 10 (Buster)
@@ -119,7 +120,7 @@ Nginx current stable release : v1.16.1
Default settings :
- mainline release
-- openssl stable : 1.1.1d
+- openssl stable : 1.1.1g
- without pagespeed
- without naxsi
- without rtmp
diff --git a/nginx-build.sh b/nginx-build.sh
index 839b307..e2c941f 100755
--- a/nginx-build.sh
+++ b/nginx-build.sh
@@ -785,7 +785,7 @@ _download_openssl_dev() {
git clone --depth=50 https://github.com/openssl/openssl.git /usr/local/src/openssl
cd /usr/local/src/openssl || exit 1
echo "### git checkout commit ###"
- git checkout $OPENSSL_COMMIT
+ #git checkout $OPENSSL_COMMIT
fi
} >>/tmp/nginx-ee.log 2>&1
From 3d1f8cdd1eb46ee4b8d3c10a2b24eb5393e55e87 Mon Sep 17 00:00:00 2001
From: VirtuBox
Date: Sat, 2 May 2020 16:41:45 +0200
Subject: [PATCH 6/6] update changelog
---
CHANGELOG.md | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5c6801..0f90713 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased] - XX-XX-XX
+## [3.6.6] - 2020-05-02
+
+### Changed
+
+- Update Nginx stable to 1.18.0
+- Update openssl package to 1.1.1g
+
+### Fixed
+
+- Fix final tasks not executed (PR [#90])
+- Fix non interactive pagespeed build (PR [#90])
+
## [3.6.5] - 2019-11-18
### Added