diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2011-12-02 20:10:47 +0100 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2011-12-02 20:10:47 +0100 |
commit | a2b4256de007d8d471efe5b21e4d5df574fb6bea (patch) | |
tree | 4f491b640fcfe2da17be2635f0f524e257151aa1 /package/openswan/patches/patch-programs__realsetup__realsetup_in | |
parent | cd770e980b703e8d2875dcffee1441b6c4e63279 (diff) |
update openswan to latest upstream
Diffstat (limited to 'package/openswan/patches/patch-programs__realsetup__realsetup_in')
-rw-r--r-- | package/openswan/patches/patch-programs__realsetup__realsetup_in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/package/openswan/patches/patch-programs__realsetup__realsetup_in b/package/openswan/patches/patch-programs__realsetup__realsetup_in index 7d4db9881..2a1adecc9 100644 --- a/package/openswan/patches/patch-programs__realsetup__realsetup_in +++ b/package/openswan/patches/patch-programs__realsetup__realsetup_in @@ -1,26 +1,27 @@ ---- openswan-2.6.27.orig/programs/_realsetup/_realsetup.in 2010-06-21 17:43:35.000000000 +0200 -+++ openswan-2.6.27/programs/_realsetup/_realsetup.in 2010-07-27 19:27:30.327023350 +0200 -@@ -374,14 +374,15 @@ case "$1" in - rm -f /var/run/pluto.pid +--- openswan-2.6.37.orig/programs/_realsetup/_realsetup.in 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/programs/_realsetup/_realsetup.in 2011-12-01 17:35:27.000000000 +0100 +@@ -395,15 +395,15 @@ case "$1" in + "}" # When we exit we clean up (remove) the modules we are using, even the kame'ish ones - if test -e ${kamepfkey}; then - for mod in ipcomp ipcomp6 xfrm6_tunnel xfrm6_mode_tunnel xfrm6_mode_beet xfrm6_mode_ro \ - xfrm6_mode_transport xfrm4_mode_transport xfrm4_mode_tunnel xfrm_user \ -- xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key +- xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key \ +- xfrm_ipcomp tunnel6 - do - lsmod 2>&1 | grep "^$mod" > /dev/null && rmmod $mod - done - fi -+ # do not touch kernel modules, no reason to unload on embedded systems + #if test -e ${kamepfkey}; then + # for mod in ipcomp ipcomp6 xfrm6_tunnel xfrm6_mode_tunnel xfrm6_mode_beet xfrm6_mode_ro \ + # xfrm6_mode_transport xfrm4_mode_transport xfrm4_mode_tunnel xfrm_user \ -+ # xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key ++ # xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key \ ++ # xfrm_ipcomp tunnel6 + # do + # lsmod 2>&1 | grep "^$mod" > /dev/null && rmmod $mod + # done + #fi - perform test -d $subsysdir "&&" rm -f $subsyslock - + if test -e ${ipsecversion}; then + lsmod 2>&1 | grep "ipsec" > /dev/null && rmmod ipsec |