utils/psmisc: fix peekfd issue on mips/big-endian targets, included upstream patch...

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

diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index e37c8a6e0991d929439f2d91da651f1a333e3c25..7e97dfea75b38a789cfb701ff4e6c5f6aa1f5ae4 100644 (file)
--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@@ -1,47 +1,46 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 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:=iodine
-PKG_VERSION:=0.4.0
+PKG_VERSION:=0.5.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://code.kryo.se/iodine/
-PKG_MD5SUM:=82d331f75a99d1547e0ccc3c3efd0a7a
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=6952343cc4614857f83dbb81247871e7
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iodine/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+zlib
+  DEPENDS:=+zlib +kmod-tun
   TITLE:=IP over DNS tunneling
   URL:=http://code.kryo.se/iodine/
-  DESCRIPTION:=\
-       iodine
 endef
 
 define Package/iodine
   $(call Package/iodine/Default)
   TITLE+= client version
-  DESCRIPTION+= client version
+endef
+
+define Package/iodine/description
+ iodine client version
 endef
 
 define Package/iodined
   $(call Package/iodine/Default)
   TITLE+= server version
-  DESCRIPTION+= server version
+endef
+
+define Package/iodined/description
+ iodine server version
 endef
 
 define Build/Configure
@@ -49,8 +48,8 @@ endef
 
 define Build/Compile
        $(call Build/Compile/Default,\
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -c -DLINUX" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -lz" \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DLINUX" \
+               LDFLAGS="$(TARGET_LDFLAGS) -lz" \
                all \
        )
 endef
@@ -61,6 +60,10 @@ define Package/iodine/install
 endef
 
 define Package/iodined/install
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/iodined.init $(1)/etc/init.d/iodined
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/iodined.config $(1)/etc/config/iodined
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodined $(1)/usr/sbin
 endef