[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b013cf90000aec515af17ee9bb3fe37ca0891499 (commit)
      from  e39e295e205ab8461d3ac814129bbb08c2d1266d (commit)


- Log -----------------------------------------------------------------
commit b013cf90000aec515af17ee9bb3fe37ca0891499
Author: Richard Levitte <richard at levitte.org>
Date:   Thu Jul 16 15:08:30 2020 +0200

    util/mktar.pl: Change 'VERSION' to 'VERSION.dat'
    
    This was forgotten when that file changed name, and that unfortunately
    disrupts releases.
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12464)

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

Summary of changes:
 util/mktar.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/mktar.sh b/util/mktar.sh
index 04b29e2e3a..ec47578f34 100755
--- a/util/mktar.sh
+++ b/util/mktar.sh
@@ -9,7 +9,7 @@
 HERE=`dirname $0`
 
 # Get all version data as shell variables
-. $HERE/../VERSION
+. $HERE/../VERSION.dat
 
 if [ -n "$PRE_RELEASE_TAG" ]; then PRE_RELEASE_TAG=-$PRE_RELEASE_TAG; fi
 version=$MAJOR.$MINOR.$PATCH$PRE_RELEASE_TAG$BUILD_METADATA