merge tunnel branch into main branch so that source code is exactly the same in the two branches.

The only difference is the presence of the submodules/tunnel .

.gitmodules

@@ -40,9 +40,6 @@
 [submodule "submodules/externals/srtp"]
 	path = submodules/externals/srtp
 	url = git://git.linphone.org/srtp.git
-[submodule "submodules/tunnel"]
-	path = submodules/tunnel
-	url = gitosis@git.linphone.org:tunnel
 [submodule "submodules/bcg729"]
 	path = submodules/bcg729
 	url = git://git.linphone.org/bcg729.git

Classes/SettingsViewController.m

@@ -687,6 +687,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 		[hiddenKeys addObject:@"wizard_button"];
 	}
 	
+	if (!linphone_core_tunnel_available()){
+		[hiddenKeys addObject:@"tunnel_menu"];
+	}
+	
     return hiddenKeys;
 }
 

submodules/binaries/why.txt

@@ -5,6 +5,7 @@ This directory is here because some of our dependencies compile incorrecly
 
 You'll find here the reasons why certain libs are furnished pre-compiled.
 
+Additionaly, the libdummy.a is an empty library created to stub the tunnel extension.
 
 = Libvpx =
 

submodules/build/Makefile

@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ############################################################################
-enable_gpl_third_parties=no
+enable_gpl_third_parties=yes
 enable_zrtp=yes
 enable_ffmpeg=yes
 enable_opus=yes
@@ -30,6 +30,7 @@ TUNNEL_AVAILABLE=$(shell ls ../tunnel/configure.ac)
 
 ifneq ($(TUNNEL_AVAILABLE),)
 enable_tunnel=yes
+enable_gpl_third_parties=no
 endif
 
 

submodules/build/builder-iphone-os.mk

@@ -313,6 +313,9 @@ multi-arch:
                 	echo "WARNING: archive `basename $$archive` exists in arm tree but does not exists in i386 tree."; \
         	fi \
 	done
+	if ! test -f $(prefix)../apple-darwin/lib/libtunnel.a ; then \
+		cp -f $(BUILDER_SRC_DIR)/../submodules/binaries/libdummy.a $(prefix)/../apple-darwin/lib/libtunnel.a ; \
+	fi
 
 
 delivery-sdk: multi-arch

submodules/tunnel

@@ -1 +0,0 @@
-Subproject commit 6cae0398a9efb9451e79076479b082edac9335cc