X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fstrongswan;h=9ac2e68c7e74163b4af2fe6bf4df8ebd70c6642e;hp=44497d480e34386b0283f6cef6bc37f0546fb0f5;hb=dc33c23b1fa602ab80e7b0b4422ca2019caa24fc;hpb=619f637be745adc17928e8ec03972f92a1d58a03

diff --git a/lfs/strongswan b/lfs/strongswan
index 44497d480..9ac2e68c7 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,14 +24,20 @@
 
 include Config
 
-VER        = 4.6.3
+VER        = 5.1.0
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/strongswan-$(VER)
 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 = 34146e514ced1738b4f2d9e7169bbb52
+$(DL_FILE)_MD5 = c1cd0a3ba9960f590cae28c8470800e8
 
 install : $(TARGET)
 
@@ -69,22 +75,30 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
-	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) && make $(MAKETUNING)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
+
+	cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
+	cd $(DIR_APP) && ./configure \
+		--prefix="/usr" \
+		--sysconfdir="/etc" \
+		--enable-curl \
+		--enable-openssl \
+		--enable-xauth-eap \
+		--enable-eap-radius \
+		--enable-eap-tls \
+		--enable-eap-ttls \
+		--enable-eap-peap \
+		--enable-eap-mschapv2 \
+		--enable-eap-identity \
+		$(PADLOCK)
+
+	cd $(DIR_APP) && make $(MAKETUNING) LDFLAGS="-lrt"
 	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
@@ -96,5 +110,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
 	ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
 
-	#@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)