net/iodine: upgrade to version 0.7.0
authorUwe Kleine-König <uwe+openwrt@kleine-koenig.org>
Mon, 7 Jul 2014 08:37:53 +0000 (10:37 +0200)
committerUwe Kleine-König <uwe+openwrt@kleine-koenig.org>
Mon, 21 Jul 2014 19:29:40 +0000 (21:29 +0200)
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
net/iodine/patches/010-cross-compile.patch

index 03535b8ad66189513063002078eb8d1c97ad3a4b..2814d96dcdc2c0596e6054cfd099507d6ec19c09 100644 (file)
@@ -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
 
index 5ee860a0e76acf4f1048549742bb8138f715e590..40dfb0a7062cc1b3a8599580e63b5f00d66fe87f 100644 (file)
@@ -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
- ;;
- *)