aboutsummaryrefslogtreecommitdiff
path: root/update.sh
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-03-08 18:27:07 -0500
committerBrent Cook <bcook@openbsd.org>2015-03-08 22:02:54 -0500
commitf7e4e4a2666aa5ea39536d425206e680d76769d9 (patch)
tree13aa6671d47049af239073b96d907d63713f90c4 /update.sh
parent031f0aaa8f9b2e907195dbda8b7c451a08d58bbb (diff)
downloadportable-f7e4e4a2666aa5ea39536d425206e680d76769d9.tar.gz
portable-f7e4e4a2666aa5ea39536d425206e680d76769d9.tar.bz2
portable-f7e4e4a2666aa5ea39536d425206e680d76769d9.zip
initialize winsock earlier in openssl(1)
This allows commands like ocsp to work properly since we no longer initialize Winsock as a side-effect of doing a BIO_gethostbyname.
Diffstat (limited to 'update.sh')
-rwxr-xr-xupdate.sh20
1 files changed, 11 insertions, 9 deletions
diff --git a/update.sh b/update.sh
index 29012ad..e007f31 100755
--- a/update.sh
+++ b/update.sh
@@ -18,15 +18,15 @@ fi
18 git pull --rebase) 18 git pull --rebase)
19 19
20# setup source paths 20# setup source paths
21dir=`pwd` 21CWD=`pwd`
22libc_src=$dir/openbsd/src/lib/libc 22libc_src=$CWD/openbsd/src/lib/libc
23libc_regress=$dir/openbsd/src/regress/lib/libc 23libc_regress=$CWD/openbsd/src/regress/lib/libc
24libcrypto_src=$dir/openbsd/src/lib/libcrypto 24libcrypto_src=$CWD/openbsd/src/lib/libcrypto
25libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto 25libcrypto_regress=$CWD/openbsd/src/regress/lib/libcrypto
26libssl_src=$dir/openbsd/src/lib/libssl 26libssl_src=$CWD/openbsd/src/lib/libssl
27libssl_regress=$dir/openbsd/src/regress/lib/libssl 27libssl_regress=$CWD/openbsd/src/regress/lib/libssl
28libtls_src=$dir/openbsd/src/lib/libtls 28libtls_src=$CWD/openbsd/src/lib/libtls
29openssl_app_src=$dir/openbsd/src/usr.bin/openssl 29openssl_app_src=$CWD/openbsd/src/usr.bin/openssl
30 30
31# load library versions 31# load library versions
32source $libcrypto_src/crypto/shlib_version 32source $libcrypto_src/crypto/shlib_version
@@ -184,6 +184,8 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do
184 $CP $openssl_app_src/$i apps 184 $CP $openssl_app_src/$i apps
185 fi 185 fi
186done 186done
187# patch for openssl(1) oscp on windows
188(cd apps; patch -p5 < $CWD/patches/win_bio_sock_init.diff)
187 189
188# copy libssl source 190# copy libssl source
189echo "copying libssl source" 191echo "copying libssl source"