aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--VERSION1
-rwxr-xr-xupdate.sh7
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
93 93
94include/openssl/Makefile.am 94include/openssl/Makefile.am
95 95
96VERSION
96crypto/VERSION 97crypto/VERSION
97ssl/VERSION 98ssl/VERSION
98tls/VERSION 99tls/VERSION
diff --git a/VERSION b/VERSION
index b1b25a5..c4d77e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,2 @@
12.2.2 12.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 @@
2set -e 2set -e
3 3
4openbsd_branch=`cat OPENBSD_BRANCH` 4openbsd_branch=`cat OPENBSD_BRANCH`
5libressl_version=`cat VERSION`
6 5
7# pull in latest upstream code 6# pull in latest upstream code
8echo "pulling upstream openbsd source" 7echo "pulling upstream openbsd source"
@@ -120,9 +119,9 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h
120 119
121copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" 120copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
122 121
123sed -e "s/\"LibreSSL .*\"/\"LibreSSL ${libressl_version}\"/" \ 122$CP $libssl_src/src/crypto/opensslv.h include/openssl
124 $libssl_src/src/crypto/opensslv.h > include/openssl/opensslv.h.lcl 123awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION
125$MV include/openssl/opensslv.h.lcl include/openssl/opensslv.h 124echo "LibreSSL version `cat VERSION`"
126 125
127# copy libcrypto source 126# copy libcrypto source
128echo copying libcrypto source 127echo copying libcrypto source