From f22fc1604354feb5788bdbb1060ef666cafda865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 21 Jul 2014 21:08:33 +0200 Subject: [PATCH 1/3] net/iodine: import from old packages No further changes. --- net/iodine/Makefile | 69 ++++++++++++++++++++++ net/iodine/files/iodined.config | 5 ++ net/iodine/files/iodined.init | 23 ++++++++ net/iodine/patches/010-cross-compile.patch | 22 +++++++ 4 files changed, 119 insertions(+) create mode 100644 net/iodine/Makefile create mode 100644 net/iodine/files/iodined.config create mode 100644 net/iodine/files/iodined.init create mode 100644 net/iodine/patches/010-cross-compile.patch diff --git a/net/iodine/Makefile b/net/iodine/Makefile new file mode 100644 index 000000000..03535b8ad --- /dev/null +++ b/net/iodine/Makefile @@ -0,0 +1,69 @@ +# +# Copyright (C) 2006-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=iodine +PKG_VERSION:=0.6.0-rc1 +PKG_RELEASE:=5 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://code.kryo.se/iodine/ +PKG_MD5SUM:=a15bb4faba020d217016fde6e231074a + +include $(INCLUDE_DIR)/package.mk + +define Package/iodine/Default + SECTION:=net + CATEGORY:=Network + SUBMENU:=Firewall Tunnel + DEPENDS:= +kmod-tun +zlib + TITLE:=IP over DNS tunneling + URL:=http://code.kryo.se/iodine/ +endef + +define Package/iodine + $(call Package/iodine/Default) + TITLE+= client version +endef + +define Package/iodine/description + iodine client version +endef + +define Package/iodined + $(call Package/iodine/Default) + TITLE+= server version +endef + +define Package/iodined/description + iodine server version +endef + +define Build/Configure +endef + +define Package/iodine/install + $(INSTALL_DIR) $(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)/bin/iodined $(1)/usr/sbin +endef + +define Package/iodined/conffiles +/etc/config/iodined +endef + +$(eval $(call BuildPackage,iodine)) +$(eval $(call BuildPackage,iodined)) diff --git a/net/iodine/files/iodined.config b/net/iodine/files/iodined.config new file mode 100644 index 000000000..f95549d7a --- /dev/null +++ b/net/iodine/files/iodined.config @@ -0,0 +1,5 @@ +config iodined + option address '' + option password '' + option tunnelip '10.0.0.1' + option tld '' diff --git a/net/iodine/files/iodined.init b/net/iodine/files/iodined.init new file mode 100644 index 000000000..d91b7793e --- /dev/null +++ b/net/iodine/files/iodined.init @@ -0,0 +1,23 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006-2011 OpenWrt.org + +START=50 + +start_instance () { + local section="$1" + config_get address "$section" 'address' + config_get password "$section" 'password' + config_get tunnelip "$section" 'tunnelip' + config_get tld "$section" 'tld' + + service_start /usr/sbin/iodined -l "$address" -P "$password" "$tunnelip" "$tld" +} + +start() { + config_load 'iodined' + config_foreach start_instance 'iodined' +} + +stop() { + service_stop /usr/sbin/iodined +} diff --git a/net/iodine/patches/010-cross-compile.patch b/net/iodine/patches/010-cross-compile.patch new file mode 100644 index 000000000..5ee860a0e --- /dev/null +++ b/net/iodine/patches/010-cross-compile.patch @@ -0,0 +1,22 @@ +--- a/src/osflags ++++ b/src/osflags +@@ -16,9 +16,6 @@ link) + windows32) + echo '-lws2_32 -liphlpapi'; + ;; +- Linux) +- [ -e /usr/include/selinux/selinux.h ] && echo '-lselinux'; +- ;; + esac + ;; + cflags) +@@ -26,9 +23,6 @@ cflags) + BeOS) + echo '-Dsocklen_t=int'; + ;; +- Linux) +- [ -e /usr/include/selinux/selinux.h ] && echo '-DHAVE_SETCON'; +- ;; + esac + ;; + *) From 7d5784fc511e8da1007f34b90ea646de863fbf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 7 Jul 2014 10:37:53 +0200 Subject: [PATCH 2/3] net/iodine: upgrade to version 0.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is compatible to 0.6.0-rc1 client and servers and fixes an authentication bypass bug (CVE-2014-4168). Signed-off-by: Uwe Kleine-König --- net/iodine/Makefile | 6 ++--- net/iodine/patches/010-cross-compile.patch | 26 ++++++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/net/iodine/Makefile b/net/iodine/Makefile index 03535b8ad..2814d96dc 100644 --- a/net/iodine/Makefile +++ b/net/iodine/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iodine -PKG_VERSION:=0.6.0-rc1 -PKG_RELEASE:=5 +PKG_VERSION:=0.7.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://code.kryo.se/iodine/ -PKG_MD5SUM:=a15bb4faba020d217016fde6e231074a +PKG_MD5SUM:=fdbf3b81cd69caf5230d76a8b039fd99 include $(INCLUDE_DIR)/package.mk diff --git a/net/iodine/patches/010-cross-compile.patch b/net/iodine/patches/010-cross-compile.patch index 5ee860a0e..40dfb0a70 100644 --- a/net/iodine/patches/010-cross-compile.patch +++ b/net/iodine/patches/010-cross-compile.patch @@ -1,22 +1,24 @@ ---- a/src/osflags -+++ b/src/osflags -@@ -16,9 +16,6 @@ link) +--- iodine-0.7.0.orig/src/osflags ++++ iodine-0.7.0/src/osflags +@@ -16,12 +16,6 @@ link) windows32) echo '-lws2_32 -liphlpapi'; ;; - Linux) -- [ -e /usr/include/selinux/selinux.h ] && echo '-lselinux'; +- FLAGS=""; +- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; +- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon"; +- echo $FLAGS; - ;; esac ;; cflags) -@@ -26,9 +23,6 @@ cflags) - BeOS) - echo '-Dsocklen_t=int'; +@@ -34,8 +28,6 @@ cflags) + ;; + Linux) + FLAGS="-D_GNU_SOURCE" +- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON"; +- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD"; + echo $FLAGS; ;; -- Linux) -- [ -e /usr/include/selinux/selinux.h ] && echo '-DHAVE_SETCON'; -- ;; esac - ;; - *) From d1f21a7ad6e1a3bfa44dcb553d62ec21d0c19692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 21 Jul 2014 21:29:21 +0200 Subject: [PATCH 3/3] net/iodine: grab maintainership and add license info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Uwe Kleine-König --- net/iodine/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/iodine/Makefile b/net/iodine/Makefile index 2814d96dc..af97aab58 100644 --- a/net/iodine/Makefile +++ b/net/iodine/Makefile @@ -15,6 +15,10 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://code.kryo.se/iodine/ PKG_MD5SUM:=fdbf3b81cd69caf5230d76a8b039fd99 +PKG_MAINTAINER:=Uwe Kleine-König +PKG_LICENSE:=ISC +PKG_LICENSE_FILES:=README + include $(INCLUDE_DIR)/package.mk define Package/iodine/Default