generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace remaining bash-only features in the update script

Browse Source 
We used to need more features, but as the Makefile.am's
stopped being dynamically generated, there is less need.
This commit is contained in:
Brent Cook 2015-08-28 05:54:12 -05:00
parent 935d2744aa
commit cc3c1810e2
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -62,7 +62,7 @@ If you have checked this source using Git, follow these initial steps to
prepare the source tree for building: prepare the source tree for building:
1. Ensure you have the following packages installed: 1. Ensure you have the following packages installed:
automake, autoconf, bash, git, libtool, perl, pod2man automake, autoconf, git, libtool, perl, pod2man
2. Run './autogen.sh' to prepare the source tree for building or 2. Run './autogen.sh' to prepare the source tree for building or
run './dist.sh' to prepare a tarball. run './dist.sh' to prepare a tarball.

38
update.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh
set -e set -e
openbsd_branch=`cat OPENBSD_BRANCH` openbsd_branch=`cat OPENBSD_BRANCH`
@ -28,17 +28,17 @@ libtls_src=$CWD/openbsd/src/lib/libtls
openssl_app_src=$CWD/openbsd/src/usr.bin/openssl openssl_app_src=$CWD/openbsd/src/usr.bin/openssl
# load library versions # load library versions
source $libcrypto_src/crypto/shlib_version . $libcrypto_src/crypto/shlib_version
libcrypto_version=$major:$minor:0 libcrypto_version=$major:$minor:0
echo "libcrypto version $libcrypto_version" echo "libcrypto version $libcrypto_version"
echo $libcrypto_version > crypto/VERSION echo $libcrypto_version > crypto/VERSION
source $libssl_src/ssl/shlib_version . $libssl_src/ssl/shlib_version
libssl_version=$major:$minor:0 libssl_version=$major:$minor:0
echo "libssl version $libssl_version" echo "libssl version $libssl_version"
echo $libssl_version > ssl/VERSION echo $libssl_version > ssl/VERSION
source $libtls_src/shlib_version . $libtls_src/shlib_version
libtls_version=$major:$minor:0 libtls_version=$major:$minor:0
echo "libtls version $libtls_version" echo "libtls version $libtls_version"
echo $libtls_version > tls/VERSION echo $libtls_version > tls/VERSION
@ -67,19 +67,19 @@ $CP $libtls_src/tls.h libtls-standalone/include
for i in crypto/compat libtls-standalone/compat; do for i in crypto/compat libtls-standalone/compat; do
$CP $libc_src/crypt/arc4random.c \ $CP $libc_src/crypt/arc4random.c \
$libc_src/crypt/chacha_private.h \ $libc_src/crypt/chacha_private.h \
$libc_src/string/explicit_bzero.c \ $libc_src/string/explicit_bzero.c \
$libc_src/stdlib/reallocarray.c \ $libc_src/stdlib/reallocarray.c \
$libc_src/string/strcasecmp.c \ $libc_src/string/strcasecmp.c \
$libc_src/string/strlcpy.c \ $libc_src/string/strlcpy.c \
$libc_src/string/strlcat.c \ $libc_src/string/strlcat.c \
$libc_src/string/strndup.c \ $libc_src/string/strndup.c \
$libc_src/string/strnlen.c \ $libc_src/string/strnlen.c \
$libc_src/string/timingsafe_bcmp.c \ $libc_src/string/timingsafe_bcmp.c \
$libc_src/string/timingsafe_memcmp.c \ $libc_src/string/timingsafe_memcmp.c \
$libcrypto_src/crypto/getentropy_*.c \ $libcrypto_src/crypto/getentropy_*.c \
$libcrypto_src/crypto/arc4random_*.h \ $libcrypto_src/crypto/arc4random_*.h \
$i $i
done done
$CP include/compat/stdlib.h \ $CP include/compat/stdlib.h \
@ -143,7 +143,7 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui
asm_src=$libssl_src/src/crypto asm_src=$libssl_src/src/crypto
gen_asm_stdout() { gen_asm_stdout() {
perl $asm_src/$2 $1 > $3.tmp perl $asm_src/$2 $1 > $3.tmp
[[ $1 == "elf" ]] && cat <<-EOF >> $3.tmp [ $1 = "elf" ] && cat <<-EOF >> $3.tmp
#if defined(HAVE_GNU_STACK) #if defined(HAVE_GNU_STACK)
.section .note.GNU-stack,"",%progbits .section .note.GNU-stack,"",%progbits
#endif #endif
@ -152,7 +152,7 @@ gen_asm_stdout() {
} }
gen_asm() { gen_asm() {
perl $asm_src/$2 $1 $3.tmp perl $asm_src/$2 $1 $3.tmp
[[ $1 == "elf" ]] && cat <<-EOF >> $3.tmp [ $1 = "elf" ] && cat <<-EOF >> $3.tmp
#if defined(HAVE_GNU_STACK) #if defined(HAVE_GNU_STACK)
.section .note.GNU-stack,"",%progbits .section .note.GNU-stack,"",%progbits
#endif #endif