diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-07-31 18:18:45 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-07-31 22:08:30 -0500 |
| commit | c95574be9296988962cb1358c969144dc382061b (patch) | |
| tree | 2038339bce1c7507141bb60a90655d65d521bd7e | |
| parent | 3e21619bcf5bc37027bcd01d8eac2d9745e2521e (diff) | |
| download | portable-c95574be9296988962cb1358c969144dc382061b.tar.gz portable-c95574be9296988962cb1358c969144dc382061b.tar.bz2 portable-c95574be9296988962cb1358c969144dc382061b.zip | |
tie master libressl branch to openbsd master
Added OPENBSD_BRANCH to set what branch update.sh should checkout.
| -rw-r--r-- | OPENBSD_BRANCH | 1 | ||||
| -rwxr-xr-x | update.sh | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH new file mode 100644 index 0000000..1f7391f --- /dev/null +++ b/OPENBSD_BRANCH | |||
| @@ -0,0 +1 @@ | |||
| master | |||
| @@ -1,18 +1,19 @@ | |||
| 1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
| 2 | set -e | 2 | set -e |
| 3 | 3 | ||
| 4 | # resync this library with the upstream project, remove old submodule dirs | 4 | openbsd_branch=`cat OPENBSD_BRANCH` |
| 5 | if [ -d openbsd ]; then | 5 | libressl_version=`cat VERSION` |
| 6 | (cd openbsd | 6 | |
| 7 | git checkout master | 7 | if [ ! -d openbsd ]; then |
| 8 | git pull) | ||
| 9 | else | ||
| 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 |
| 15 | fi | 13 | fi |
| 14 | (cd openbsd | ||
| 15 | git checkout $openbsd_branch | ||
| 16 | git pull) | ||
| 16 | 17 | ||
| 17 | dir=`pwd` | 18 | dir=`pwd` |
| 18 | libssl_src=$dir/openbsd/src/lib/libssl | 19 | libssl_src=$dir/openbsd/src/lib/libssl |
| @@ -23,8 +24,6 @@ libcrypto_src=$dir/openbsd/src/lib/libcrypto | |||
| 23 | openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl | 24 | openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl |
| 24 | libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto | 25 | libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto |
| 25 | 26 | ||
| 26 | libressl_version=`cat VERSION` | ||
| 27 | |||
| 28 | source $libssl_src/ssl/shlib_version | 27 | source $libssl_src/ssl/shlib_version |
| 29 | libssl_version=$major:$minor:0 | 28 | libssl_version=$major:$minor:0 |
| 30 | echo libssl version $libssl_version | 29 | echo libssl version $libssl_version |