From b558703c8f5b1d98847349898904cbaa62441c8e Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 18 Mar 2011 20:18:34 +0100
Subject: [PATCH 1/3] add build script for open ssl

---
 submodules/build/builder-iphone-os.mk  | 13 ++++++----
 submodules/build/builders.d/openssl.mk | 34 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 submodules/build/builders.d/openssl.mk

diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 65dcdfce4..924131e5b 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -73,12 +73,14 @@ all: build-linphone build-msilbc
 
 clean-makefile: clean-makefile-linphone
 clean: clean-linphone
-
+init:
+	mkdir -p $(prefix)/include
+	mkdir -p $(prefix)/lib
 
 veryclean:
 	rm -rf $(BUILDER_BUILD_DIR)
 
-build-linphone: build-osip2 build-eXosip2  build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile
+build-linphone: init build-openssl build-osip2 build-eXosip2  build-speex build-libgsm  $(LINPHONE_BUILD_DIR)/Makefile
 	cd $(LINPHONE_BUILD_DIR)  && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate &&  make  && make install
 
 clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm  clean-msilbc clean-libilbc
@@ -254,9 +256,10 @@ clean-makefile-libilbc:
 	cd $(LIBILBC_BUILD_DIR) && rm -f Makefile
 
 #openssl
-$(prefix)/include/openssl/ssl.h:
-	cd $(prefix) \
-	&& unzip $(BUILDER_SRC_DIR)/prebuilt/$(OPENSSL_ZIP)
+include builders.d/openssl.mk
+#$(prefix)/include/openssl/ssl.h:
+#	cd $(prefix) \
+#	&& unzip $(BUILDER_SRC_DIR)/prebuilt/$(OPENSSL_ZIP)
 
 #sdk generation and distribution
 
diff --git a/submodules/build/builders.d/openssl.mk b/submodules/build/builders.d/openssl.mk
new file mode 100644
index 000000000..101ee8be9
--- /dev/null
+++ b/submodules/build/builders.d/openssl.mk
@@ -0,0 +1,34 @@
+openssl_version=1.0.0a
+OPENSSL_BUILD_DIR?=$(BUILDER_BUILD_DIR)/externals/openssl
+
+ifneq (,$(findstring mingw,$(host)))
+        CONFIGURE_OPTION := mingw
+	MAKE_PARAMS:= CC=i586-mingw32msvc-gcc RANLIB=i586-mingw32msvc-ranlib
+endif
+
+$(OPENSSL_BUILD_DIR)/Configure:
+	mkdir -p $(BUILDER_BUILD_DIR)/externals \
+	&& cd $(BUILDER_BUILD_DIR)/externals \
+	&& rm -rf openssl \
+	&& wget ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/openssl-$(openssl_version).tar.gz \
+	&& tar xvzf  openssl-$(openssl_version).tar.gz \
+	&& rm -f openssl-$(openssl_version).tar.gz \
+	&& mv  openssl-$(openssl_version) openssl  \
+	&& cd openssl && patch -p0 < $(BUILDER_SRC_DIR)/build/openssl.patch
+
+$(OPENSSL_BUILD_DIR)/Makefile: $(OPENSSL_BUILD_DIR)/Configure
+	cd $(OPENSSL_BUILD_DIR) \
+	./Configure -openssldir=$(prefix) BSD-generic32 no-asm
+
+build-openssl: $(OPENSSL_BUILD_DIR)/Makefile
+	cd $(OPENSSL_BUILD_DIR) &&  host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
+	&& make CC="$$CC" build_libs \
+	&& cp -r include  $(prefix)/ \
+	&& cp lib*.a  $(prefix)/lib 
+
+clean-openssl:
+	cd  $(OPENSSL_BUILD_DIR)  && make clean
+
+veryclean-openssl:
+	rm -rf $(OPENSSL_BUILD_DIR)
+

From f8c29683f459e210a34ac5fc2ee5c63eb0a2e222 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 18 Mar 2011 20:24:08 +0100
Subject: [PATCH 2/3] add openssl patch

---
 submodules/build/openssl.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 submodules/build/openssl.patch

diff --git a/submodules/build/openssl.patch b/submodules/build/openssl.patch
new file mode 100644
index 000000000..d4013d0e4
--- /dev/null
+++ b/submodules/build/openssl.patch
@@ -0,0 +1,11 @@
+--- crypto/ui/ui_openssl.c.ori	2011-03-18 18:09:26.000000000 +0100
++++ crypto/ui/ui_openssl.c	2011-03-18 18:09:44.000000000 +0100
+@@ -404,7 +404,7 @@
+ 	return 1;
+ 	}
+ 
+-static volatile sig_atomic_t intr_signal;
++static volatile int intr_signal;
+ #endif
+ 
+ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)

From 661853b70a222238446846b15b76a15a201eeef3 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 18 Mar 2011 20:55:06 +0100
Subject: [PATCH 3/3] fix openssl build

---
 submodules/build/builders.d/openssl.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/submodules/build/builders.d/openssl.mk b/submodules/build/builders.d/openssl.mk
index 101ee8be9..d7c76cfc7 100644
--- a/submodules/build/builders.d/openssl.mk
+++ b/submodules/build/builders.d/openssl.mk
@@ -18,11 +18,12 @@ $(OPENSSL_BUILD_DIR)/Configure:
 
 $(OPENSSL_BUILD_DIR)/Makefile: $(OPENSSL_BUILD_DIR)/Configure
 	cd $(OPENSSL_BUILD_DIR) \
-	./Configure -openssldir=$(prefix) BSD-generic32 no-asm
+	&&  host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
+	&& ./Configure -openssldir=$(prefix) --cross-compile-prefix=$$SDK_BIN_PATH/ BSD-generic32 no-asm
 
 build-openssl: $(OPENSSL_BUILD_DIR)/Makefile
 	cd $(OPENSSL_BUILD_DIR) &&  host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
-	&& make CC="$$CC" build_libs \
+	&& make CC="$$CC" build_crypto build_ssl \
 	&& cp -r include  $(prefix)/ \
 	&& cp lib*.a  $(prefix)/lib