diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-02-10 21:32:10 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-02-10 21:32:10 +0000 |
| commit | 62117906f225cc10689c4e85ebfcbaeb8cf6a57e (patch) | |
| tree | 9f91d40508a4ae96a2d4f8c51194d8c79080d7d2 /openwrt | |
| parent | b1643e98d30b8390b272c3142bc3d4c34822821e (diff) | |
openvpn without ssl closes #277/#278
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3217 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
| -rw-r--r-- | openwrt/package/Makefile | 2 | ||||
| -rw-r--r-- | openwrt/package/openvpn/Config.in | 10 | ||||
| -rw-r--r-- | openwrt/package/openvpn/Makefile | 10 |
3 files changed, 19 insertions, 3 deletions
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 0a2731b72..927ad57bb 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -411,7 +411,9 @@ ifneq ($(BR2_PACKAGE_MPD_FLAC),) mpd-compile: flac-compile endif +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) openvpn-compile: openssl-compile +endif ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) openvpn-compile: liblzo-compile endif diff --git a/openwrt/package/openvpn/Config.in b/openwrt/package/openvpn/Config.in index 6117a8e99..860a39f03 100644 --- a/openwrt/package/openvpn/Config.in +++ b/openwrt/package/openvpn/Config.in @@ -5,13 +5,12 @@ config BR2_PACKAGE_OPENVPN tristate default m if CONFIG_DEVEL select BR2_PACKAGE_KMOD_TUN - select BR2_PACKAGE_LIBOPENSSL help Open Source VPN solution using SSL http://openvpn.net/ - Depends: kmod-tun, libpthread, openssl + Depends: kmod-tun, libpthread config BR2_COMPILE_OPENVPN_WITH_SERVER prompt "Enable server support" @@ -25,6 +24,13 @@ config BR2_COMPILE_OPENVPN_WITH_HTTP default y depends BR2_PACKAGE_OPENVPN +config BR2_COMPILE_OPENVPN_WITH_OPENSSL + prompt "Enable openssl support" + bool + default y + depends BR2_PACKAGE_OPENVPN + select BR2_PACKAGE_LIBOPENSSL + config BR2_COMPILE_OPENVPN_WITH_LZO prompt "Enable transparent compression (lzo)" bool diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile index a34bf4436..e5e127584 100644 --- a/openwrt/package/openvpn/Makefile +++ b/openwrt/package/openvpn/Makefile @@ -18,7 +18,14 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -PKG_DEPEND:="libopenssl, kmod-tun" +PKG_DEPEND:="kmod-tun" + +ifneq ($(BR2_COMPILE_OPENVPN_WITH_OPENSSL),y) +DISABLE_OPENSSL:=--disable-ssl --disable-crypto +else +PKG_DEPEND+=", libopenssl" +endif + ifneq ($(BR2_COMPILE_OPENVPN_WITH_LZO),y) DISABLE_LZO:=--disable-lzo else @@ -66,6 +73,7 @@ $(PKG_BUILD_DIR)/.configured: --disable-management \ --disable-socks \ $(DISABLE_LZO) \ + $(DISABLE_OPENSSL) \ $(DISABLE_SERVER) \ $(DISABLE_HTTP) \ ); |