Look for ifconfig in /bin and /sbin, bug 419151. Use pidfile in init script, bug 348109. Patches by Jason Donenfeld.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 81 insertions, 5 deletions

diff --git a/net-misc/iodine/ChangeLog b/net-misc/iodine/ChangeLog
index 1dae2ec4357b..18384be16a18 100644
--- a/net-misc/iodine/ChangeLog
+++ b/net-misc/iodine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/iodine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/ChangeLog,v 1.5 2012/06/07 02:20:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/ChangeLog,v 1.6 2012/06/07 19:53:54 floppym Exp $
+
+*iodine-0.6.0_rc1-r1 (07 Jun 2012)
+
+  07 Jun 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/iodine-0.6.0_rc1-ifconfig-path.patch, +iodine-0.6.0_rc1-r1.ebuild,
+  files/iodined.init:
+  Look for ifconfig in /bin and /sbin, bug 419151. Use pidfile in init script,
+  bug 348109. Patches by Jason Donenfeld.
 
   07 Jun 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
   Add Jason Donenfeld as an additional maintainer.
diff --git a/net-misc/iodine/files/iodine-0.6.0_rc1-ifconfig-path.patch b/net-misc/iodine/files/iodine-0.6.0_rc1-ifconfig-path.patch
new file mode 100644
index 000000000000..074231f8fe19
--- /dev/null
+++ b/net-misc/iodine/files/iodine-0.6.0_rc1-ifconfig-path.patch
@@ -0,0 +1,21 @@
+diff -ur iodine-0.6.0-rc1-original/src/tun.c iodine-0.6.0-rc1/src/tun.c
+--- iodine-0.6.0-rc1-original/src/tun.c	2012-06-01 22:04:35.870962402 +0200
++++ iodine-0.6.0-rc1/src/tun.c	2012-06-02 04:32:08.967846671 +0200
+@@ -455,7 +455,7 @@
+ 	}
+ #ifndef WINDOWS32
+ 	snprintf(cmdline, sizeof(cmdline), 
+-			"/sbin/ifconfig %s %s %s netmask %s",
++			"PATH=/bin:/sbin ifconfig %s %s %s netmask %s",
+ 			if_name,
+ 			ip,
+ #ifdef FREEBSD
+@@ -522,7 +522,7 @@
+ 
+ 	if (mtu > 200 && mtu <= 1500) {
+ 		snprintf(cmdline, sizeof(cmdline), 
+-				"/sbin/ifconfig %s mtu %u",
++				"PATH=/bin:/sbin ifconfig %s mtu %u",
+ 				if_name,
+ 				mtu);
+ 		
diff --git a/net-misc/iodine/files/iodined.init b/net-misc/iodine/files/iodined.init
index 7308e81ead25..a5a1729c1643 100644
--- a/net-misc/iodine/files/iodined.init
+++ b/net-misc/iodine/files/iodined.init
@@ -1,7 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined.init,v 1.1 2009/09/26 19:24:35 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined.init,v 1.2 2012/06/07 19:53:54 floppym Exp $
+
+PID_FILE="/var/run/iodined.pid"
 
 depend() {
 	need net
@@ -49,12 +51,12 @@ start() {
 		eerror "Please set a domain (IODINED_DOMAIN) in /etc/conf.d/iodined!"
 		return 1
 	fi
-	start-stop-daemon --start --exec /usr/bin/iodined -- $ARGS
+	start-stop-daemon --start --exec /usr/bin/iodined --pidfile $PID_FILE -- -F $PID_FILE $ARGS
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping iodined"
-	start-stop-daemon --stop --exec /usr/bin/iodined
+	start-stop-daemon --stop --exec /usr/bin/iodined --pidfile $PID_FILE
 	eend $?
 }
diff --git a/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild b/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..c9ccae40e18b
--- /dev/null
+++ b/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild,v 1.1 2012/06/07 19:53:54 floppym Exp $
+
+inherit linux-info eutils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="IP over DNS tunnel"
+HOMEPAGE="http://code.kryo.se/iodine/"
+SRC_URI="http://code.kryo.se/${PN}/${MY_P}.tar.gz"
+
+CONFIG_CHECK="~TUN"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ifconfig-path.patch
+	epatch "${FILESDIR}"/${P}-TestMessage.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	dobin bin/iodine bin/iodined || die "binaries failed"
+	dodoc README CHANGELOG || die "docs failed"
+	doman man/iodine.8 || die "man failed"
+
+	newinitd "${FILESDIR}"/iodined.init iodined || die "initd failed"
+	newconfd "${FILESDIR}"/iodined.conf iodined || die "confd failed"
+	keepdir /var/empty
+}