aboutsummaryrefslogtreecommitdiff
path: root/update.sh
diff options
context:
space:
mode:
Diffstat (limited to 'update.sh')
-rwxr-xr-xupdate.sh15
1 files changed, 7 insertions, 8 deletions
diff --git a/update.sh b/update.sh
index a928807..21a516d 100755
--- a/update.sh
+++ b/update.sh
@@ -1,18 +1,19 @@
1#!/usr/bin/env bash 1#!/usr/bin/env bash
2set -e 2set -e
3 3
4# resync this library with the upstream project, remove old submodule dirs 4openbsd_branch=`cat OPENBSD_BRANCH`
5if [ -d openbsd ]; then 5libressl_version=`cat VERSION`
6 (cd openbsd 6
7 git checkout master 7if [ ! -d openbsd ]; then
8 git pull)
9else
10 if [ -z "$LIBRESSL_GIT" ]; then 8 if [ -z "$LIBRESSL_GIT" ]; then
11 git clone https://github.com/libressl-portable/openbsd.git 9 git clone https://github.com/libressl-portable/openbsd.git
12 else 10 else
13 git clone $LIBRESSL_GIT/openbsd 11 git clone $LIBRESSL_GIT/openbsd
14 fi 12 fi
15fi 13fi
14(cd openbsd
15 git checkout $openbsd_branch
16 git pull)
16 17
17dir=`pwd` 18dir=`pwd`
18libssl_src=$dir/openbsd/src/lib/libssl 19libssl_src=$dir/openbsd/src/lib/libssl
@@ -23,8 +24,6 @@ libcrypto_src=$dir/openbsd/src/lib/libcrypto
23openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl 24openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl
24libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto 25libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto
25 26
26libressl_version=`cat VERSION`
27
28source $libssl_src/ssl/shlib_version 27source $libssl_src/ssl/shlib_version
29libssl_version=$major:$minor:0 28libssl_version=$major:$minor:0
30echo libssl version $libssl_version 29echo libssl version $libssl_version