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

@@@ -75,6 -75,7 +75,7 @@@ usr/lib/ipsec/plugins/libstrongswan-sha
  usr/lib/ipsec/plugins/libstrongswan-socket-default.so
  usr/lib/ipsec/plugins/libstrongswan-sshkey.so
  usr/lib/ipsec/plugins/libstrongswan-stroke.so
+ usr/lib/ipsec/plugins/libstrongswan-unity.so
  usr/lib/ipsec/plugins/libstrongswan-updown.so
  usr/lib/ipsec/plugins/libstrongswan-x509.so
  usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
@@@ -86,6 -87,7 +87,6 @@@ usr/libexec/ipsec/_updow
  usr/libexec/ipsec/_updown_espmark
  usr/libexec/ipsec/charon
  usr/libexec/ipsec/openac
 -usr/libexec/ipsec/pki
  usr/libexec/ipsec/scepclient
  usr/libexec/ipsec/starter
  usr/libexec/ipsec/stroke
diff --combined lfs/strongswan
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
- VER        = 5.1.1dr4
+ VER        = 5.1.1
  
  THISAPP    = strongswan-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -33,9 -33,13 +33,13 @@@ DIR_APP    = $(DIR_SRC)/strongswan-$(VE
  TARGET     = $(DIR_INFO)/$(THISAPP)
  
  ifeq "$(MACHINE)" "i586"
-       PADLOCK = --enable-padlock
+       CONFIGURE_OPTIONS = \
+               --enable-padlock \
+               --enable-rdrand
  else
-       PADLOCK = --disable-padlock
+       CONFIGURE_OPTIONS = \
+               --disable-padlock \
+               --disable-rdrand
  endif
  
  ###############################################################################
@@@ -46,7 -50,7 +50,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = 05899faa9b8a8f253474af809b283ef9
+ $(DL_FILE)_MD5 = e3af3d493d22286be3cd794533a8966a
  
  install : $(TARGET)
  
@@@ -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 \
                --enable-eap-peap \
                --enable-eap-mschapv2 \
                --enable-eap-identity \
-               $(PADLOCK)
+               --enable-unity \
+               $(CONFIGURE_OPTIONS)
  
-       cd $(DIR_APP) && make $(MAKETUNING) LDFLAGS="-lrt"
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
  
        # Remove all library files we don't want or need.