X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a3b666f293a5a81bb8958e295fd3e0572718f102..4f97135f4c983d7a718e22e37371a79820afcd8b:/package/openvpn/Makefile

diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 79d1c6e8e..037cb0d73 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
-PKG_VERSION:=2.0
+PKG_VERSION:=2.0.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=7401faebc6baee9add32608709c54eec
+PKG_MD5SUM:=4bd7a42991c93db23842a0992debe53b
 
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -18,18 +18,21 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-PKG_DEPEND:="openssl, kmod-tun"
-ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+PKG_DEPEND:="libopenssl, kmod-tun"
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_LZO),y)
 DISABLE_LZO:=--disable-lzo
 else
-PKG_DEPEND+=", lzo"
+PKG_DEPEND+=", liblzo"
 endif
 
-ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y)
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_SERVER),y)
 DISABLE_SERVER:=--disable-server
 endif
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_HTTP),y)
+DISABLE_HTTP:=--disable-http
+endif
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(strip $(TARGET_CFLAGS))" \
@@ -62,13 +65,13 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --disable-plugins \
 		  --disable-management \
 		  --disable-socks \
-		  --disable-http \
 		  $(DISABLE_LZO) \
 		  $(DISABLE_SERVER) \
+		  $(DISABLE_HTTP) \
 	);
 	touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \