diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-01-28 03:40:38 +0900 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-01-28 03:40:38 +0900 |
commit | 58eb645fdba229c1b214a0ac14f7365df171b62f (patch) | |
tree | 062683488b56d8a9f62a2d5772aff39edebb4268 /update.sh | |
parent | cb57534af8ce4cacd69a3edcd42bb8a6bcd0b40b (diff) | |
download | portable-58eb645fdba229c1b214a0ac14f7365df171b62f.tar.gz portable-58eb645fdba229c1b214a0ac14f7365df171b62f.tar.bz2 portable-58eb645fdba229c1b214a0ac14f7365df171b62f.zip |
Copy libc compat files rather than adding into the repository
- remove the CP_LIBC files from repo
- move tests/memmem.c to tests/compat/
Diffstat (limited to 'update.sh')
-rwxr-xr-x | update.sh | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -76,8 +76,9 @@ for i in crypto/compat libtls-standalone/compat; do | |||
76 | for j in $libc_src/crypt/arc4random.c \ | 76 | for j in $libc_src/crypt/arc4random.c \ |
77 | $libc_src/crypt/arc4random_uniform.c \ | 77 | $libc_src/crypt/arc4random_uniform.c \ |
78 | $libc_src/crypt/chacha_private.h \ | 78 | $libc_src/crypt/chacha_private.h \ |
79 | $libc_src/string/explicit_bzero.c \ | 79 | $libc_src/net/inet_pton.c \ |
80 | $libc_src/stdlib/reallocarray.c \ | 80 | $libc_src/stdlib/reallocarray.c \ |
81 | $libc_src/string/explicit_bzero.c \ | ||
81 | $libc_src/string/strcasecmp.c \ | 82 | $libc_src/string/strcasecmp.c \ |
82 | $libc_src/string/strlcpy.c \ | 83 | $libc_src/string/strlcpy.c \ |
83 | $libc_src/string/strlcat.c \ | 84 | $libc_src/string/strlcat.c \ |
@@ -217,6 +218,7 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \ | |||
217 | echo "copying nc(1) source" | 218 | echo "copying nc(1) source" |
218 | $CP $bin_src/nc/nc.1 apps/nc | 219 | $CP $bin_src/nc/nc.1 apps/nc |
219 | rm -f apps/nc/*.c apps/nc/*.h | 220 | rm -f apps/nc/*.c apps/nc/*.h |
221 | $CP_LIBC $libc_src/net/base64.c apps/nc/compat | ||
220 | $CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat | 222 | $CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat |
221 | 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 |
222 | if [ -e $bin_src/nc/$i ]; then | 224 | if [ -e $bin_src/nc/$i ]; then |
@@ -269,7 +271,7 @@ $CP $libcrypto_regress/aead/aeadtests.txt tests | |||
269 | # copy libc tests | 271 | # copy libc tests |
270 | $CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c | 272 | $CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c |
271 | $CP $libc_regress/explicit_bzero/explicit_bzero.c tests | 273 | $CP $libc_regress/explicit_bzero/explicit_bzero.c tests |
272 | $CP_LIBC $libc_src/string/memmem.c tests | 274 | $CP_LIBC $libc_src/string/memmem.c tests/compat |
273 | $CP $libc_regress/timingsafe/timingsafe.c tests | 275 | $CP $libc_regress/timingsafe/timingsafe.c tests |
274 | 276 | ||
275 | # copy libssl tests | 277 | # copy libssl tests |