generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tie master libressl branch to openbsd master

Browse Source 
Added OPENBSD_BRANCH to set what branch update.sh should checkout.
This commit is contained in:
Brent Cook 2014-07-31 18:18:45 -05:00
parent 3e21619bcf
commit c95574be92
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OPENBSD_BRANCH Normal file
View File

@ -0,0 +1 @@
master

15
update.sh
View File

@ -1,18 +1,19 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
# resync this library with the upstream project, remove old submodule dirs openbsd_branch=`cat OPENBSD_BRANCH`
if [ -d openbsd ]; then libressl_version=`cat VERSION`
(cd openbsd
git checkout master if [ ! -d openbsd ]; then
git pull)
else
if [ -z "$LIBRESSL_GIT" ]; then if [ -z "$LIBRESSL_GIT" ]; then
git clone https://github.com/libressl-portable/openbsd.git git clone https://github.com/libressl-portable/openbsd.git
else else
git clone $LIBRESSL_GIT/openbsd git clone $LIBRESSL_GIT/openbsd
fi fi
fi fi
(cd openbsd
git checkout $openbsd_branch
git pull)
dir=`pwd` dir=`pwd`
libssl_src=$dir/openbsd/src/lib/libssl 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 openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl
libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto
libressl_version=`cat VERSION`
source $libssl_src/ssl/shlib_version source $libssl_src/ssl/shlib_version
libssl_version=$major:$minor:0 libssl_version=$major:$minor:0
echo libssl version $libssl_version echo libssl version $libssl_version