[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1dfdbd5bf65bc9e7dec728e502f9c7cd9352bb42 (commit)
      from  c590be6f12d0b725863961e41bc64a81c8cf30d6 (commit)


- Log -----------------------------------------------------------------
commit 1dfdbd5bf65bc9e7dec728e502f9c7cd9352bb42
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 27 01:09:23 2020 +0100

    Fix util/mktar.sh to use the new VERSION information
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/11190)

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

Summary of changes:
 util/mktar.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/util/mktar.sh b/util/mktar.sh
index 6d5df8528d..b58fbe9d31 100755
--- a/util/mktar.sh
+++ b/util/mktar.sh
@@ -8,7 +8,11 @@
 
 HERE=`dirname $0`
 
-version=`grep 'OPENSSL_VERSION_TEXT  *"OpenSSL' $HERE/../include/openssl/opensslv.h | sed -e 's|.*"OpenSSL ||' -e 's| .*||'`
+# Get all version data as shell variables
+. $HERE/../VERSION
+
+if [ -n "$PRE_RELEASE_TAG" ]; then PRE_RELEASE_TAG=-$PRE_RELEASE_TAG; fi
+version=$MAJOR.$MINOR.$PATCH$PRE_RELEASE_TAG$BUILD_METADATA
 basename=openssl
 
 NAME="$basename-$version"