From: Richard Levitte <levitte@openssl.org>
Date: Thu, 27 Feb 2020 00:09:23 +0000 (+0100)
Subject: Fix util/mktar.sh to use the new VERSION information
X-Git-Tag: openssl-3.0.0-alpha1~360
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1dfdbd5bf65bc9e7dec728e502f9c7cd9352bb42;p=oweals%2Fopenssl.git

Fix util/mktar.sh to use the new VERSION information

Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11190)
---

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"