[packages] openvpn: fix lzo dependency and rename config options

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28120 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
loswillios 2011-08-29 15:31:32 +00:00
parent 564c4815ee
commit 8ea6f5fb55
2 changed files with 29 additions and 29 deletions

View File

@ -1,17 +1,17 @@
menu "Configuration"
depends on PACKAGE_openvpn
config OPENVPN_LZO
config OPENVPN_DISABLE_LZO
bool "Disable LZO compression support"
depends on PACKAGE_openvpn
default n
config OPENVPN_CRYPTO
config OPENVPN_DISABLE_CRYPTO
bool "Disable OpenSSL crypto support"
depends on PACKAGE_openvpn
default n
config OPENVPN_SSL
config OPENVPN_DISABLE_SSL
bool "Disable OpenSSL SSL support for TLS-based key exchange"
depends on PACKAGE_openvpn
default n
@ -21,47 +21,47 @@ config OPENVPN_X509_ALT_USERNAME
depends on PACKAGE_openvpn
default n
config OPENVPN_MULTI
config OPENVPN_DISABLE_MULTI
bool "Disable client/server support (--mode server + client mode)"
depends on PACKAGE_openvpn
default n
config OPENVPN_SERVER
config OPENVPN_DISABLE_SERVER
bool "Disable server support only (but retain client support)"
depends on PACKAGE_openvpn
default n
config OPENVPN_EUREPHIA
config OPENVPN_DISABLE_EUREPHIA
bool "Disable support for the eurephia plug-in"
depends on PACKAGE_openvpn
default y
config OPENVPN_MANAGEMENT
config OPENVPN_DISABLE_MANAGEMENT
bool "Disable management server support"
depends on PACKAGE_openvpn
default y
config OPENVPN_PKCS11
config OPENVPN_DISABLE_PKCS11
bool "Disable pkcs11 support"
depends on PACKAGE_openvpn
default n
config OPENVPN_HTTP
config OPENVPN_DISABLE_HTTP
bool "Disable HTTP proxy support"
depends on PACKAGE_openvpn
default n
config OPENVPN_FRAGMENT
config OPENVPN_DISABLE_FRAGMENT
bool "Disable internal fragmentation support (--fragment)"
depends on PACKAGE_openvpn
default n
config OPENVPN_MULTIHOME
config OPENVPN_DISABLE_MULTIHOME
bool "Disable multi-homed UDP server support (--multihome)"
depends on PACKAGE_openvpn
default n
config OPENVPN_PORT_SHARE
config OPENVPN_DISABLE_PORT_SHARE
bool "Disable TCP server port-share support (--port-share)"
depends on PACKAGE_openvpn
default n
@ -71,12 +71,12 @@ config OPENVPN_ENABLE_PASSWORD_SAVE
depends on PACKAGE_openvpn
default n
config OPENVPN_DEF_AUTH
config OPENVPN_DISABLE_DEF_AUTH
bool "Disable deferred authentication"
depends on PACKAGE_openvpn
default n
config OPENVPN_PF
config OPENVPN_DISABLE_PF
bool "Disable internal packet filter"
depends on PACKAGE_openvpn
default n

View File

@ -24,7 +24,7 @@ define Package/openvpn
SECTION:=net
CATEGORY:=Network
SUBMENU:=VPN
DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo
DEPENDS:=+kmod-tun +libopenssl +!OPENVPN_DISABLE_LZO:liblzo
TITLE:=Open source VPN solution using SSL
URL:=http://openvpn.net
MENU:=1
@ -62,17 +62,17 @@ CONFIGURE_ARGS+= \
--disable-socks \
--enable-small
ifeq ($(CONFIG_OPENVPN_LZO),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_LZO),y)
CONFIGURE_ARGS += \
--disable-lzo
endif
ifeq ($(CONFIG_OPENVPN_CRYPTO),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_CRYPTO),y)
CONFIGURE_ARGS += \
--disable-crypto
endif
ifeq ($(CONFIG_OPENVPN_SSL),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_SSL),y)
CONFIGURE_ARGS += \
--disable-ssl
endif
@ -82,47 +82,47 @@ CONFIGURE_ARGS += \
--enable-x509-alt-username
endif
ifeq ($(CONFIG_OPENVPN_MULTI),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_MULTI),y)
CONFIGURE_ARGS += \
--disable-multi
endif
ifeq ($(CONFIG_OPENVPN_SERVER),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_SERVER),y)
CONFIGURE_ARGS += \
--disable-server
endif
ifeq ($(CONFIG_OPENVPN_EUREPHIA),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_EUREPHIA),y)
CONFIGURE_ARGS += \
--disable-eurephia
endif
ifeq ($(CONFIG_OPENVPN_MANAGEMENT),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_MANAGEMENT),y)
CONFIGURE_ARGS += \
--disable-management
endif
ifeq ($(CONFIG_OPENVPN_PKCS11),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_PKCS11),y)
CONFIGURE_ARGS += \
--disable-pkcs11
endif
ifeq ($(CONFIG_OPENVPN_HTTP),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_HTTP),y)
CONFIGURE_ARGS += \
--disable-http
endif
ifeq ($(CONFIG_OPENVPN_FRAGMENT),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_FRAGMENT),y)
CONFIGURE_ARGS += \
--disable-fragment
endif
ifeq ($(CONFIG_OPENVPN_MULTIHOME),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_MULTIHOME),y)
CONFIGURE_ARGS += \
--disable-multihome
endif
ifeq ($(CONFIG_OPENVPN_PORT_SHARE),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_PORT_SHARE),y)
CONFIGURE_ARGS += \
--disable-port-share
endif
@ -132,12 +132,12 @@ CONFIGURE_ARGS += \
--enable-password-save
endif
ifeq ($(CONFIG_OPENVPN_DEF_AUTH),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_DEF_AUTH),y)
CONFIGURE_ARGS += \
--disable-def-auth
endif
ifeq ($(CONFIG_OPENVPN_PF),y)
ifeq ($(CONFIG_OPENVPN_DISABLE_PF),y)
CONFIGURE_ARGS += \
--disable-pf
endif