From 74c7a81c07085002a6fef6952c7e81862b4dfb50 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 27 Apr 2012 17:12:25 +0200
Subject: [PATCH] fix crash at startup because of missing srtp_shutdown

---
 submodules/build/builders.d/srtp.mk | 4 +++-
 submodules/externals/srtp           | 2 +-
 submodules/linphone                 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/submodules/build/builders.d/srtp.mk b/submodules/build/builders.d/srtp.mk
index 97534a732..536c46669 100644
--- a/submodules/build/builders.d/srtp.mk
+++ b/submodules/build/builders.d/srtp.mk
@@ -3,6 +3,7 @@ srtp_dir?=externals/srtp
 $(BUILDER_SRC_DIR)/$(srtp_dir)/configure: 
 	cd $(BUILDER_SRC_DIR)/$(srtp_dir) \
 	&& autoconf
+
 $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/configure
 	mkdir -p $(BUILDER_BUILD_DIR)/$(srtp_dir)
 	cd $(BUILDER_BUILD_DIR)/$(srtp_dir)/\
@@ -10,7 +11,8 @@ $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/config
 	$(BUILDER_SRC_DIR)/$(srtp_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
 
 build-srtp: $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile
-	cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a && make uninstall && make install
+	host_alias=$(host) && . /$(BUILDER_SRC_DIR)/build/$(config_site) && \
+	cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a AR=$$AR && make install
 
 clean-srtp:
 	-cd $(BUILDER_BUILD_DIR)/$(srtp_dir)  && make clean
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index daa25fdba..c01a03a47 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit daa25fdbacb75e2aa99f5fce1bd5836dc616fb42
+Subproject commit c01a03a478d4c97fa7e2af80844f8d60440af0a6
diff --git a/submodules/linphone b/submodules/linphone
index 0e496ed3d..d0ced93c2 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0e496ed3d9f19528b0a2db5050c11030ca6a1312
+Subproject commit d0ced93c25f088c04a9f92b82aa41c5b1f271e23