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

update script to work rebased on cvs.openbsd.org

Browse Source 
ok bcook@
This commit is contained in:
Bob Beck 2014-07-10 07:36:19 -06:00
parent 2b6dbc39ef
commit 985fdadd45
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "openbsd"]
path = openbsd
url = /cvs.b/libressl/openbsd

1
openbsd Submodule

@ -0,0 +1 @@
Subproject commit 04628d3339049b85971a4ac25f97534f414ee10d

39
update.sh
View File

@ -2,16 +2,20 @@
set -e set -e
# resync this library with the upstream project, remove old submodule dirs # resync this library with the upstream project, remove old submodule dirs
if [ -d openbsd ]; then
git submodule init git submodule init
git submodule update git submodule update
rm -fr *-openbsd else
git submodule add /cvs.b/libressl/openbsd
git submodule update
fi
libssl_src=openbsd/libssl libssl_src=openbsd/src/lib/libssl
libssl_regress=openbsd/libssl-regress libssl_regress=openbsd/src/regress/lib/libssl
libc_src=openbsd/libc libc_src=openbsd/src/lib/libc
libc_regress=openbsd/libc-regress libc_regress=openbsd/src/regress/lib/libc
libcrypto_src=openbsd/libcrypto libcrypto_src=openbsd/src/lib/libcrypto
libcrypto_regress=openbsd/libcrypto-regress libcrypto_regress=openbsd/src/regress/lib/libcrypto
source $libssl_src/ssl/shlib_version source $libssl_src/ssl/shlib_version
libssl_version=$major:$minor:0 libssl_version=$major:$minor:0
@ -320,17 +324,18 @@ echo "EXTRA_DIST += testssl ca.pem server.pem" >> tests/Makefile.am
done done
) )
#XXX fix this in a header and remove it.
# remove unsupported __bounded__ attributes # remove unsupported __bounded__ attributes
bounded_excludes=( #bounded_excludes=(
include/openssl/bio.h # include/openssl/bio.h
include/openssl/buffer.h # include/openssl/buffer.h
include/openssl/md5.h # include/openssl/md5.h
include/openssl/sha.h # include/openssl/sha.h
crypto/chacha/chacha-merged.c # crypto/chacha/chacha-merged.c
) # )
for i in "${bounded_excludes[@]}"; do #for i in "${bounded_excludes[@]}"; do
sed -ie 's/__attribute__.*((__bounded__.*/;/' $i # sed -ie 's/__attribute__.*((__bounded__.*/;/' $i
done #done
(cd ssl (cd ssl
sed -e "s/libssl-version/${libssl_version}/" Makefile.am.tpl > Makefile.am sed -e "s/libssl-version/${libssl_version}/" Makefile.am.tpl > Makefile.am