From ec17d32dffaed75da4e6f1bb6d4e14ff40d59a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 21 Sep 2011 19:44:34 +0200
Subject: Remove static ssl linking in crypto for otp_build

---
 erts/configure.in |  2 +-
 otp_build         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/erts/configure.in b/erts/configure.in
index fac07f8b6a..9dce264e2d 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -3535,7 +3535,7 @@ AC_SUBST(STATIC_KERBEROS_LIBS)
 AC_SUBST(SSL_LINK_WITH_ZLIB)
 AC_SUBST(STATIC_ZLIB_LIBS)
 
-std_ssl_locations="/usr/local /usr/sfw /opt/local /usr /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
+std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
 
 AC_ARG_WITH(ssl-zlib,
 AS_HELP_STRING([--with-ssl-zlib=PATH],
diff --git a/otp_build b/otp_build
index ed4609435f..de27fbc288 100755
--- a/otp_build
+++ b/otp_build
@@ -186,15 +186,15 @@ set_config_flags ()
 	if target_contains free_source; then
 		CONFIG_FLAGS="$CONFIG_FLAGS --host=$TARGET"
 	fi
-	# Link SSL static for all binary distributions if not overridden
-	# Even for win32 starting with R14B03
-	XX=`echo $* | grep -v dynamic-ssl-lib`
-	if [ "$*" = "$XX" ]; then 
-	    CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
-	fi
+	# Link SSL static for win32 binary distributions if not overridden
 	if target_contains win32; then
+	    XX=`echo $* | grep -v dynamic-ssl-lib`
+	    if [ "$*" = "$XX" ]; then 
+		CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
+	    fi
 	    CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" 
 	fi
+	    
 
 	if [ "x$OVERRIDE_CONFIG_CACHE" = "x" ]; then
 	    CONFIG_FLAGS="$CONFIG_FLAGS --cache-file=/dev/null"
-- 
cgit v1.2.3


From b8a50348bf4c0ceb8c7839bb243871fd96f0ea7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Thu, 22 Sep 2011 14:28:30 +0200
Subject: Change static link test of ssl to dynamic

Only used for commercial builds
---
 lib/crypto/test/crypto_SUITE.erl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 283aadb6ea..10b1737a91 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -138,14 +138,15 @@ link_test_2(Drv) ->
 	    Libs = os:cmd(Cmd),
 	    io:format("~p\n", [Libs]),
 	    case string:str(Libs, "libcrypto") of
-		0 -> ok;
-		_ ->
+		0 -> 
 		    case ?t:is_commercial() of
 			true ->
-			    ?t:fail({libcrypto,not_statically_linked});
+			    ?t:fail({libcrypto,statically_linked});
 			false ->
-			    {comment,"Not statically linked (OK for open-source platform)"}
-		    end
+			    {comment,"Statically linked (OK for open-source platform)"}
+		    end;
+		_ ->
+		    ok
 	    end
     end.
 
-- 
cgit v1.2.3


From edb449fc7f7ea9861b322edb6c00da907cec8c9c Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Mon, 26 Sep 2011 15:37:00 +0200
Subject: crypto: touch Makefile to provoke patch release

---
 lib/crypto/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 13eebea6a9..2a8fc6acfd 100644
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -36,3 +36,4 @@ SPECIAL_TARGETS =
 include $(ERL_TOP)/make/otp_subdir.mk
 
 
+# touched by patch 1176
-- 
cgit v1.2.3


From e46c9a0c949b9961f3d6942537c800e486e101e9 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 26 Sep 2011 17:22:56 +0200
Subject: Prepare release

---
 lib/crypto/doc/src/notes.xml | 15 +++++++++++++++
 lib/crypto/vsn.mk            |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index a5434ebd68..55f8cc90ca 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -30,6 +30,21 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 2.0.3.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    crypto changed to be dynamically linked against OpenSSL</p>
+          <p>
+	    Own Id: OTP-9566 Aux Id: seq11912 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 2.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index e754aabc44..547c33c07f 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 2.0.3
+CRYPTO_VSN = 2.0.3.1
-- 
cgit v1.2.3