strongswan: update to 3.5.3dr7.

diff --git a/lfs/strongswan b/lfs/strongswan
index 1d009b8cb453f5391bcadaa88e7c0cb5c6334e33..7f92c19b4003d2c44697a82515bbe6ea52de1377 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.5.2
+VER        = 4.5.3dr7
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ac33b8f849a274127f84df0838cae953
+$(DL_FILE)_MD5 = 72036d309e254c0b3cad8e5473d68218
 
 install : $(TARGET)
 
@@ -72,7 +72,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @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.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 \

diff --git a/src/patches/strongswan-4.5.2-force_kill_charon.patch b/src/patches/strongswan-4.5.2-force_kill_charon.patch
deleted file mode 100644 (file)
index d2f3561..0000000
--- a/src/patches/strongswan-4.5.2-force_kill_charon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur strongswan-4.5.2.org/src/ipsec/ipsec.in strongswan-4.5.2/src/ipsec/ipsec.in
---- strongswan-4.5.2.org/src/ipsec/ipsec.in    2010-12-18 17:19:05.000000000 +0100
-+++ strongswan-4.5.2/src/ipsec/ipsec.in        2011-07-03 11:39:39.501501334 +0200
-@@ -326,7 +326,7 @@
-               if [ -n "$spid" ]
-               then
-                       kill $spid 2>/dev/null
--                      loop=5
-+                      loop=30
-                       while [ $loop -gt 0 ] ; do
-                               kill -0 $spid 2>/dev/null || break
-                               sleep 1
-@@ -335,6 +335,7 @@
-                       if [ $loop -eq 0 ]
-                       then
-                               kill -KILL $spid 2>/dev/null
-+                              killall -KILL charon 2>/dev/null
-                               rm -f $IPSEC_STARTER_PID
-                       fi
-               fi