Fix --stdin-stdout option thanks to Israel G. Lugo (bug #182753). Fix quoting.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7-JeR i686

6 files changed, 66 insertions, 11 deletions

diff --git a/net-misc/httptunnel/ChangeLog b/net-misc/httptunnel/ChangeLog
index f33e9867189f..2119a79ea703 100644
--- a/net-misc/httptunnel/ChangeLog
+++ b/net-misc/httptunnel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/httptunnel
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/ChangeLog,v 1.16 2007/07/15 08:48:23 phreak Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/ChangeLog,v 1.17 2009/01/08 18:56:37 jer Exp $
+
+*httptunnel-3.3-r1 (08 Jan 2009)
+
+  08 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/httptunnel-3.3-fix_write_stdin.patch, httptunnel-3.0.5.ebuild,
+  httptunnel-3.3.ebuild, +httptunnel-3.3-r1.ebuild:
+  Fix --stdin-stdout option thanks to Israel G. Lugo (bug #182753). Fix
+  quoting.
 
   15 Jul 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Assigning to m-needed, as beu is being retired (#66608).
diff --git a/net-misc/httptunnel/Manifest b/net-misc/httptunnel/Manifest
index 6c5866016f8f..51235b380957 100644
--- a/net-misc/httptunnel/Manifest
+++ b/net-misc/httptunnel/Manifest
@@ -1,6 +1,8 @@
+AUX httptunnel-3.3-fix_write_stdin.patch 541 RMD160 b3ea12adb06668d6ec265f2a26f34e73cfed48ea SHA1 60b136461f965d7d55af2d44ff78fdb18657058c SHA256 11b9ebbd380054e2666a5efdf59a6f545c362e37ab838adc5e1c4b3fa7e845d7
 DIST httptunnel-3.0.5.tar.gz 260536 RMD160 252cd09a923b451f536dea06875786d8f35054f3 SHA1 d48a18bb7ea7eac16837b0a1f9e99aa0b8c44475 SHA256 0d4c3b276f47c06fc39f77e45babef1b3ede53512928c7a59ad0dd795ef0e617
 DIST httptunnel-3.3.tar.gz 262749 RMD160 0e0a34dbe122510b19a2e37f3dcaeab8ff7cae5d SHA1 e3fa5c6499cbad9202bb7a3ba8a5b6478a60a3f3 SHA256 142f82b204876c2aa90f19193c7ff78d90bb4c2cba99dfd4ef625864aed1c556
-EBUILD httptunnel-3.0.5.ebuild 749 RMD160 3a5d039a4933ff6c77e3c51095499285c2fa4cc3 SHA1 2944e83be46967f943b6dfc1c0144d8e8cd2d626 SHA256 09c13c7e81c165bfd2a44e6d128cd673bcfd26090266831a5548d8b631d07d75
-EBUILD httptunnel-3.3.ebuild 754 RMD160 60aa061301da90ec5f4c4e7ca1b9084b8c24ebda SHA1 63a7ad3823e0cd53328011ea9834476015bcc3f3 SHA256 6d727fd82fecd7a4897451829b3e24757c447bec7fd9f784f2a504fb8ec11aec
-MISC ChangeLog 1786 RMD160 dc0784a86d5468cc0f7840916630d40388698505 SHA1 f280e48db7cf9b7e2a85811562d4e74889a90f2e SHA256 4cd157de2873dd991ad3234bace98faac2b126cc865417770d465f041b979d41
+EBUILD httptunnel-3.0.5.ebuild 748 RMD160 eba31cf36842fa5ffe049cdfac78c179b1fabe49 SHA1 292b9c76c9fba50cb7e28c6f2fba00c9c41ec932 SHA256 62f6d766c835871fbcec4edb5dc2844d806cb758e33421141b03fc7226b6d67c
+EBUILD httptunnel-3.3-r1.ebuild 852 RMD160 9add9f756def6302e2afca3c87eef25299fe577f SHA1 592cee18ec2c9ec87e9a7b93ee77a864dc10818f SHA256 e0ae989830d9f4f1eed449a258c151fa6c1325fd57ebec52b73944d5af2fd004
+EBUILD httptunnel-3.3.ebuild 750 RMD160 ac9d73ec33a0506e7e2367edd7de3b26a0c09dc2 SHA1 7f46114d70534c221ca74a0cc7b21d27ea42f01a SHA256 4b148ad9d40ffcdaeca5fcb81ed722a527e095a4d10975a6a7aa280a32fd5a83
+MISC ChangeLog 2072 RMD160 9f24ea60faf75722d24e22cf11fc47ba2084e244 SHA1 b2e580d31e986b90ba8351d7be340556e57ca87d SHA256 dd66b773ca89c3161cb863f451ac9dbfb6a6174bb6680e64dcc5eea119bf280b
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/net-misc/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch b/net-misc/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
new file mode 100644
index 000000000000..904df6f91159
--- /dev/null
+++ b/net-misc/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
@@ -0,0 +1,12 @@
+diff -dur httptunnel-3.3/common.c httptunnel-3.3-fix_write_stdin/common.c
+--- httptunnel-3.3/common.c	2001-02-25 12:45:41.000000000 +0100
++++ httptunnel-3.3-fix_write_stdin/common.c	2007-06-20 21:38:54.000000000 +0200
+@@ -314,7 +314,7 @@
+ 
+       /* If fd == 0, then we are using --stdin-stdout so write to stdout,
+        * not fd. */
+-      m = write_all (fd ? fd : 0, buf, (size_t)n);
++      m = write_all (fd ? fd : 1, buf, (size_t)n);
+       log_annoying ("write_all (%d, %p, %d) = %d", fd ? fd : 1, buf, n, m);
+       return m;
+     }
diff --git a/net-misc/httptunnel/httptunnel-3.0.5.ebuild b/net-misc/httptunnel/httptunnel-3.0.5.ebuild
index 1df69c758f69..b5ce5d5cec33 100644
--- a/net-misc/httptunnel/httptunnel-3.0.5.ebuild
+++ b/net-misc/httptunnel/httptunnel-3.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.0.5.ebuild,v 1.10 2005/04/24 02:52:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.0.5.ebuild,v 1.11 2009/01/08 18:56:37 jer Exp $
 
 DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
 HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
@@ -22,5 +22,5 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/net-misc/httptunnel/httptunnel-3.3-r1.ebuild b/net-misc/httptunnel/httptunnel-3.3-r1.ebuild
new file mode 100644
index 000000000000..8b01761fdf1f
--- /dev/null
+++ b/net-misc/httptunnel/httptunnel-3.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.3-r1.ebuild,v 1.1 2009/01/08 18:56:37 jer Exp $
+
+inherit eutils
+
+DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
+HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
+LICENSE="GPL-2"
+DEPEND=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+SLOT="0"
+#RDEPEND=""
+SRC_URI="http://www.nocrew.org/software/httptunnel/${P}.tar.gz"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-fix_write_stdin.patch
+}
+
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "./configure failed"
+	emake || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+}
diff --git a/net-misc/httptunnel/httptunnel-3.3.ebuild b/net-misc/httptunnel/httptunnel-3.3.ebuild
index edf36221e62d..f7e521b3a131 100644
--- a/net-misc/httptunnel/httptunnel-3.3.ebuild
+++ b/net-misc/httptunnel/httptunnel-3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.3.ebuild,v 1.7 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.3.ebuild,v 1.8 2009/01/08 18:56:37 jer Exp $
 
 DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
 HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
@@ -22,5 +22,5 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }