tie libressl branch to openbsd branch, bump ver.

Added OPENBSD_BRANCH to set what branch update.sh should checkout.

3 files changed, 9 insertions, 9 deletions

diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH
new file mode 100644
index 0000000..16a1995
--- /dev/null
+++ b/OPENBSD_BRANCH
@@ -0,0 +1 @@
+OPENBSD_5_6
diff --git a/VERSION b/VERSION
index 7ec1d6d..2165f8f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.0.4
diff --git a/update.sh b/update.sh
index a928807..21a516d 100755
--- a/update.sh
+++ b/update.sh
@@ -1,18 +1,19 @@
 #!/usr/bin/env bash
 set -e
 
-# resync this library with the upstream project, remove old submodule dirs
-if [ -d openbsd ]; then
-        (cd openbsd
-         git checkout master
-         git pull)
-else
+openbsd_branch=`cat OPENBSD_BRANCH`
+libressl_version=`cat VERSION`
+
+if [ ! -d openbsd ]; then
         if [ -z "$LIBRESSL_GIT" ]; then
                 git clone https://github.com/libressl-portable/openbsd.git
         else
                 git clone $LIBRESSL_GIT/openbsd
         fi
 fi
+(cd openbsd
+ git checkout $openbsd_branch
+ git pull)
 
 dir=`pwd`
 libssl_src=$dir/openbsd/src/lib/libssl
@@ -23,8 +24,6 @@ libcrypto_src=$dir/openbsd/src/lib/libcrypto
 openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl
 libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto
 
-libressl_version=`cat VERSION`
-
 source $libssl_src/ssl/shlib_version
 libssl_version=$major:$minor:0
 echo libssl version $libssl_version