summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-27 23:26:20 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-27 23:26:20 +0200
commit1b8fff1f57e80538623d46bba5ea2577b9c0f406 (patch)
tree47951165731114775e2ef87f8459bdebbc3c8766
parentf03f1d5071caf61c33815b732cef46952324ce6e (diff)
test and fix openswan package.
enable needed kernel modules, disable removing of any kernel modules on restart.
-rw-r--r--mk/modules.mk2
-rw-r--r--package/cpufrequtils/Makefile1
-rw-r--r--package/openswan/Makefile14
-rw-r--r--package/openswan/patches/patch-programs__realsetup__realsetup_in26
-rw-r--r--target/linux/config/Config.in.crypto6
5 files changed, 44 insertions, 5 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 5744b2109..4dba589a2 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -747,7 +747,7 @@ $(eval $(call KMOD_template,DM_SNAPSHOT,dm-snapshot,\
$(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-dev-geode,\
$(MODULES_DIR)/kernel/drivers/crypto/geode-aes \
-,10))
+,20))
$(eval $(call KMOD_template,CRYPTO_ALGAPI,crypto-algapi,\
$(MODULES_DIR)/kernel/crypto/crypto_algapi \
diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile
index 3eb5b937d..3e8af5585 100644
--- a/package/cpufrequtils/Makefile
+++ b/package/cpufrequtils/Makefile
@@ -11,7 +11,6 @@ PKG_DESCR:= utilities for the Linux kernel cpufreq subsystem
PKG_SECTION:= utils
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/
-PKG_NO_PARALLEL:= 1
include $(TOPDIR)/mk/package.mk
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 4406fe3e2..3e261e521 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -5,11 +5,16 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= openswan
PKG_VERSION:= 2.6.27
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 5177b7401bb89e84ca1c89029143441e
-PKG_DESCR:= IPSec software
+PKG_DESCR:= IPsec software
PKG_SECTION:= net/security
-PKG_DEPENDS:= ip libgmp
+PKG_DEPENDS:= ip libgmp libpthread kmod-net-key kmod-xfrm-user
+PKG_DEPENDS+= kmod-inet-ah kmod-inet-esp
+PKG_DEPENDS+= kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport
+PKG_DEPENDS+= kmod-crypto-sha1 kmod-crypto-md5
+PKG_DEPENDS+= kmod-crypto-null kmod-crypto-des kmod-crypto-aes
+PKG_DEPENDS+= kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc
PKG_BUILDDEP+= gmp
PKG_URL:= http://www.openswan.org/
PKG_SITES:= http://www.openswan.org/download/
@@ -39,6 +44,9 @@ post-install:
${CP} ${WRKINST}/etc/ipsec.d/* ${IDIR_OPENSWAN}/etc/ipsec.d
${CP} ${WRKINST}/usr/lib/ipsec/* ${IDIR_OPENSWAN}/usr/lib/ipsec
${CP} ${WRKINST}/usr/libexec/ipsec/* ${IDIR_OPENSWAN}/usr/libexec/ipsec
+ rm ${IDIR_OPENSWAN}/usr/libexec/ipsec/setup
+ ${INSTALL_BIN} ${WRKINST}/etc/rc.d/init.d/ipsec \
+ ${IDIR_OPENSWAN}/usr/libexec/ipsec/setup
${INSTALL_BIN} ${WRKINST}/usr/sbin/ipsec ${IDIR_OPENSWAN}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openswan/patches/patch-programs__realsetup__realsetup_in b/package/openswan/patches/patch-programs__realsetup__realsetup_in
new file mode 100644
index 000000000..7d4db9881
--- /dev/null
+++ b/package/openswan/patches/patch-programs__realsetup__realsetup_in
@@ -0,0 +1,26 @@
+--- 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
+
+ # 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
+- 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
++ # do
++ # lsmod 2>&1 | grep "^$mod" > /dev/null && rmmod $mod
++ # done
++ #fi
+
+ perform test -d $subsysdir "&&" rm -f $subsyslock
+
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 7ce887915..b23d22122 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -47,7 +47,12 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE
tristate
select ADK_KERNEL_CRYPTO_HW
select ADK_KERNEL_CRYPTO
+ select ADK_KPACKAGE_KMOD_CRYPTO_ECB
+ select ADK_KPACKAGE_KMOD_CRYPTO_CBC
depends on ADK_LINUX_ALIX
+ default y if (ADK_LINUX_ALIX && ADK_PACKAGE_OPENSWAN)
+ default y if (ADK_LINUX_ALIX && ADK_PACKAGE_STRONGSWAN)
+ default n
help
Say 'Y' here to use the AMD Geode LX processor on-board AES
engine for the CryptoAPI AES algorithm.
@@ -60,6 +65,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
select ADK_KPACKAGE_KMOD_CRYPTO_DES
+ default n
help
This option allows you to have support for HIFN 795x crypto adapters.