[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  a3ab4d63e0da2614b80bce3173001034a4c54e12 (commit)
       via  52698fbfbefd3230dfd3b88aec33b8612db38c57 (commit)
      from  54b47afedb82822b33a72bb804157a425d2201ff (commit)


- Log -----------------------------------------------------------------
commit a3ab4d63e0da2614b80bce3173001034a4c54e12
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Apr 22 21:38:19 2020 +1000

    travis: remove GENERATE=yes from some non no-deprecated builds
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11607)

commit 52698fbfbefd3230dfd3b88aec33b8612db38c57
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Apr 22 20:01:30 2020 +1000

    travis: add GENERATE=yes no-makedepend to the ARM64 build.
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11607)

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a75cdd2036..4c49c3449f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ env:
     # Note: env entry here must exactly match the value in the exclude: table below that contains env:, otherwise it will not find a match.
     - CONFIG_OPTS="" DESTDIR="_install"
     - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-rc5 enable-md2 -fsanitize=address" LSAN_OPTIONS="report_objects=1"
-    - CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes" CPPFLAGS="-ansi"
+    - CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
 
 jobs:
     exclude:
@@ -41,7 +41,7 @@ jobs:
           env: CONFIG_OPTS="" DESTDIR="_install"
         - os: linux
           compiler: clang
-          env: CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes" CPPFLAGS="-ansi"
+          env: CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
         - os: osx
           compiler: gcc
         - os: osx
@@ -54,7 +54,7 @@ jobs:
         - os: linux
           arch: arm64
           compiler: gcc
-          env: CONFIG_OPTS="no-asm no-deprecated enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
+          env: CONFIG_OPTS="no-asm no-makedepend no-deprecated enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes" CPPFLAGS="-ansi"
         - os: linux
           arch: s390x
           compiler: gcc