diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-11 00:06:42 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-11 00:06:42 +0000 |
| commit | 0fce691070b9511a6f6d4f0d67baba7c6c67e2f4 (patch) | |
| tree | e40419c8142810a96e888b649b6671125796cc25 | |
| parent | 8ae4568d06ebe336c6a21f85865d448dfbd8476a (diff) | |
fix openswan -- do NOT strip the kernel modules
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@619 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/package/openswan/Makefile | 4 | ||||
| -rw-r--r-- | openwrt/package/openswan/patches/scripts.patch | 50 |
2 files changed, 52 insertions, 2 deletions
diff --git a/openwrt/package/openswan/Makefile b/openwrt/package/openswan/Makefile index 8214e74c6b..db351f886b 100644 --- a/openwrt/package/openswan/Makefile +++ b/openwrt/package/openswan/Makefile @@ -63,8 +63,8 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) ln -sf ../rc.d/init.d/ipsec $(PKG_IPK_DIR)/etc/init.d/S60ipsec mkdir -p $(PKG_IPK_DIR)/lib/modules/$(LINUX_VERSION) cp $(PKG_BUILD_DIR)/modobj/ipsec.o $(PKG_IPK_DIR)/lib/modules/$(LINUX_VERSION)/ - $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note \ - $(PKG_IPK_DIR)/lib/modules/$(LINUX_VERSION)/ipsec.o +# $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note \ +# $(PKG_IPK_DIR)/lib/modules/$(LINUX_VERSION)/ipsec.o mkdir -p $(PACKAGE_DIR) find $(PKG_BUILD_DIR) -name \*.old | xargs rm -rf $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) diff --git a/openwrt/package/openswan/patches/scripts.patch b/openwrt/package/openswan/patches/scripts.patch index 2ac2b57c85..f788f78e9d 100644 --- a/openwrt/package/openswan/patches/scripts.patch +++ b/openwrt/package/openswan/patches/scripts.patch @@ -157,3 +157,53 @@ diff -uNr openswan-2.3.0.orig/programs/_realsetup/_realsetup.in openswan-2.3.0/p then echo Cannot write to directory to create \"$stderrlog\". exit 1 +diff -urN openswan-2.3.1.old/programs/_startklips/_startklips.in openswan-2.3.1/programs/_startklips/_startklips.in +--- openswan-2.3.1.old/programs/_startklips/_startklips.in 2005-04-10 23:57:51.000000000 +0200 ++++ openswan-2.3.1/programs/_startklips/_startklips.in 2005-04-11 00:00:36.000000000 +0200 +@@ -262,15 +262,15 @@ + echo "FATAL ERROR: Both KLIPS and NETKEY IPsec code is present in kernel" + exit + fi +-if test ! -f $ipsecversion && test ! -f $netkey && modprobe -qn ipsec ++if test ! -f $ipsecversion && test ! -f $netkey && insmod ipsec + then + # statically compiled KLIPS/NETKEY not found; try to load the module +- modprobe ipsec ++ insmod ipsec + fi + + if test ! -f $ipsecversion && test ! -f $netkey + then +- modprobe -v af_key ++ insmod -v af_key + fi + + if test -f $netkey +@@ -278,18 +278,18 @@ + klips=false + if test -f $modules + then +- modprobe -qv ah4 +- modprobe -qv esp4 +- modprobe -qv ipcomp ++ insmod -qv ah4 ++ insmod -qv esp4 ++ insmod -qv ipcomp + # xfrm4_tunnel is needed by ipip and ipcomp +- modprobe -qv xfrm4_tunnel ++ insmod -qv xfrm4_tunnel + # xfrm_user contains netlink support for IPsec +- modprobe -qv xfrm_user ++ insmod -qv xfrm_user + # load the most common ciphers/algo's +- modprobe -qv sha1 +- modprobe -qv md5 +- modprobe -qv des +- modprobe -qv aes ++ insmod -qv sha1 ++ insmod -qv md5 ++ insmod -qv des ++ insmod -qv aes + fi + fi + |