Update to 0.7.0, fixing a security issue.

2014-06-16: 0.7.0 "Kryoptonite"
	- Partial IPv6 support (#107)
	   Client can connect to iodined through an relaying IPv6
	   nameserver. Server only supports IPv4 for now.
	   Traffic inside tunnel is IPv4.
	- Add socket activation for systemd, by Michael Scherer.
	- Add automated lookup of external ip (via -n auto).
	- Bugfix for OS X (Can't assign requested address)
	- Fix DNS tunneling bug caused by uninitialized variable, #94
	- Handle spaces when entering password interactively, fixes #93.
		Patch by Hagar.
	- Add -R option to set OpenBSD routing domain for the DNS socket.
		Patch by laurent at gouloum fr, fixes #95.
	- Add android patches and makefile, from Marcel Bokhorst, fixes #105.
	- Added missing break in iodine.c, by Pavel Pergamenshchik, #108.
	- A number of minor patches from Frank Denis, Gregor Herrmann and
		Barak A. Pearlmutter.
	- Testcase compilation fixes for OS X and FreeBSD
	- Do not let sockets be inherited by sub-processes, fixes #99.
	- Add unspecified RR type (called PRIVATE; id 65399, in private use
		range). For servers with RFC3597 support. Fixes #97.
	- Fix authentication bypass vulnerability; found by Oscar Reparaz.

5 files changed, 15 insertions, 58 deletions

diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index daa417f99da..e31cb307701 100644
--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2013/07/12 10:44:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/26 18:54:09 wiz Exp $
 
-DISTNAME=		iodine-0.6.0-rc1
-PKGNAME=		iodine-0.6.0rc1
-PKGREVISION=		1
+DISTNAME=		iodine-0.7.0
 CATEGORIES=		net
 MASTER_SITES=		http://code.kryo.se/iodine/
 
@@ -17,6 +15,8 @@ PKG_GROUPS=		iodine
 BUILD_DEFS+=		VARBASE
 MAKE_DIRS=		${VARBASE}/chroot
 OWN_DIRS=		${VARBASE}/chroot/iodine
+MAKE_FLAGS+=		prefix=${PREFIX}
+MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/iodine/PLIST b/net/iodine/PLIST
index 6a028350dcb..0c67cfe8ffa 100644
--- a/net/iodine/PLIST
+++ b/net/iodine/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/12 13:19:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/06/26 18:54:09 wiz Exp $
 man/man8/iodine.8
-man/man8/iodined.8
 sbin/iodine
 sbin/iodined
-share/doc/iodine/CHANGELOG
-share/doc/iodine/README
diff --git a/net/iodine/distinfo b/net/iodine/distinfo
index c194ffcca24..664f653b48f 100644
--- a/net/iodine/distinfo
+++ b/net/iodine/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2012/12/12 13:19:06 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/06/26 18:54:09 wiz Exp $
 
-SHA1 (iodine-0.6.0-rc1.tar.gz) = 4fa9a248b8a84df8a727a5d749e669e58136edca
-RMD160 (iodine-0.6.0-rc1.tar.gz) = 6974beac28e07b0c280d7095f15d13699e9cad65
-Size (iodine-0.6.0-rc1.tar.gz) = 89827 bytes
-SHA1 (patch-aa) = fb37ac47290f54aa87d84c89c5d0b1fcb179f2fb
-SHA1 (patch-ab) = 767dde49b1d06935dc79ec7832b8204c5eef7ff2
+SHA1 (iodine-0.7.0.tar.gz) = f4c49305b6f46a547b160b3bd8c962942d701a63
+RMD160 (iodine-0.7.0.tar.gz) = 9552890a18bcd9b4576dd096a4cda8d9973dfc34
+Size (iodine-0.7.0.tar.gz) = 96181 bytes
+SHA1 (patch-aa) = 8c0de153906bb580e12c7f2f41e2e783e4c80ad6
diff --git a/net/iodine/patches/patch-aa b/net/iodine/patches/patch-aa
index f4120f31c16..484a7b83e04 100644
--- a/net/iodine/patches/patch-aa
+++ b/net/iodine/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2012/12/12 13:19:06 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2014/06/26 18:54:09 wiz Exp $
 
 Honour CPPFLAGS
 
---- src/Makefile.orig	2010-03-06 20:47:50.000000000 +0100
-+++ src/Makefile	2010-03-06 20:54:32.000000000 +0100
-@@ -28,7 +28,7 @@
+--- src/Makefile.orig	2014-06-16 20:28:43.000000000 +0000
++++ src/Makefile
+@@ -28,7 +28,7 @@ $(SERVER): $(COMMONOBJS) $(SERVEROBJS)
  
- .c.o: 
+ .c.o:
  	@echo CC $<
 -	@$(CC) $(CFLAGS) $< -o $@
 +	@$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@
diff --git a/net/iodine/patches/patch-ab b/net/iodine/patches/patch-ab
deleted file mode 100644
index 881f4504e86..00000000000
--- a/net/iodine/patches/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2012/12/12 13:19:06 wiz Exp $
-
-Fix 'install' target of upstream Makefile
-
---- Makefile.orig	2009-01-25 21:40:04.000000000 +0000
-+++ Makefile
-@@ -1,8 +1,3 @@
--prefix=/usr/local
--sbindir=$(prefix)/sbin
--datadir=$(prefix)/share
--mandir=$(datadir)/man
--
- DESTDIR=
- 
- INSTALL=install
-@@ -35,14 +30,15 @@ cross-mingw-dist: cross-mingw
- 	@zip -r iodine-latest-win32.zip iodine-latest-win32
- 
- install: all
--	$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(sbindir)
--	$(INSTALL) $(INSTALL_FLAGS) bin/iodine $(DESTDIR)$(sbindir)/iodine
--	chmod 755 $(DESTDIR)$(sbindir)/iodine
--	$(INSTALL) $(INSTALL_FLAGS) bin/iodined $(DESTDIR)$(sbindir)/iodined
--	chmod 755 $(DESTDIR)$(sbindir)/iodined
--	$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(mandir)/man8
--	$(INSTALL) $(INSTALL_FLAGS) man/iodine.8 $(DESTDIR)$(mandir)/man8/iodine.8
--	chmod 644 $(DESTDIR)$(mandir)/man8/iodine.8
-+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/sbin
-+	$(BSD_INSTALL_PROGRAM) bin/iodine $(DESTDIR)$(PREFIX)/sbin/iodine
-+	$(BSD_INSTALL_PROGRAM) bin/iodined $(DESTDIR)$(PREFIX)/sbin/iodined
-+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man8
-+	$(BSD_INSTALL_MAN) man/iodine.8 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man8/iodine.8
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/doc/iodine
-+	$(BSD_INSTALL_DATA) README $(DESTDIR)$(PREFIX)/share/doc/iodine/README
-+	$(BSD_INSTALL_DATA) CHANGELOG $(DESTDIR)$(PREFIX)/share/doc/iodine/CHANGELOG
-+	ln -sf iodine.8 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man8/iodined.8 
- 
- uninstall:
- 	$(RM) $(RM_FLAGS) $(DESTDIR)$(sbindir)/iodine