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

Conflicts:
	lfs/samba
	lfs/strongswan

diff --cc config/rootfiles/common/strongswan
Simple merge

diff --cc lfs/strongswan
index f573cd851041cc28a5ff7be8eba70c084ef77de5,c7abf7a4d3837d3c4fbc48fa418399fe74eeb928..948db5b1dfee681a5caa5bf9e28d6e9dd9729ae0
--- 1/lfs/strongswan
--- 2/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 \