openvpn without ssl closes #277/#278

SVN-Revision: 3217
This commit is contained in:
Waldemar Brodkorb 2006-02-10 21:32:10 +00:00
parent e7871ca996
commit 5b23523695
3 changed files with 19 additions and 3 deletions

View file

@ -411,7 +411,9 @@ ifneq ($(BR2_PACKAGE_MPD_FLAC),)
mpd-compile: flac-compile mpd-compile: flac-compile
endif endif
ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
openvpn-compile: openssl-compile openvpn-compile: openssl-compile
endif
ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
openvpn-compile: liblzo-compile openvpn-compile: liblzo-compile
endif endif

View file

@ -5,13 +5,12 @@ config BR2_PACKAGE_OPENVPN
tristate tristate
default m if CONFIG_DEVEL default m if CONFIG_DEVEL
select BR2_PACKAGE_KMOD_TUN select BR2_PACKAGE_KMOD_TUN
select BR2_PACKAGE_LIBOPENSSL
help help
Open Source VPN solution using SSL Open Source VPN solution using SSL
http://openvpn.net/ http://openvpn.net/
Depends: kmod-tun, libpthread, openssl Depends: kmod-tun, libpthread
config BR2_COMPILE_OPENVPN_WITH_SERVER config BR2_COMPILE_OPENVPN_WITH_SERVER
prompt "Enable server support" prompt "Enable server support"
@ -25,6 +24,13 @@ config BR2_COMPILE_OPENVPN_WITH_HTTP
default y default y
depends BR2_PACKAGE_OPENVPN 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 config BR2_COMPILE_OPENVPN_WITH_LZO
prompt "Enable transparent compression (lzo)" prompt "Enable transparent compression (lzo)"
bool bool

View file

@ -18,7 +18,14 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(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) ifneq ($(BR2_COMPILE_OPENVPN_WITH_LZO),y)
DISABLE_LZO:=--disable-lzo DISABLE_LZO:=--disable-lzo
else else
@ -66,6 +73,7 @@ $(PKG_BUILD_DIR)/.configured:
--disable-management \ --disable-management \
--disable-socks \ --disable-socks \
$(DISABLE_LZO) \ $(DISABLE_LZO) \
$(DISABLE_OPENSSL) \
$(DISABLE_SERVER) \ $(DISABLE_SERVER) \
$(DISABLE_HTTP) \ $(DISABLE_HTTP) \
); );