X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstrongswan;h=58f8c5e9b2f9e4f43254cb365e9d5352f3c8dd48;hb=2f6c9d93a3242fd648383c191ccb8d02271e89f7;hp=566f1afd1f462531288dfc823f72bec8f28de39a;hpb=74e5c32e19b3752e64c83a4762c7dacfee532bb6;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/strongswan b/lfs/strongswan
index 566f1afd1f..58f8c5e9b2 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.4
+VER        = 5.6.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,14 +32,6 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/strongswan-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE)" "i586"
-	CONFIGURE_OPTIONS = \
-		--enable-padlock
-else
-	CONFIGURE_OPTIONS = \
-		--disable-padlock
-endif
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 655a632a515c74a99f2e9cc337ab2f33
+$(DL_FILE)_MD5 = 46aa3aa18fbc4bd528f9a0345ce79913
 
 install : $(TARGET)
 
@@ -78,6 +70,7 @@ $(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-disable-ipv6.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
 
 	cd $(DIR_APP) && ./configure \
@@ -99,6 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-eap-peap \
 		--enable-eap-mschapv2 \
 		--enable-eap-identity \
+		--disable-padlock \
 		--disable-chapoly \
 		$(CONFIGURE_OPTIONS)
 
@@ -108,8 +102,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Remove all library files we don't want or need.
 	rm -vf /usr/lib/ipsec/plugins/*.{,l}a
 
-	-rm -rfv /etc/rc*.d/*ipsec
-	cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
 	rm -f /etc/ipsec.conf /etc/ipsec.secrets
 	ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
 	ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets