Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 13 Nov 2013 13:05:15 +0000 (14:05 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 13 Nov 2013 13:05:15 +0000 (14:05 +0100)
Conflicts:
lfs/samba
lfs/strongswan

1  2 
config/rootfiles/common/strongswan
lfs/strongswan

Simple merge
diff --cc 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 \