X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstrongswan;h=e6be0c235e8598c8337ca8b177fdea83e2d6db71;hb=1d12008db5c86f06c70600ea2ac9cc0721af6d9b;hp=d0d533d11da7e1642c5ac1eb502d7ea13cce5f3f;hpb=5fc15be081a86a83356cd1ba97f22361468b5e5f;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/strongswan b/lfs/strongswan
index d0d533d11..e6be0c235 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.6.4
+VER        = 5.0.1
 
 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 = 4c0999c42faa0860ae0afc4f8efd9d04
+$(DL_FILE)_MD5 = 58fdeb49f133139a58f4d8adafc69a16
 
 install : $(TARGET)
 
@@ -73,18 +79,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
 
-	# Customize the welcome banner.
-	sed -i $(DIR_APP)/src/pluto/modecfg.c \
-		-e 's/^#define.*DEFAULT_UNITY_BANNER.*/#define DEFAULT_UNITY_BANNER "Welcome to IPFire - An Open Source Firewall Solution.\\n"/'
-
-	cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \
-					--enable-cisco-quirks \
-					--enable-curl \
-					--enable-nat-transport
+	cd $(DIR_APP) && ./configure \
+		--prefix="/usr" \
+		--sysconfdir="/etc" \
+		--enable-curl \
+		--enable-openssl \
+		$(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