diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | VERSION | 1 | ||||
-rwxr-xr-x | update.sh | 7 |
3 files changed, 5 insertions, 4 deletions
@@ -93,6 +93,7 @@ stamp-h2 | |||
93 | 93 | ||
94 | include/openssl/Makefile.am | 94 | include/openssl/Makefile.am |
95 | 95 | ||
96 | VERSION | ||
96 | crypto/VERSION | 97 | crypto/VERSION |
97 | ssl/VERSION | 98 | ssl/VERSION |
98 | tls/VERSION | 99 | tls/VERSION |
@@ -1 +1,2 @@ | |||
1 | 2.2.2 | 1 | 2.2.2 |
2 | |||
@@ -2,7 +2,6 @@ | |||
2 | set -e | 2 | set -e |
3 | 3 | ||
4 | openbsd_branch=`cat OPENBSD_BRANCH` | 4 | openbsd_branch=`cat OPENBSD_BRANCH` |
5 | libressl_version=`cat VERSION` | ||
6 | 5 | ||
7 | # pull in latest upstream code | 6 | # pull in latest upstream code |
8 | echo "pulling upstream openbsd source" | 7 | echo "pulling upstream openbsd source" |
@@ -120,9 +119,9 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h | |||
120 | 119 | ||
121 | copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" | 120 | copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" |
122 | 121 | ||
123 | sed -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 | 123 | awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION |
125 | $MV include/openssl/opensslv.h.lcl include/openssl/opensslv.h | 124 | echo "LibreSSL version `cat VERSION`" |
126 | 125 | ||
127 | # copy libcrypto source | 126 | # copy libcrypto source |
128 | echo copying libcrypto source | 127 | echo copying libcrypto source |