X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ec8fa5540e88f076526bfaa388c8a4d406e37bff..7443b76f81187871961b0995b60053b3b1e727f1:/openwrt/package/openvpn/Makefile?ds=sidebyside

diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index 468f77d8f..07b0c6395 100644
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -3,17 +3,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
-PKG_VERSION:=2.0_rc16
+PKG_VERSION:=2.0_rc20
 PKG_RELEASE:=1
-PKG_MD5SUM:=296a4ca736405525a8de4cd46fef4af5
+PKG_MD5SUM:=9fd263078c0c18448f7d5a0e0a919f62
 
-PKG_SOURCE_URL:=@SF/openvpn
+PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
+ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+DISABLE_LZO:=--disable-lzo
+endif
+
+ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y)
+DISABLE_SERVER:=--disable-server
+endif
+
 $(DL_DIR)/$(PKG_SOURCE):
 	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
@@ -46,6 +54,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
 		--disable-management \
 		--disable-socks \
 		--disable-http \
+		$(DISABLE_LZO) \
+		$(DISABLE_SERVER) \
 	);
 	touch $(PKG_BUILD_DIR)/.configured