X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fiodine%2FMakefile;h=747189ab12c40dbcb72aff5d55b6ef4b78a0e377;hb=43bcadbf595da801804a224afc13bbf328849202;hp=46f33cfd76038be226ad2cafebadf3f5e8881063;hpb=560d66b59f4d7c6259eff2630f71f30054a1cac3;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index 46f33cfd76..747189ab12 100644
--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@@ -9,13 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iodine
-PKG_VERSION:=0.3.4
+PKG_VERSION:=0.4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://code.kryo.se/iodine/
-PKG_MD5SUM:=dfbc5037fe0229e15f6f15775117aef5
-PKG_CAT:=zcat
+PKG_MD5SUM:=58d82bca11a41a01d0ddfa7d105e6a48
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -28,20 +27,24 @@ define Package/iodine/Default
   DEPENDS:=+zlib
   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
@@ -51,18 +54,22 @@ define Build/Compile
 	$(call Build/Compile/Default,\
 		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -c -DLINUX" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -lz" \
-		iodine iodined \
+		all \
 	)
 endef
 
 define Package/iodine/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iodine $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodine $(1)/usr/sbin
 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)/iodined $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodined $(1)/usr/sbin
 endef
 
 $(eval $(call BuildPackage,iodine))