From: Peter Volkov <pva@gentoo.org>
Date: Wed, 3 Aug 2011 11:27:32 +0000 (+0000)
Subject: Fix bind option, bug 367537 wrt Denys and Folkert van Heusden.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4b8b10181357d855979be973e427fc8f91af4301;p=gentoo.git

Fix bind option, bug 367537 wrt Denys and Folkert van Heusden.

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64
---

diff --git a/net-analyzer/httping/ChangeLog b/net-analyzer/httping/ChangeLog
index 41ee707a02eb..6a6884ec8f50 100644
--- a/net-analyzer/httping/ChangeLog
+++ b/net-analyzer/httping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/httping
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.68 2011/07/28 07:09:46 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.69 2011/08/03 11:27:32 pva Exp $
+
+*httping-1.5.1-r1 (03 Aug 2011)
+
+  03 Aug 2011; Peter Volkov <pva@gentoo.org> +httping-1.5.1-r1.ebuild,
+  +files/httping-1.5.1-bind.patch:
+  Fix bind option, bug 367537 wrt Denys and Folkert van Heusden.
 
 *httping-1.5.1 (28 Jul 2011)
 
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index 2d839ab8ee8a..48c1828662b5 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,6 +1,8 @@
+AUX httping-1.5.1-bind.patch 745 RMD160 e12b4c5b2c52adec5fa5b88bdd1277c1de3a38bb SHA1 84fca6e1da41b2a9fb8a3b9bde9557deac80e9ba SHA256 cc8cb5ba25b5ff806942b36e7a3150b8fe833805865ca7f9edcb12ca4c8c1df9
 DIST httping-1.4.4.tgz 14372 RMD160 8ac17577a43f01f2ca97728452eef74eaeb0428a SHA1 f74604d3ad5a1f1a68a483ccb40bd5bb0b280262 SHA256 f00da30e0744d86ed832f6a49ae455b9447570af3589e1111a1c6210a51cafee
 DIST httping-1.5.1.tgz 15342 RMD160 4cd7fe99c156da07f85d693c1ae0c5bdcae59884 SHA1 9dd4a731ef91c8b0252c99f45eb7f672e7c989ce SHA256 a5496515883a7708c348d7f124eaac5bf7039feba2a3c8a7c30fd3a80a042504
 EBUILD httping-1.4.4.ebuild 926 RMD160 3f98b6b3b0adf36baa85d1045dabb5877acdb2af SHA1 cc9529348831e238f0bb53f251f55f93953bcefb SHA256 d0ce1b7866085c3ea076a368717598c374db136eb411acef761041920c980173
+EBUILD httping-1.5.1-r1.ebuild 919 RMD160 da5fc0766b5fd6881a53914bf833eef73889e312 SHA1 071cdbcbe91f332a534df59f01284d56d51d0212 SHA256 c670e152fb43370cb56a8721f879955d5b01801804049a5e4c8ae34744eb2c27
 EBUILD httping-1.5.1.ebuild 854 RMD160 63ee38062a2060d913d4394ea477a642be9d5559 SHA1 9558af9fa8fa3d2ab6291fa842d3e01f31f0fe39 SHA256 93f0dac8b2d998efb3cc632306a0366adb514d423046069212a7ce129382443c
-MISC ChangeLog 8430 RMD160 e8c7ca3f40d43499a5ed0967ebbb8e2fcef7a4a8 SHA1 b09a216cefac66bd45e4657d7a876f82e84092ee SHA256 685e0d4ae8380775c8ffebb4e4a44fa7183686290a5bfdabaf8d03fceb751aa0
+MISC ChangeLog 8635 RMD160 f5f6d40c2c09e405a2fdc407767ccf8dcbc9faf3 SHA1 a3f7a1a355419cb2bfa76086fd5bd75dc58ab35c SHA256 c1a2a0be3584df5ff94602d26177ca59884220169d44a1fe468c030cd71c3e3f
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/httping/files/httping-1.5.1-bind.patch b/net-analyzer/httping/files/httping-1.5.1-bind.patch
new file mode 100644
index 000000000000..f7f7cc73f09d
--- /dev/null
+++ b/net-analyzer/httping/files/httping-1.5.1-bind.patch
@@ -0,0 +1,21 @@
+Patch from upstream developer Folkert van Heusden, to fix bind (-y) issue.
+https://bugs.gentoo.org/show_bug.cgi?id=367537
+
+--- httping-1.5.1/main.c	2011-07-27 23:33:34.000000000 +0400
++++ httping-1.5.1/main.c	2011-08-01 09:30:11.000000000 +0400
+@@ -350,6 +350,7 @@
+ 					{
+ 						bind_to = (struct sockaddr_in *)&bind_to_6;
+ 						memset(&bind_to_6, 0x00, sizeof(bind_to_6));
++						bind_to_6.sin6_family = AF_INET6;
+ 
+ 						if (inet_pton(AF_INET6, optarg, &(bind_to_6.sin6_addr)) != 1)
+ 						{
+@@ -360,6 +361,7 @@
+ 					{
+ 						bind_to = (struct sockaddr_in *)&bind_to_4;
+ 						memset(&bind_to_4, 0x00, sizeof(bind_to_4));
++						bind_to_4.sin_family = AF_INET;
+ 
+ 						if (inet_pton(AF_INET, optarg, &(bind_to_4.sin_addr)) != 1)
+ 						{
diff --git a/net-analyzer/httping/httping-1.5.1-r1.ebuild b/net-analyzer/httping/httping-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..8b8e70d01fb0
--- /dev/null
+++ b/net-analyzer/httping/httping-1.5.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.5.1-r1.ebuild,v 1.1 2011/08/03 11:27:32 pva Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/_beta1/beta}"
+
+DESCRIPTION="http protocol ping-like program"
+HOMEPAGE="http://www.vanheusden.com/httping/"
+SRC_URI="http://www.vanheusden.com/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ssl"
+
+RDEPEND=">=sys-libs/ncurses-5
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch ${FILESDIR}/${P}-bind.patch
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		$(use ssl && echo SSL=yes || echo SSL=no) \
+		$(use debug && echo DEBUG=yes || echo DEBUG=no)
+}
+
+src_install() {
+	dobin httping
+	doman httping.1
+	dodoc readme.txt
+}