mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
strongswan: update to 3.5.3dr7.
This commit is contained in:
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
include Config
|
include Config
|
||||||
|
|
||||||
VER = 4.5.2
|
VER = 4.5.3dr7
|
||||||
|
|
||||||
THISAPP = strongswan-$(VER)
|
THISAPP = strongswan-$(VER)
|
||||||
DL_FILE = $(THISAPP).tar.bz2
|
DL_FILE = $(THISAPP).tar.bz2
|
||||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
|||||||
|
|
||||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||||
|
|
||||||
$(DL_FILE)_MD5 = ac33b8f849a274127f84df0838cae953
|
$(DL_FILE)_MD5 = 72036d309e254c0b3cad8e5473d68218
|
||||||
|
|
||||||
install : $(TARGET)
|
install : $(TARGET)
|
||||||
|
|
||||||
@@ -72,7 +72,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
|||||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
@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.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" \
|
cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \
|
||||||
--enable-cisco-quirks \
|
--enable-cisco-quirks \
|
||||||
|
|||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user