diff options
| author | Brent Cook <busterb@gmail.com> | 2020-08-20 10:19:23 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-08-20 10:19:23 -0500 |
| commit | 85eea94598ff4b543777df4bf34d44ef5dfc06c6 (patch) | |
| tree | e7b43cde3c48ea4f36fc10cfdd0b7e9272bc86dc /update.sh | |
| parent | 24a3218467ac9ed1181b234ac005f074d5056053 (diff) | |
| download | portable-85eea94598ff4b543777df4bf34d44ef5dfc06c6.tar.gz portable-85eea94598ff4b543777df4bf34d44ef5dfc06c6.tar.bz2 portable-85eea94598ff4b543777df4bf34d44ef5dfc06c6.zip | |
disable some additional libtls-standalone bits
Diffstat (limited to 'update.sh')
| -rwxr-xr-x | update.sh | 21 |
1 files changed, 1 insertions, 20 deletions
| @@ -46,7 +46,6 @@ echo $libssl_version > ssl/VERSION | |||
| 46 | libtls_version=$major:$minor:0 | 46 | libtls_version=$major:$minor:0 |
| 47 | echo "libtls version $libtls_version" | 47 | echo "libtls version $libtls_version" |
| 48 | echo $libtls_version > tls/VERSION | 48 | echo $libtls_version > tls/VERSION |
| 49 | echo $major.$minor.0 > libtls-standalone/VERSION | ||
| 50 | 49 | ||
| 51 | do_mv() { | 50 | do_mv() { |
| 52 | if ! cmp -s "$1" "$2" | 51 | if ! cmp -s "$1" "$2" |
| @@ -76,9 +75,8 @@ $CP $libcrypto_src/opensslfeatures.h include/openssl | |||
| 76 | $CP $libssl_src/pqueue.h include | 75 | $CP $libssl_src/pqueue.h include |
| 77 | 76 | ||
| 78 | $CP $libtls_src/tls.h include | 77 | $CP $libtls_src/tls.h include |
| 79 | $CP $libtls_src/tls.h libtls-standalone/include | ||
| 80 | 78 | ||
| 81 | for i in crypto/compat libtls-standalone/compat; do | 79 | for i in crypto/compat; do |
| 82 | for j in $libc_src/crypt/arc4random.c \ | 80 | for j in $libc_src/crypt/arc4random.c \ |
| 83 | $libc_src/crypt/arc4random_uniform.c \ | 81 | $libc_src/crypt/arc4random_uniform.c \ |
| 84 | $libc_src/crypt/chacha_private.h \ | 82 | $libc_src/crypt/chacha_private.h \ |
| @@ -99,15 +97,6 @@ for i in crypto/compat libtls-standalone/compat; do | |||
| 99 | done | 97 | done |
| 100 | done | 98 | done |
| 101 | 99 | ||
| 102 | $CP include/compat/stdlib.h \ | ||
| 103 | include/compat/string.h \ | ||
| 104 | include/compat/unistd.h \ | ||
| 105 | libtls-standalone/include | ||
| 106 | |||
| 107 | $CP crypto/compat/arc4random*.h \ | ||
| 108 | crypto/compat/bsd-asprintf.c \ | ||
| 109 | libtls-standalone/compat | ||
| 110 | |||
| 111 | (cd $libcrypto_src/objects/; | 100 | (cd $libcrypto_src/objects/; |
| 112 | perl objects.pl objects.txt obj_mac.num obj_mac.h; | 101 | perl objects.pl objects.txt obj_mac.num obj_mac.h; |
| 113 | perl obj_dat.pl obj_mac.h obj_dat.h ) | 102 | perl obj_dat.pl obj_mac.h obj_dat.h ) |
| @@ -243,19 +232,11 @@ rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h | |||
| 243 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do | 232 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do |
| 244 | if [ -e $libtls_src/$i ]; then | 233 | if [ -e $libtls_src/$i ]; then |
| 245 | $CP $libtls_src/$i tls | 234 | $CP $libtls_src/$i tls |
| 246 | $CP $libtls_src/$i libtls-standalone/src | ||
| 247 | fi | 235 | fi |
| 248 | done | 236 | done |
| 249 | # add the libtls symbol export list | 237 | # add the libtls symbol export list |
| 250 | $GREP '^[A-Za-z0-9_]' < $libtls_src/Symbols.list > tls/tls.sym | 238 | $GREP '^[A-Za-z0-9_]' < $libtls_src/Symbols.list > tls/tls.sym |
| 251 | 239 | ||
| 252 | mkdir -p libtls-standalone/m4 | ||
| 253 | $CP m4/check*.m4 \ | ||
| 254 | m4/disable*.m4 \ | ||
| 255 | libtls-standalone/m4 | ||
| 256 | sed -e "s/compat\///" crypto/Makefile.am.arc4random > \ | ||
| 257 | libtls-standalone/compat/Makefile.am.arc4random | ||
| 258 | |||
| 259 | # copy nc(1) source | 240 | # copy nc(1) source |
| 260 | echo "copying nc(1) source" | 241 | echo "copying nc(1) source" |
| 261 | $CP $bin_src/nc/nc.1 apps/nc | 242 | $CP $bin_src/nc/nc.1 apps/nc |