diff options
author | Brent Cook <bcook@openbsd.org> | 2015-08-28 05:54:12 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-08-28 13:17:13 -0500 |
commit | 83e3f22710bd4062e7caaa896633b036d402827e (patch) | |
tree | 047753458b3daab3f9fc3dec97a277c3ff526f69 | |
parent | b3f22d85e5c1d1f946f9675b69173d34a1904c8f (diff) | |
download | portable-83e3f22710bd4062e7caaa896633b036d402827e.tar.gz portable-83e3f22710bd4062e7caaa896633b036d402827e.tar.bz2 portable-83e3f22710bd4062e7caaa896633b036d402827e.zip |
replace remaining bash-only features in the update script
We used to need more features, but as the Makefile.am's
stopped being dynamically generated, there is less need.
-rw-r--r-- | README.md | 2 | ||||
-rwxr-xr-x | update.sh | 38 |
2 files changed, 20 insertions, 20 deletions
@@ -62,7 +62,7 @@ If you have checked this source using Git, follow these initial steps to | |||
62 | prepare the source tree for building: | 62 | prepare the source tree for building: |
63 | 63 | ||
64 | 1. Ensure you have the following packages installed: | 64 | 1. Ensure you have the following packages installed: |
65 | automake, autoconf, bash, git, libtool, perl, pod2man | 65 | automake, autoconf, git, libtool, perl, pod2man |
66 | 2. Run './autogen.sh' to prepare the source tree for building or | 66 | 2. Run './autogen.sh' to prepare the source tree for building or |
67 | run './dist.sh' to prepare a tarball. | 67 | run './dist.sh' to prepare a tarball. |
68 | 68 | ||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env bash | 1 | #!/bin/sh |
2 | set -e | 2 | set -e |
3 | 3 | ||
4 | openbsd_branch=`cat OPENBSD_BRANCH` | 4 | openbsd_branch=`cat OPENBSD_BRANCH` |
@@ -28,17 +28,17 @@ libtls_src=$CWD/openbsd/src/lib/libtls | |||
28 | openssl_app_src=$CWD/openbsd/src/usr.bin/openssl | 28 | openssl_app_src=$CWD/openbsd/src/usr.bin/openssl |
29 | 29 | ||
30 | # load library versions | 30 | # load library versions |
31 | source $libcrypto_src/crypto/shlib_version | 31 | . $libcrypto_src/crypto/shlib_version |
32 | libcrypto_version=$major:$minor:0 | 32 | libcrypto_version=$major:$minor:0 |
33 | echo "libcrypto version $libcrypto_version" | 33 | echo "libcrypto version $libcrypto_version" |
34 | echo $libcrypto_version > crypto/VERSION | 34 | echo $libcrypto_version > crypto/VERSION |
35 | 35 | ||
36 | source $libssl_src/ssl/shlib_version | 36 | . $libssl_src/ssl/shlib_version |
37 | libssl_version=$major:$minor:0 | 37 | libssl_version=$major:$minor:0 |
38 | echo "libssl version $libssl_version" | 38 | echo "libssl version $libssl_version" |
39 | echo $libssl_version > ssl/VERSION | 39 | echo $libssl_version > ssl/VERSION |
40 | 40 | ||
41 | source $libtls_src/shlib_version | 41 | . $libtls_src/shlib_version |
42 | libtls_version=$major:$minor:0 | 42 | libtls_version=$major:$minor:0 |
43 | echo "libtls version $libtls_version" | 43 | echo "libtls version $libtls_version" |
44 | echo $libtls_version > tls/VERSION | 44 | echo $libtls_version > tls/VERSION |
@@ -67,19 +67,19 @@ $CP $libtls_src/tls.h libtls-standalone/include | |||
67 | 67 | ||
68 | for i in crypto/compat libtls-standalone/compat; do | 68 | for i in crypto/compat libtls-standalone/compat; do |
69 | $CP $libc_src/crypt/arc4random.c \ | 69 | $CP $libc_src/crypt/arc4random.c \ |
70 | $libc_src/crypt/chacha_private.h \ | 70 | $libc_src/crypt/chacha_private.h \ |
71 | $libc_src/string/explicit_bzero.c \ | 71 | $libc_src/string/explicit_bzero.c \ |
72 | $libc_src/stdlib/reallocarray.c \ | 72 | $libc_src/stdlib/reallocarray.c \ |
73 | $libc_src/string/strcasecmp.c \ | 73 | $libc_src/string/strcasecmp.c \ |
74 | $libc_src/string/strlcpy.c \ | 74 | $libc_src/string/strlcpy.c \ |
75 | $libc_src/string/strlcat.c \ | 75 | $libc_src/string/strlcat.c \ |
76 | $libc_src/string/strndup.c \ | 76 | $libc_src/string/strndup.c \ |
77 | $libc_src/string/strnlen.c \ | 77 | $libc_src/string/strnlen.c \ |
78 | $libc_src/string/timingsafe_bcmp.c \ | 78 | $libc_src/string/timingsafe_bcmp.c \ |
79 | $libc_src/string/timingsafe_memcmp.c \ | 79 | $libc_src/string/timingsafe_memcmp.c \ |
80 | $libcrypto_src/crypto/getentropy_*.c \ | 80 | $libcrypto_src/crypto/getentropy_*.c \ |
81 | $libcrypto_src/crypto/arc4random_*.h \ | 81 | $libcrypto_src/crypto/arc4random_*.h \ |
82 | $i | 82 | $i |
83 | done | 83 | done |
84 | 84 | ||
85 | $CP include/compat/stdlib.h \ | 85 | $CP include/compat/stdlib.h \ |
@@ -143,7 +143,7 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui | |||
143 | asm_src=$libssl_src/src/crypto | 143 | asm_src=$libssl_src/src/crypto |
144 | gen_asm_stdout() { | 144 | gen_asm_stdout() { |
145 | perl $asm_src/$2 $1 > $3.tmp | 145 | perl $asm_src/$2 $1 > $3.tmp |
146 | [[ $1 == "elf" ]] && cat <<-EOF >> $3.tmp | 146 | [ $1 = "elf" ] && cat <<-EOF >> $3.tmp |
147 | #if defined(HAVE_GNU_STACK) | 147 | #if defined(HAVE_GNU_STACK) |
148 | .section .note.GNU-stack,"",%progbits | 148 | .section .note.GNU-stack,"",%progbits |
149 | #endif | 149 | #endif |
@@ -152,7 +152,7 @@ gen_asm_stdout() { | |||
152 | } | 152 | } |
153 | gen_asm() { | 153 | gen_asm() { |
154 | perl $asm_src/$2 $1 $3.tmp | 154 | perl $asm_src/$2 $1 $3.tmp |
155 | [[ $1 == "elf" ]] && cat <<-EOF >> $3.tmp | 155 | [ $1 = "elf" ] && cat <<-EOF >> $3.tmp |
156 | #if defined(HAVE_GNU_STACK) | 156 | #if defined(HAVE_GNU_STACK) |
157 | .section .note.GNU-stack,"",%progbits | 157 | .section .note.GNU-stack,"",%progbits |
158 | #endif | 158 | #endif |