X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fopenvpn%2FMakefile;h=9b4e12685a2992046e182db2689988d7dd4a2fb2;hb=448fd4d1e3a1c5e356633d9447e1c3dc6dea011c;hp=c55efe1b34766861c714107f0fc540362841ffea;hpb=b21cc7e2363a601b1738f8af2100d8ae81e8d1a2;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index c55efe1b34..9b4e12685a 100644
--- 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
 
@@ -57,7 +61,11 @@ endef
 
 define Package/openvpn/install	
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(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