update to 2.0.6

this avoids inadvertent local merges

OPENBSD_BRANCH

@@ -0,0 +1 @@
+OPENBSD_5_6

VERSION

@@ -1 +1 @@
-2.1.0
+2.0.6

configure.ac.tpl

@@ -72,6 +72,11 @@ AC_CHECK_FUNC(strndup,
 	AC_DEFINE(NO_STRNDUP)
 	AM_CONDITIONAL(NO_STRNDUP, true))
 
+AC_CHECK_FUNC(strnlen,
+	AM_CONDITIONAL(NO_STRNLEN, false),
+	AC_DEFINE(NO_STRNLEN)
+	AM_CONDITIONAL(NO_STRNLEN, true))
+
 AC_CHECK_FUNC(asprintf,
 	AM_CONDITIONAL(NO_ASPRINTF, false),
 	AC_DEFINE(NO_ASPRINTF)

crypto/Makefile.am.tpl

@@ -35,8 +35,10 @@ endif
 
 if NO_STRNDUP
 libcompat_la_SOURCES += compat/strndup.c
+if NO_STRNLEN
 libcompat_la_SOURCES += compat/strnlen.c
 endif
+endif
 
 if NO_ASPRINTF
 libcompat_la_SOURCES += compat/bsd-asprintf.c

include/string.h

@@ -22,8 +22,10 @@ size_t strlcat(char *dst, const char *src, size_t siz);
 
 #ifdef NO_STRNDUP
 char * strndup(const char *str, size_t maxlen);
+#ifdef NO_STRNLEN
 size_t strnlen(const char *str, size_t maxlen);
 #endif
+#endif
 
 #ifdef NO_EXPLICIT_BZERO
 void explicit_bzero(void *, size_t);

update.sh

@@ -1,18 +1,19 @@
 #!/usr/bin/env bash
 set -e
 
-# resync this library with the upstream project, remove old submodule dirs
+openbsd_branch=`cat OPENBSD_BRANCH`
-if [ -d openbsd ]; then
+libressl_version=`cat VERSION`
-	(cd openbsd
+
-	 git checkout master
+if [ ! -d openbsd ]; then
-	 git pull)
-else
 	if [ -z "$LIBRESSL_GIT" ]; then
 		git clone https://github.com/libressl-portable/openbsd.git
 	else
 		git clone $LIBRESSL_GIT/openbsd
 	fi
 fi
+(cd openbsd
+ git checkout $openbsd_branch
+ git pull --rebase)
 
 dir=`pwd`
 libssl_src=$dir/openbsd/src/lib/libssl
@@ -23,8 +24,6 @@ libcrypto_src=$dir/openbsd/src/lib/libcrypto
 openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl
 libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto
 
-libressl_version=`cat VERSION`
-
 source $libssl_src/ssl/shlib_version
 libssl_version=$major:$minor:0
 echo libssl version $libssl_version