X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/33e56e2cdd42dd0377efb372001474fc21fa759b..cf747600a967aab6e42721f745993d9b78558cd3:/openwrt/package/openvpn/Makefile?ds=inline

diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index e9a9cf4fa..991e52f9e 100644
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -1,22 +1,29 @@
-#############################################################
-#
-# ebtables
-#
-#############################################################
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
-PKG_VERSION:=2.0_rc16
+PKG_VERSION:=2.0_rc19
 PKG_RELEASE:=1
-PKG_SOURCE_URL:=http://puzzle.dl.sourceforge.net/sourceforge/openvpn
+PKG_MD5SUM:=4b3ea6815d87643a5ebdc811e87b5de3
+
+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):
-	 $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
+	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
 	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -47,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
 
@@ -57,6 +66,7 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/openvpn
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(PKG_IPK_DIR)/usr/sbin
 	cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/
+	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)