Explicitely disable the use of epoll (#3703)

[openwrt/svn-archive/archive.git] / net / openvpn / Makefile

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 05cedaf9c73d312aa3e2342bc1fde2ecc38b2011..9b4e12685a2992046e182db2689988d7dd4a2fb2 100644 (file)
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -10,12 +10,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 PKG_VERSION:=2.0.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_MD5SUM:=60745008b90b7dbe25fe8337c550fec6
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -27,9 +26,12 @@ define Package/openvpn
   CATEGORY:=Network
   DEPENDS:=+kmod-tun +libopenssl +liblzo
   TITLE:=Open source VPN solution using SSL
-  DESCRIPTION:=\
-        Open source VPN solution using SSL
   URL:=http://openvpn.net
+  SUBMENU:=VPN
+endef
+
+define Package/openvpn/description
+        Open source VPN solution using SSL
 endef
 
 define Package/openvpn-easy-rsa
@@ -46,6 +48,8 @@ define Build/Configure
                --enable-management \
                --disable-socks \
                --enable-password-save \
+               ,\
+               ac_cv_func_epoll_create=no \
        )
 endef
 
@@ -56,14 +60,18 @@ define Build/Compile
 endef
 
 define Package/openvpn/install 
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/init.d/
+       $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
+       $(INSTALL_DIR) $(1)/etc/default
+       $(INSTALL_BIN) files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME)
 endef
 
 define Package/openvpn-easy-rsa/install        
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req} $(1)/usr/sbin/
-       install -d -m0755 $(1)/etc/easy-rsa
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/easy-rsa
        install -m 0644 $(PKG_BUILD_DIR)/easy-rsa/2.0/openssl.cnf $(1)/etc/easy-rsa/openssl.cnf
        install -m 0644 $(PKG_BUILD_DIR)/easy-rsa/2.0/vars $(1)/etc/easy-rsa/vars
 endef