From c95574be9296988962cb1358c969144dc382061b Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Thu, 31 Jul 2014 18:18:45 -0500
Subject: [PATCH] tie master libressl branch to openbsd master

Added OPENBSD_BRANCH to set what branch update.sh should checkout.
---
 OPENBSD_BRANCH |  1 +
 update.sh      | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 OPENBSD_BRANCH

diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH
new file mode 100644
index 0000000..1f7391f
--- /dev/null
+++ b/OPENBSD_BRANCH
@@ -0,0 +1 @@
+master
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