strongswan: force killing charon at ipsec stop if it not react to term.

[people/pmueller/ipfire-2.x.git] / lfs / strongswan

diff --git a/lfs/strongswan b/lfs/strongswan
index 29290f9b9fa598ed8170b457781e09fe0e700b31..1d009b8cb453f5391bcadaa88e7c0cb5c6334e33 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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,13 +24,7 @@
 
 include Config
 
-ifeq "$(XEN)" "1"
-       VERSUFIX=ipfire-xen
-else
-       VERSUFIX=ipfire
-endif
-
-VER        = 4.3.6
+VER        = 4.5.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e071f46b6c463ce76900758734e6143e
+$(DL_FILE)_MD5 = ac33b8f849a274127f84df0838cae953
 
 install : $(TARGET)
 
@@ -77,9 +71,13 @@ $(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.3.6_ipfire.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.4.0_ipfire.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.2-force_kill_charon.patch
+
+       cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \
+                                       --enable-cisco-quirks \
+                                       --enable-curl
 
-       cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc"
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install