diff options
Diffstat (limited to 'update.sh')
-rwxr-xr-x | update.sh | 25 |
1 files changed, 18 insertions, 7 deletions
@@ -26,7 +26,8 @@ libssl_src=$CWD/openbsd/src/lib/libssl | |||
26 | libssl_regress=$CWD/openbsd/src/regress/lib/libssl | 26 | libssl_regress=$CWD/openbsd/src/regress/lib/libssl |
27 | libtls_src=$CWD/openbsd/src/lib/libtls | 27 | libtls_src=$CWD/openbsd/src/lib/libtls |
28 | libtls_regress=$CWD/openbsd/src/regress/lib/libtls | 28 | libtls_regress=$CWD/openbsd/src/regress/lib/libtls |
29 | app_src=$CWD/openbsd/src/usr.bin | 29 | bin_src=$CWD/openbsd/src/usr.bin |
30 | sbin_src=$CWD/openbsd/src/usr.sbin | ||
30 | 31 | ||
31 | # load library versions | 32 | # load library versions |
32 | . $libcrypto_src/shlib_version | 33 | . $libcrypto_src/shlib_version |
@@ -216,25 +217,35 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \ | |||
216 | 217 | ||
217 | # copy nc(1) source | 218 | # copy nc(1) source |
218 | echo "copying nc(1) source" | 219 | echo "copying nc(1) source" |
219 | $CP $app_src/nc/nc.1 apps/nc | 220 | $CP $bin_src/nc/nc.1 apps/nc |
220 | rm -f apps/nc/*.c apps/nc/*.h | 221 | rm -f apps/nc/*.c apps/nc/*.h |
221 | $CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat | 222 | $CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat |
222 | for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do | 223 | for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do |
223 | if [ -e $app_src/nc/$i ]; then | 224 | if [ -e $bin_src/nc/$i ]; then |
224 | $CP $app_src/nc/$i apps/nc | 225 | $CP $bin_src/nc/$i apps/nc |
226 | fi | ||
227 | done | ||
228 | |||
229 | # copy ocspcheck(1) source | ||
230 | echo "copying ocspcheck(1) source" | ||
231 | $CP $sbin_src/ocspcheck/ocspcheck.8 apps/ocspcheck | ||
232 | rm -f apps/ocspcheck/*.c apps/ocspcheck/*.h | ||
233 | for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/ocspcheck/Makefile.am` ; do | ||
234 | if [ -e $sbin_src/ocspcheck/$i ]; then | ||
235 | $CP $sbin_src/ocspcheck/$i apps/ocspcheck | ||
225 | fi | 236 | fi |
226 | done | 237 | done |
227 | 238 | ||
228 | # copy openssl(1) source | 239 | # copy openssl(1) source |
229 | echo "copying openssl(1) source" | 240 | echo "copying openssl(1) source" |
230 | $CP $app_src/openssl/openssl.1 apps/openssl | 241 | $CP $bin_src/openssl/openssl.1 apps/openssl |
231 | $CP_LIBC $libc_src/stdlib/strtonum.c apps/openssl/compat | 242 | $CP_LIBC $libc_src/stdlib/strtonum.c apps/openssl/compat |
232 | $CP $libcrypto_src/cert.pem apps/openssl | 243 | $CP $libcrypto_src/cert.pem apps/openssl |
233 | $CP $libcrypto_src/openssl.cnf apps/openssl | 244 | $CP $libcrypto_src/openssl.cnf apps/openssl |
234 | $CP $libcrypto_src/x509v3.cnf apps/openssl | 245 | $CP $libcrypto_src/x509v3.cnf apps/openssl |
235 | for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/openssl/Makefile.am` ; do | 246 | for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/openssl/Makefile.am` ; do |
236 | if [ -e $app_src/openssl/$i ]; then | 247 | if [ -e $bin_src/openssl/$i ]; then |
237 | $CP $app_src/openssl/$i apps/openssl | 248 | $CP $bin_src/openssl/$i apps/openssl |
238 | fi | 249 | fi |
239 | done | 250 | done |
240 | 251 | ||