Merge pull request #485 from matsumotory/nginx-1-19-6

update test target to 1.19.6, and openssl 1.1.1i
matsumotory · Dec 17, 2020 · 2aa8122 · 2aa8122
2 parents 456407c + 6378fa8
commit 2aa8122
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,60 +16,60 @@ install:
 env:
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=19
-    NGINX_SRC_PATCH=5
-    OPENSSL_SRC_VERSION='1.1.1f'
+    NGINX_SRC_PATCH=6
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=19
-    NGINX_SRC_PATCH=5
+    NGINX_SRC_PATCH=6
     BUILD_DYNAMIC_MODULE='TRUE'
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=19
-    NGINX_SRC_PATCH=5
+    NGINX_SRC_PATCH=6
     BUILD_WITH_OPENSSL_SRC='TRUE'
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=18
     NGINX_SRC_PATCH=0
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - BUILD_DYNAMIC_MODULE='TRUE'
     NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=18
     NGINX_SRC_PATCH=0
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=18
     NGINX_SRC_PATCH=0
     BUILD_WITH_OPENSSL_SRC='TRUE'
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=16
     NGINX_SRC_PATCH=1
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - BUILD_DYNAMIC_MODULE='TRUE'
     NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=16
     NGINX_SRC_PATCH=1
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=16
     NGINX_SRC_PATCH=1
     BUILD_WITH_OPENSSL_SRC='TRUE'
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=14
     NGINX_SRC_PATCH=2
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - BUILD_DYNAMIC_MODULE='TRUE'
     NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=14
     NGINX_SRC_PATCH=2
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
   - NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=14
     NGINX_SRC_PATCH=2
     BUILD_WITH_OPENSSL_SRC='TRUE'
-    OPENSSL_SRC_VERSION='1.1.1f'
+    OPENSSL_SRC_VERSION='1.1.1i'
 before_script:
   - curl -sfL https://www.openssl.org/source/openssl-${OPENSSL_SRC_VERSION}.tar.gz -o openssl-${OPENSSL_SRC_VERSION}.tar.gz
   - mkdir openssl-${OPENSSL_SRC_VERSION} && tar -xzf openssl-${OPENSSL_SRC_VERSION}.tar.gz -C openssl-${OPENSSL_SRC_VERSION} --strip-components 1

diff --git a/misc/Dockerfile.travis_emulate b/misc/Dockerfile.travis_emulate
@@ -22,7 +22,7 @@ ENV CXX "g++-4.9"
 ENV CC "gcc-4.9"
 ENV LD "gcc-4.9"
 
-ENV OPENSSL_SRC_VERSION "1.1.1f"
+ENV OPENSSL_SRC_VERSION "1.1.1i"
 
 RUN curl -sfL https://www.openssl.org/source/openssl-${OPENSSL_SRC_VERSION}.tar.gz -o openssl-${OPENSSL_SRC_VERSION}.tar.gz && \
   mkdir openssl-${OPENSSL_SRC_VERSION} && tar -xzf openssl-${OPENSSL_SRC_VERSION}.tar.gz -C openssl-${OPENSSL_SRC_VERSION} --strip-components 1 && \

diff --git a/misc/provision.sh b/misc/provision.sh
@@ -18,7 +18,7 @@ sudo apt-get -y remove nano
 
 sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 1000
 
-export OPENSSL_SRC_VERSION=1.1.1f
+export OPENSSL_SRC_VERSION=1.1.1i
 
 curl -sfL https://www.openssl.org/source/openssl-${OPENSSL_SRC_VERSION}.tar.gz -o openssl-${OPENSSL_SRC_VERSION}.tar.gz
 mkdir openssl-${OPENSSL_SRC_VERSION} && tar -xzf openssl-${OPENSSL_SRC_VERSION}.tar.gz -C openssl-${OPENSSL_SRC_VERSION} --strip-components 1

diff --git a/nginx_version b/nginx_version
@@ -1,4 +1,4 @@
 NGINX_SRC_MAJOR=1
 NGINX_SRC_MINOR=19
-NGINX_SRC_PATCH=5
+NGINX_SRC_PATCH=6
 NGINX_SRC_VER=nginx-${NGINX_SRC_MAJOR}.${NGINX_SRC_MINOR}.${NGINX_SRC_PATCH}