diff options
| author | Uwe Kleine-König <uwe+openwrt@kleine-koenig.org> | 2014-07-07 10:37:53 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <uwe+openwrt@kleine-koenig.org> | 2014-07-21 21:29:40 +0200 |
| commit | 7d5784fc511e8da1007f34b90ea646de863fbf13 (patch) | |
| tree | 3bb5a18302c2be58f6cb64ebe3dcc0ef725739c4 /net | |
| parent | f22fc1604354feb5788bdbb1060ef666cafda865 (diff) | |
net/iodine: upgrade to version 0.7.0
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/iodine/Makefile | 6 | ||||
| -rw-r--r-- | 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 - ;; - *) |