derive VERSION from opensslv.h from upstream

3 files changed, 5 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 995869e..e68b87f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,6 +93,7 @@ stamp-h2
 
 include/openssl/Makefile.am
 
+VERSION
 crypto/VERSION
 ssl/VERSION
 tls/VERSION
diff --git a/VERSION b/VERSION
index b1b25a5..c4d77e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,2 @@
 2.2.2
+
diff --git a/update.sh b/update.sh
index 5fb7288..9b6d7c8 100755
--- a/update.sh
+++ b/update.sh
@@ -2,7 +2,6 @@
 set -e
 
 openbsd_branch=`cat OPENBSD_BRANCH`
-libressl_version=`cat VERSION`
 
 # pull in latest upstream code
 echo "pulling upstream openbsd source"
@@ -120,9 +119,9 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h
 
 copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
 
-sed -e "s/\"LibreSSL .*\"/\"LibreSSL ${libressl_version}\"/" \
-        $libssl_src/src/crypto/opensslv.h > include/openssl/opensslv.h.lcl
-$MV include/openssl/opensslv.h.lcl include/openssl/opensslv.h
+$CP $libssl_src/src/crypto/opensslv.h include/openssl
+awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION
+echo "LibreSSL version `cat VERSION`"
 
 # copy libcrypto source
 echo copying libcrypto source