X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstrongswan;h=553120c14cea53a994396e28c10c6d743c9e2ce8;hb=a3b3340bcca61cd0d0c5bc0d2e094c91c8226e79;hp=fdd88969e4be5b7a50f57df49fd78c94b5276709;hpb=9733068234c1e424b3da33c4f37f95fc0590b396;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/strongswan b/lfs/strongswan
index fdd88969e..553120c14 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.6.1
+VER        = 5.0.3rc1
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,6 +32,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE)" "i586"
+	PADLOCK = --enable-padlock
+else
+	PADLOCK = --disable-padlock
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 85a28a12ed6f286a5bc9117e3a9386bb
+$(DL_FILE)_MD5 = e643b1492509b90fb4bcf3cf40326cc1
 
 install : $(TARGET)
 
@@ -73,13 +79,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
 
-	cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \
-					--enable-cisco-quirks \
-					--enable-curl
+	cd $(DIR_APP) && ./configure \
+		--prefix="/usr" \
+		--sysconfdir="/etc" \
+		--enable-curl \
+		--enable-openssl \
+		--enable-eap-radius \
+		$(PADLOCK)
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
+	# 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