From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 13 Nov 2013 13:05:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next' into fifteen
X-Git-Tag: v2.15-beta1~150^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0d3fe9d266c265697250dabba0bfdac316314ff;p=ipfire-2.x.git

Merge remote-tracking branch 'origin/next' into fifteen

Conflicts:
	lfs/samba
	lfs/strongswan
---

d0d3fe9d266c265697250dabba0bfdac316314ff
diff --cc lfs/strongswan
index f573cd8510,c7abf7a4d3..948db5b1df
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@@ -76,7 -80,9 +80,8 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 -
 -	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
 +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
+ 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.1-delay-dpd.patch
  
  	cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
  	cd $(DIR_APP) && ./configure \