[package] update tinc to 1.0.10 (#6045)

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

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index a5105a0d24e9f6d4f2cb44b4fe64bd1c39979e4e..49dd89f950e7be773fdf33e9cfb9e78d0fd54192 100644 (file)
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,53 +1,55 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.10
 PKG_RELEASE:=1
-PKG_MD5SUM:=63887373dd763f8d90cecc5a3616c363
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages \
        http://ftp.yi.se/pub/tinc/ \
        http://www.mirrors.wiretapped.net/security/network-security/tinc/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=da69d4f4c9a1b1ee44fd14a52a049141
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tinc
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+liblzo +libopenssl +zlib
+  DEPENDS:=+liblzo +libopenssl +kmod-tun
   TITLE:=VPN tunneling daemon
-  DESCRIPTION:=A VPN tunneling daemon
   URL:=http://www.tinc-vpn.org/
+  SUBMENU:=VPN
+endef
+
+define Package/tinc/description
+  tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
+  encryption to create a secure private network between hosts on the Internet.
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--with-kernel=$(LINUX_DIR) \
-                 --with-zlib=$(STAGING_DIR)/usr/)
+       $(call Build/Configure/Default, \
+               --with-kernel="$(LINUX_DIR)" \
+               --with-zlib="$(STAGING_DIR)/usr" \
+               --with-lzo-include="$(STAGING_DIR)/usr/include/lzo" \
+       )
 endef
 
 define Build/Compile
-$(call Build/Compile/Default,CC="$(TARGET_CC)" \
-               CFLAGS="$(TARGET_CFLAGS)" \
+       $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install)
+               all install
 endef
 
-define Package/tinc/install    
-       install -m0755 -d $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/
+define Package/tinc/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,tinc))