update script to work rebased on cvs.openbsd.org

ok bcook@

3 files changed, 25 insertions, 17 deletions

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