X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fopenvpn%2FMakefile;h=19a1c5e156ddeff19add4d4773c15a707c8f0f9d;hb=32226f18ab9e76eb0d20c4e2e85bb6794b8f3603;hp=468f77d8f4dc20e3874803ebff01205976085aed;hpb=df1d9706f4e8dc21c18dd210c16cef8620ca7efe;p=openwrt.git

diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 468f77d8f4..19a1c5e156 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -3,17 +3,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
-PKG_VERSION:=2.0_rc16
+PKG_VERSION:=2.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=296a4ca736405525a8de4cd46fef4af5
+PKG_MD5SUM:=7401faebc6baee9add32608709c54eec
 
-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