icmptx-0.2

6 files changed, 93 insertions, 7 deletions

diff --git a/net-misc/icmptx/Manifest b/net-misc/icmptx/Manifest
index 25e36b7c..d0b12275 100755
--- a/net-misc/icmptx/Manifest
+++ b/net-misc/icmptx/Manifest
@@ -1,7 +1,9 @@
 AUX icmptx-0.01-BJA-Makefile.diff 627 RMD160 5d0fac1de29ed9bcd1348341613c1905ab82d404 SHA1 f54f2d1956d06fd2ba9159ef0ec9762605045b9c SHA256 bf3f6e9460e306c2e8b36b110d49ca802954114ef62dd6bd5f73dcf572dc4c04
+AUX icmptx-0.2-BJA-Makefile.diff 618 RMD160 c784ad2c29ed3a9cb3fda94325908860278d3ef1 SHA1 d4ac2ec5e693b60e8f378c9b87357c6824e09f1f SHA256 47b71e74481a046a1e5ecd23c065c1c8890975daa72f0943795a1197bc37e1db
 AUX icmptxcd.conf 326 RMD160 ed4b4fb7d1ff567c53f3fcfd45d05632bea16a8a SHA1 529fe8394963867d7c41ca1cd5dd4f4f397a2c97 SHA256 faa34b1718fa242d924a198a6143a4325e3c0527cffe9fccff60ddc8631d32d6
-AUX icmptxcd.init 1338 RMD160 2c07a8f410ec06802b7d67946680015f657fe5cd SHA1 8d8af7396f2c90c9286118d65d1c8503be8bf07e SHA256 88b8c9e26914c744145151ca28fd6f13d04c21912ddd14d76febeeb8ffdbd8d0
+AUX icmptxcd.init 1341 RMD160 a481b0d2830bda8323be8ceb29906cf121144e53 SHA1 729aabec065694dec74038a2f6de9b9386227214 SHA256 1acd601b5552bb547d16b4e01661b7ac96c0703130af4103db52eb27fd3d6b19
 AUX icmptxd.conf 327 RMD160 c24032abcd36389335b98e786880303f958fe15c SHA1 6df6df887513bf5dab21f31d9e8b50d1f37b8266 SHA256 eafa579a4b39678609616197481afed2a0398edaca2ff291c2e002f3fb422a4e
-AUX icmptxd.init 1354 RMD160 c39a32c3def5e00cb6e2c23b18680176a7f68ea0 SHA1 00627512e49bedb5fdc5ec7617de9775912c9961 SHA256 b66b5d750e707912928bd37c4cce4ff5248ae737e43bc2aa9f8acd42025fab6d
+AUX icmptxd.init 1357 RMD160 6957316fee79ce722883b9985d8635387717b0d0 SHA1 02e6666af2d87dfdcd660f74b7730aa8233d25f0 SHA256 d1061d597a0b6dbe764a2a1aed25c83b22f737638a913eec40b9960d92445c5d
 DIST icmptx-0.01.tar.gz 6598 RMD160 172d99b1756e824d378dede0c6b3c1b70be4c8ad SHA1 278b6f9f3499ee11626e5dbe2857939510dbcd8f SHA256 8cb2070490ef0d4528968f8158b7a16976f9fb4a003f50c7a3b01ee5d1ade8df
-EBUILD icmptx-0.01.ebuild 1079 RMD160 72b9432a2dd3c72ad2f75baff0f170ad2cd57d26 SHA1 7760a29942d038e8605ccfe33c0d8c5dbd4b7bbd SHA256 f5eb1a5a4de576f65f3f2266f481b3291aab6feab9b1368434e43abd2918d918
+EBUILD icmptx-0.01.ebuild 1090 RMD160 9acfd30cee4bbef9cdd24b7f452572d6fdec6d9c SHA1 edfd92a3e8a79607a13a4d88ffab9f7a4e7738e1 SHA256 792bd490f3db2e36af9d0f8422c837caefa50057c757b95b10f6bdcbaad4e649
+EBUILD icmptx-0.2.ebuild 1116 RMD160 9d718f79589119dd58f5aafc8fd11181171e0783 SHA1 6084fe5239c7830848d3aa276a2f5cf578166fac SHA256 eb1f14148e4fdfd61345b862e0469422473ca76f16641167be72d8a5f772a7c1
diff --git a/net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff b/net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff
new file mode 100644
index 00000000..404759b8
--- /dev/null
+++ b/net-misc/icmptx/files/icmptx-0.2-BJA-Makefile.diff
@@ -0,0 +1,34 @@
+--- Makefile.ori	2010-12-11 00:30:11.129772114 +0100
++++ Makefile	2010-12-11 00:30:16.537826087 +0100
+@@ -1,15 +1,22 @@
+-flags=-g3 -Wall -ansi -pedantic -D_GNU_SOURCE
++NAME	= icmptx
+ 
+-all: icmptx
++CFLAGS	= \
++	-g
+ 
+-icmptx: it.o icmptx.c tun_dev.o
+-	gcc $(flags) -o icmptx icmptx.c it.o tun_dev.o
++SRC	= \
++	it.c		\
++	icmptx.c	\
++	tun_dev.c
+ 
+-it.o: it.c tun_dev.h
+-	gcc $(flags) -c it.c
++OBJ	= $(SRC:c=o)
+ 
+-tun_dev.o: tun_dev.c
+-	gcc $(flags) -c tun_dev.c
++RM	= rm -f
++CC	= gcc
++
++all:	$(NAME)
++
++$(NAME): $(OBJ)
++	$(CC) -o $(NAME) $(CFLAGS) $(OBJ)
+ 
+ clean:
+-	rm -f tun_dev.o it.o icmptx
++	$(RM) $(OBJ) $(PROJECT)
diff --git a/net-misc/icmptx/files/icmptxcd.init b/net-misc/icmptx/files/icmptxcd.init
index 83e3e57d..51a1c49b 100644
--- a/net-misc/icmptx/files/icmptxcd.init
+++ b/net-misc/icmptx/files/icmptxcd.init
@@ -50,7 +50,7 @@ start() {
 	        --make-pidfile \
         	--exec /usr/sbin/icmptx \
 	        --pidfile "/var/run/icmptx.pid" \
-        	-- ${SERVER}
+        	-- -c ${SERVER}
 
 	eend $?
 }
diff --git a/net-misc/icmptx/files/icmptxd.init b/net-misc/icmptx/files/icmptxd.init
index 891274d6..eae27b12 100644
--- a/net-misc/icmptx/files/icmptxd.init
+++ b/net-misc/icmptx/files/icmptxd.init
@@ -50,7 +50,7 @@ start() {
 	        --make-pidfile \
         	--exec /usr/sbin/icmptx \
 	        --pidfile "/var/run/icmptx.pid" \
-        	-- ${BIND_ADDRESS}
+        	-- -s ${BIND_ADDRESS}
 
 	eend $?
 }
diff --git a/net-misc/icmptx/icmptx-0.01.ebuild b/net-misc/icmptx/icmptx-0.01.ebuild
index 0bd9f47f..f35caf64 100755
--- a/net-misc/icmptx/icmptx-0.01.ebuild
+++ b/net-misc/icmptx/icmptx-0.01.ebuild
@@ -7,7 +7,7 @@ inherit linux-info
 
 DESCRIPTION="IP over ICMP tunnel"
 SRC_URI="http://thomer.com/${PN}/${P}.tar.gz"
-HOMEPAGE="http://thomer.com/icmptx/"
+HOMEPAGE="http://thomer.com/icmpx"
 RDEPEND="virtual/libc"
 DEPEND="virtual/os-headers
 		${RDEPEND}"
@@ -45,5 +45,5 @@ src_install() {
 
 pkg_postinst() {
 	einfo "Please read the documentation provided in"
-	einfo "  `find /usr/share/doc/${PF}/ -name 'README*'`"
+	einfo "  `find /usr/share/doc/${PF}/ -name 'README*' 2> /dev/null`"
 }
diff --git a/net-misc/icmptx/icmptx-0.2.ebuild b/net-misc/icmptx/icmptx-0.2.ebuild
new file mode 100755
index 00000000..c5e5dafb
--- /dev/null
+++ b/net-misc/icmptx/icmptx-0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+# Nonofficial ebuild by Ycarus. For new version look here : http://gentoo.zugaina.org/
+
+EAPI=2
+
+inherit git linux-info
+
+DESCRIPTION="IP over ICMP tunnel"
+EGIT_REPO_URI="git://github.com/jakkarth/${PN}.git"
+EGIT_COMMIT="${PV}"
+HOMEPAGE="https://github.com/jakkarth/icmptx"
+RDEPEND="virtual/libc"
+DEPEND="virtual/os-headers
+		${RDEPEND}"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="client server"
+LICENSE="as-is"
+SLOT="0"
+RESTRICT="nomirror"
+
+CONFIG_CHECK="~TUN"
+
+src_prepare () {
+	epatch "${FILESDIR}"/${P}-BJA-Makefile.diff
+}
+
+src_compile () {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dosbin icmptx
+	dodoc README
+
+	if use client ; then
+		newinitd "${FILESDIR}"/icmptxcd.init icmptxcd
+		newconfd "${FILESDIR}"/icmptxcd.conf icmptxcd
+	fi
+	if use server ; then
+		newinitd "${FILESDIR}"/icmptxd.init icmptxd
+		newconfd "${FILESDIR}"/icmptxd.conf icmptxd
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please read the documentation provided in"
+	einfo "  `find /usr/share/doc/${PF}/ -name 'README*' 2> /dev/null`"
+}