From 7d5784fc511e8da1007f34b90ea646de863fbf13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <uwe+openwrt@kleine-koenig.org>
Date: Mon, 7 Jul 2014 10:37:53 +0200
Subject: [PATCH] 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 <uwe+openwrt@kleine-koenig.org>
---
 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 03535b8ad6..2814d96dcd 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 5ee860a0e7..40dfb0a706 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
- ;;
- *)