Version bump (bug 513560, CVE-2014-4168), EAPI-5, approved by vostoga.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 144 insertions, 19 deletions

diff --git a/net-misc/iodine/ChangeLog b/net-misc/iodine/ChangeLog
index 963b414446f1..f18a132cf3c1 100644
--- a/net-misc/iodine/ChangeLog
+++ b/net-misc/iodine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/iodine
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/ChangeLog,v 1.9 2013/03/17 15:09:04 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/ChangeLog,v 1.10 2014/07/18 15:53:52 xmw Exp $
+
+*iodine-0.7.0 (18 Jul 2014)
+
+  18 Jul 2014; Michael Weber <xmw@gentoo.org>
+  +files/iodine-0.7.0-TestMessage.patch, +files/iodined-1.init,
+  +iodine-0.7.0.ebuild:
+  Version bump (bug 513560, CVE-2014-4168), EAPI-5, approved by vostoga.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/net-misc/iodine/Manifest b/net-misc/iodine/Manifest
index 7563c0d7b171..808949cd49a7 100644
--- a/net-misc/iodine/Manifest
+++ b/net-misc/iodine/Manifest
@@ -4,31 +4,25 @@ Hash: SHA256
 AUX iodine-0.5.2-Makefile.patch 1160 SHA256 1fce3a95bfb403b809cf1ea5c4c2b707382970697f608633620570456f6574dd SHA512 2252b60a0d4e9f9b45fdcaa23b5dc8cc2cde600a8126d432979f38315ebf7f268759e3fff18c5a84de76336489421d4d54a34ce9454b12cfd32d6fcb89fb6d2a WHIRLPOOL e279c20d2677ea9203c72a047808bcfcc4fdda9be0c88d4c35ad30d60724e728db39fa0816b9f5e31eac3dec1554bbeaac1fca69edab540c6a705e2b5bfa1269
 AUX iodine-0.6.0_rc1-TestMessage.patch 660 SHA256 a14cbb88a2f65b4ffc22b2d884f875ba0ebfd2b0c7ae0f33cb8a1dc9389f1569 SHA512 3fe7135de7b21c4127e023609754e117adcca50eb6c0d1704e1c7ad2f1e708ca0742b011eff454aba3f34599b6eb19fde515e112fae2b73e1de84f83970f5de4 WHIRLPOOL 00737a4972612dce09f734a2df05dbbca6f7bf49e6af05b83ff0b184466dcb4f3af9b5c78784ac02be75525b5569b75cdb0362dacdd236a45e1fc23a00af375f
 AUX iodine-0.6.0_rc1-ifconfig-path.patch 627 SHA256 83fe5ba43eb5407731355e44d0d0c1688ac075d7f1832e3bf0aae2f192df9c19 SHA512 6304d59d76517bb87ba4b7c1feb35cc4889ce5b8c9fb84b49ae33294a51e2c9f43ba57bacc4f0deb26ffc959842025196166792894ad8f77242ea75083d3d14f WHIRLPOOL 6315d7064a4d035696272705c7bd74aa7f764e8c981a8af0edd951cf3b47af877f20bb340b33c70b80e4f44fd170bce0b873775ef4af8f12b4fb7815947fb192
+AUX iodine-0.7.0-TestMessage.patch 350 SHA256 f815fdd15c705a08cfe0bfc6acfe364a3d2ddb87ce58425fc324ce7a846454be SHA512 cdc482fdab22fc5ee612416161b2a93d4967211a47f9688a57737eef06bb48896c753f57df6bb3e8f826d78ac17955ce93d518e231e3e6ef507b53e050e47dca WHIRLPOOL 1274243a38b8d5e7b7792cf6bb6af902f456decef0877c533ab919b3b4c79e68b2268fc20358d442e6bf052fccccffdaf30d7662c6eaf8e86f39f34b4e7f0df3
+AUX iodined-1.init 1529 SHA256 9c20b83e1ed25650a65cb2689201be535dd349b7e2411254abbffb1b58e2352f SHA512 87262e6055d03296cb045eaf40bf1e71ea34d4d5c599ff6dc356ed6ea33d740c27f5a3026e81faae07e8a267d83862a55254049e7aed365f87bb3266eaf66fb8 WHIRLPOOL ec8754d7e7598efb33697f27e7826b2e149ba2db6232768c0ed37eac98d5e119b6ed724ba08ab8ebea5e9b9a799203c398044028c31a7f18a345c5432fc8e191
 AUX iodined.conf 1547 SHA256 01860664e8121308d0efb17258374a8a248293c4ed375a5b6f50d6568ceb8750 SHA512 3aab274be5670e4dc59fbf4fa9b5d6bfb1363ea081a8cf5c3d881007ca6d54a725038edd3b06f0aa24fb71756c4a54e96374867063ac1310ef9ce3a2ff25943d WHIRLPOOL 4be58489794458d4f208757445f0e8b2f07811e38889fbc41a446a4944289cc52ec1a1d31ca7da6eb771a6022c7cbdb13f151ec4946d90984f9046b1434106b4
 AUX iodined.init 1533 SHA256 6fd33d22cf08b7a4b4301575b04b6bdb6c2623441925d47e1421b553b9b6112a SHA512 1f89bf09059fe9fe8dcec03406f1fbb5695c479cd446b843a28d91db8630d8370f9fef9fe453b9498bce8e02f46c1ee20a2cd601d44130a6523913540429047b WHIRLPOOL b21b3295a48324569e3a1c79c2471d392c0062b9188ebfe87b04e45963714ce6cf2243d613d59321968356fb6f54a80b859cce34c4f11e4dba488ca59801ab11
 DIST iodine-0.5.2.tar.gz 50788 SHA256 cbc14665d325634318ebd6f792f8dc2229101bd5a55232420570538612f6a5e4
 DIST iodine-0.6.0-rc1.tar.gz 89827 SHA256 dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60 SHA512 6bd61c7ae363390af62b78d0b97bf04debee2f19fe96b6a1f274293d7becd13b134bb86facd300a3a400c16d3b574ec7dbfdc775ddc2c00caee1a06507814135 WHIRLPOOL 67fb79b894822eb91ac2fd5d6a025a2e2af833fb5b17d20321926187ab3565b98b9f625e5d2540c177ed6142819c400c0f27acd19b138528cb274f2b5a86bcba
+DIST iodine-0.7.0.tar.gz 96181 SHA256 ad2b40acf1421316ec15800dcde0f587ab31d7d6f891fa8b9967c4ded93c013e SHA512 49fe4f0cf614d3400cbfdade84eb4f50430f8f92004f663a08acc1514e8ff342443a8c3f855828bbca1864a3fafe419b5256f8a80fc4024b364d4c8c953fc0ec WHIRLPOOL ac098f9a409c75768b6b2da0f755560ea932a97855df32aefe860237a28ebf1ef1b576860378575522221214d9dc65c26f0297fafe628ea770e4449217c5d593
 EBUILD iodine-0.5.2.ebuild 978 SHA256 59bbf8a0916876061cfc404d7679943cd16894fe9c8d593594847b7865bafa4e SHA512 9b4d75954c612ed2273bb962422a057182764c2d0a7f1f52d3aafc48407c8baa20bc7c5fdedaafd984b5cbb4169874e3c5282e3228d6b840b9ad23ee1b612f1d WHIRLPOOL 3f438f9e98933190cc1940cda22d7cc1446ed9023c5ba96dc23f12c919eca0aa747c5cbcff1a03ac716e6b02c6450bf728f9262badebd05b8f074b82bbdaf284
 EBUILD iodine-0.6.0_rc1-r1.ebuild 1121 SHA256 22e0a7055563ab8612fe6a71db6f183912f7da4fdd3280a011578d290a34080d SHA512 8b70ee85ab17cc8206229a2832714de6c4ed011bb76d28975b1c37aa6e80564a562725ece230a23d7002fd6ac1c0b5026ff76452c0cc7bbf2d5b68871c22655a WHIRLPOOL f1b21a4d63be3a2e9587162da76cfaa58961955d24b6e7b2e3619d886afdf4e2c2d1640074d3c0e6225d6f67b83e706c68f591a88eb8f770f63ef955f6c36bf5
 EBUILD iodine-0.6.0_rc1.ebuild 1029 SHA256 5b4f125f588f199add751d2cdd31186de27296e8aae3e7ae5035ba95c2711b74 SHA512 ae5a267706d071e4440cffe60f4f35a0df79011f326e7d814ebc674e01be6bdcbc0192e5a9ed6faeca35da5074ff50037643043d6ddf4abc3f1a7b64d4c8c47c WHIRLPOOL 02f9cb54c0fb19a34c378b5ce7cd5e548a4223dd94ef1e31a7d99ba48a95af0fff56a1e75ece257043624feb74eeb5614d189d2233da79c47ae3c65f1adafa17
-MISC ChangeLog 1890 SHA256 7082f0ff19b3b544965b346f82abb4a02b0fed4f52c22c2325ed4db439c8da94 SHA512 af1dcfe5dbae0274ac52753c2eee98837cc263972c5ba93bd9c7d0b87855e69f0602732b4a80fda7bd9951311b5025bd8c5f982bb31123169828220c5679f211 WHIRLPOOL 4cea038a7aceb974b5896f0a7b5d01f3cc189104230a884c60974854968b85140643e74156420f07b9051f3bf08822a88fc2b3acddd214cac26d63bf31fc93e2
+EBUILD iodine-0.7.0.ebuild 1140 SHA256 ed592d015ded3d52e68e37404c706dbd45f842a4d79bfb42e8cbb29b8ea4afab SHA512 42a20ec318b2c4595692e30c9425fd08d1ba926c533914ec696a60be1cdce2db37f0419376d17db9919d2dc62512ff71a6705e402305c0964681b69af125f939 WHIRLPOOL f4a29314c22f17ea16c1f462f6a1adf7203c828bff18cb16ec730524b26aa22d71121cb49422c21a301ce4f11bd0900fc35a5cb05627fb1a5cab5013b459c883
+MISC ChangeLog 2123 SHA256 0095d1ff1984150f0ce77ea6de38835996be6753ec1d6713a30722e3fe95ebad SHA512 11ded8223e70319337fa46e62451560d4bc3deeffd019badc1a384996ef309476dc43d86716cccd682fd07f5a8c1d32a1c82d8bca2611d02710ece4ce65088b8 WHIRLPOOL 4cb1347c386153c91524078b576e89e1fad96e7bf388a35cc6752a7d61980ad391b2f6391cc56abcb09b9864bd89368f7415408cecac5af33b136a14dde16f9e
 MISC metadata.xml 649 SHA256 d4f11cb4650b0c53c5ae12e512b0bb363e8e827bdfbdba47f4efb1f368016223 SHA512 556624ff050f34baa04c4894daf675b5a6e27a6ecc5d4e127db53eae244f772f82364bc97446597324694f1971b160be241176d81af2a83aac964f5166296df5 WHIRLPOOL 51936aa9165f6e900c4649023c6ade4095f2911a1f44cd0ba5c3e0842b20b100d6f2df8f61ac8a93226831e456ae76036bc7ea8935dac4ab5eef00854078f939
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJRRdyRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88XGIP/2c+TAsRhi6617cmHS255j1P
-d3PamttJcIDixAZ5YkQ5QqUNqiGtvHj89OUFoPolUYqxaB6phvj/NVfMcl8di9qT
-fRPRnWtt9QeHyoM+8t6XPRkVRo+cH3XAEdAXzmtP8tKmzeL8Ns0XMxAcKFLKolX6
-SNxOLIOKcvkk9c8eWjsbqvmZLy4d0TjCBNQRXJWe9Rjj92yJ/hhz7e+WOVo70C6j
-/hu9a+MWw/LxJy3t/biuWADi9DPltOx4s4g7iMSj2SIrmPCe18HlTR1pLTrgL2OF
-LzBK0kTWbl/VO/yCTf3PqYUQfKZ9sUKqUUa8wj7KeXrTPl2TvPlI6kOfBi+qr5tR
-b1a+Whp2xOUPv98cGlWcacehakTruqpujcq9KwsgJshCQajAIMir7gxH4WdyJdvW
-uPF1dKXyK4GobMWR8AhyfbLb/It3hbyaKJpQ27XoHevP5+8RT9rP7p7ZVVbee1fo
-FkczpA4O6gOx3yR9uSknXTXNvIcDYXIhffP+ZLXdqy+AXZWrdYCPbh617fBcboiO
-1VG+J62QXpFfbXpdgZBKDydWVq5B6zDFjEtOh1p2z9BXOmQvCTdAajY+9yS+vKjp
-hxflKYkAeJBpnlhXp3ctf28ABrF7hhvna7njiPenLOrmetBXZ8m1hpcejHk8FMhD
-IfS1POD17Y28/s2wsAld
-=qod8
+iL4EAREIAGYFAlPJQxZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JAtXwD7BMC6z0i2ThMNbgQEYWqHRxUi
+ASJ62gG/DtSulqMeCO4A/1EdktAnzxCEo08aZxYgV1u3V6g89Dmx89ZGgDQkQmyz
+=ad4v
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch b/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch
new file mode 100644
index 000000000000..6b814b6f2d74
--- /dev/null
+++ b/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch
@@ -0,0 +1,12 @@
+--- iodine-0.7.0/Makefile
++++ iodine-0.7.0/Makefile
+@@ -35,8 +35,7 @@
+ 	$(RM) $(RM_FLAGS) $(DESTDIR)$(mandir)/man8/iodine.8
+ 
+ test: all
+-	@echo "!! The check library is required for compiling and running the tests"
+-	@echo "!! Get it at http://check.sf.net"
++	@echo "Executing tests target"
+ 	@(cd tests; $(MAKE) TARGETOS=$(TARGETOS) all)
+ 
+ clean:
diff --git a/net-misc/iodine/files/iodined-1.init b/net-misc/iodine/files/iodined-1.init
new file mode 100644
index 000000000000..c2ae3367c4f6
--- /dev/null
+++ b/net-misc/iodine/files/iodined-1.init
@@ -0,0 +1,62 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined-1.init,v 1.1 2014/07/18 15:53:51 xmw Exp $
+
+PID_FILE="/run/iodined.pid"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting iodined"
+	ARGS=""
+	if [ "$IODINED_USER" ]; then
+		ARGS="$ARGS -u $IODINED_USER"
+	fi
+	if [ "$IODINED_CHROOT" ]; then
+		ARGS="$ARGS -t $IODINED_CHROOT"
+	fi
+	if [ "$IODINED_MTU" ]; then
+		ARGS="$ARGS -m $IODINED_MTU"
+	fi
+	if [ "$IODINED_LISTENPORT" ]; then
+		ARGS="$ARGS -p $IODINED_LISTENPORT"
+	fi
+	if [ "$IODINED_EXTERN_IP" ]; then
+		ARGS="$ARGS -n $IODINED_EXTERN_IP"
+	fi
+	if [ "$IODINED_LOCAL_DNS_PORT" ]; then
+		ARGS="$ARGS -b $IODINED_LOCAL_DNS_PORT"
+	fi
+	if [ "$IODINED_LISTENIP" ]; then
+		ARGS="$ARGS -l $IODINED_LISTENIP"
+	fi
+	if [ "$IODINED_PASSWD" ]; then
+		ARGS="$ARGS -P $IODINED_PASSWD"
+	else
+		eerror "Please set a password (IODINED_PASSWD) in /etc/conf.d/iodined!"
+		return 1
+	fi
+	if [ "$IODINED_IP" ]; then
+		ARGS="$ARGS $IODINED_IP"
+	else
+		eerror "Please set an IP (IODINED_IP) in /etc/conf.d/iodined!"
+		return 1
+	fi
+	if [ "$IODINED_DOMAIN" ]; then
+		ARGS="$ARGS $IODINED_DOMAIN"
+	else
+		eerror "Please set a domain (IODINED_DOMAIN) in /etc/conf.d/iodined!"
+		return 1
+	fi
+	start-stop-daemon --start --exec /usr/sbin/iodined --pidfile $PID_FILE -- -F $PID_FILE $ARGS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping iodined"
+	start-stop-daemon --stop --exec /usr/sbin/iodined --pidfile $PID_FILE
+	eend $?
+}
diff --git a/net-misc/iodine/iodine-0.7.0.ebuild b/net-misc/iodine/iodine-0.7.0.ebuild
new file mode 100644
index 000000000000..271657963c97
--- /dev/null
+++ b/net-misc/iodine/iodine-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/iodine-0.7.0.ebuild,v 1.1 2014/07/18 15:53:52 xmw Exp $
+
+EAPI=5
+
+inherit linux-info eutils toolchain-funcs
+
+DESCRIPTION="IP over DNS tunnel"
+HOMEPAGE="http://code.kryo.se/iodine/"
+SRC_URI="http://code.kryo.se/${PN}/${P}.tar.gz"
+
+CONFIG_CHECK="~TUN"
+
+LICENSE="ISC GPL-2" #GPL-2 for init script bug #426060
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare(){
+	epatch "${FILESDIR}"/${P}-TestMessage.patch
+
+	sed -e '/^\s@echo \(CC\|LD\)/d' \
+		-e 's:^\(\s\)@:\1:' \
+		-i {,src/}Makefile || die
+
+	tc-export CC
+}
+
+src_compile() {
+	#shipped ./Makefiles doesn't pass -j<n> to submake
+	emake -C src TARGETOS=Linux all
+}
+
+src_install() {
+	#don't re-run submake
+	sed -e '/^install:/s: all: :' \
+		-i Makefile || die
+	emake prefix="${EPREFIX}"usr DESTDIR="${D}" install
+
+	dodoc CHANGELOG README TODO
+
+	newinitd "${FILESDIR}"/iodined-1.init iodined
+	newconfd "${FILESDIR}"/iodined.conf iodined
+	keepdir /var/empty
+}