upgrade kernel, quagga and openvpn, add licensing info to diag module, fix up jffs2

[openwrt.git] / openwrt / package / openvpn / Makefile

diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index d3ce065..98119a5 100644 (file)
--- 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_rc19
+PKG_VERSION:=2.0_rc21
 PKG_RELEASE:=1
-PKG_MD5SUM:=4b3ea6815d87643a5ebdc811e87b5de3
+PKG_MD5SUM:=949c51cb6c69da7054613d80042dc5a6
 
-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