Fix network connect bug (as seen with .tel domains) #276751 by DEMAINE Benoît-Pierre, aka DoubleHP.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 78 insertions, 17 deletions

diff --git a/net-misc/jwhois/ChangeLog b/net-misc/jwhois/ChangeLog
index 49a38cb05f74..ec20571e8660 100644
--- a/net-misc/jwhois/ChangeLog
+++ b/net-misc/jwhois/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/jwhois
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/ChangeLog,v 1.35 2012/06/14 13:27:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/ChangeLog,v 1.36 2012/08/18 05:24:08 vapier Exp $
+
+*jwhois-4.0-r1 (18 Aug 2012)
+
+  18 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/jwhois-4.0-connect-logic.patch, +jwhois-4.0-r1.ebuild:
+  Fix network connect bug (as seen with .tel domains) #276751 by DEMAINE Benoît-
+  Pierre, aka DoubleHP.
 
   14 Jun 2012; Agostino Sarubbo <ago@gentoo.org> jwhois-4.0.ebuild:
   stable for amd64
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index d870ecfc5982..c5a1022a9141 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,21 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX jwhois-3.2.3-whois-de.patch 462 RMD160 65cf54dcf9d70b9a47d799c1c0387b59ae5ccbdb SHA1 3b0c5281e113d6f1be5915bb7864f147aacc24bb SHA256 cb6dba5ea51fc39e444daa00b8476f97138afbce2ea331ee20e1896a941f1b73
-DIST jwhois-3.2.3.tar.gz 430792 RMD160 32624b5472beb7cc383f2cf46cb3be7800ad41db SHA1 8965bab3a8fc9bdab31b5a2209f888cb189fb21b SHA256 ada17cb751ec09f91d4f22938bf9a83e7cc548f2cfce09fcc00101c142583f24
-DIST jwhois-4.0.tar.gz 493007 RMD160 552a61a17c2c4af8c1a5e7cd12e2e0f40d9f7dc8 SHA1 4bd4a35cb0c2593284e7ef161f533a8184645174 SHA256 fa9bb86782b915c6d730bb723f876dc9b345a617db375aaf3416ec22553cd64e
-EBUILD jwhois-3.2.3-r1.ebuild 849 RMD160 c10be71f57d468b26d877df6ed5f8814622a0d7f SHA1 08e0d60619f36a05113be70e6b94719bc820bd55 SHA256 f4557665d91c4b5fb6a88b0a88519b36e471e8f37dfa04e020cf98dd05f79002
-EBUILD jwhois-4.0.ebuild 791 RMD160 d0dab2e0c3e4bfb4f32832177b6b5cb56aef7520 SHA1 9fcd2c62abadd9308aeba3e94e2f36669fba888a SHA256 c6b3e5a49570534d36f14fa443a488b41d439d9af614f43c1fac18d117e8573a
-MISC ChangeLog 4055 RMD160 ffc4973959733a9b711ddc2f049a8cba1f4a67ab SHA1 31e3aa1b595c962c624b6c91fc0c164db102bed6 SHA256 4df4fe96f9ecaa13be78cc2bd81d949873feaccd89b193e8af068934930cf095
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+AUX jwhois-3.2.3-whois-de.patch 462 SHA256 cb6dba5ea51fc39e444daa00b8476f97138afbce2ea331ee20e1896a941f1b73 SHA512 19777491b1fc46df06cb54e136cb7faff595e4524c65f79e887b326cec7cd50e9b90014a30de4c436f711e324124bb39761b1bf24fb738e11174f857783e010c WHIRLPOOL 86fe99816d3377eb9ac443303af1bd7251c52472453cc6254125f21d8de2621b1dfe485bf4bb0c0927cde9c6b4728bf0c011d3496cc566f71d97755ad048493a
+AUX jwhois-4.0-connect-logic.patch 425 SHA256 b4d2c51e604b3f50bf0ca1a11cd33cbb2ac8710efe31dcffc28890c4bd09a7ec SHA512 f4a8a79136c98bd68e993a7819afa307ba244ecd9e33c08c7639012f392312f439c2256f7e8da26f5e22afeed916e8c6ff24d9a0a595d8fd4e8a6867c2d13033 WHIRLPOOL f0f4518a3f46aa2fe678a91915dbe204de760f8af7abd9362fd938e02dca65ac6abbb853b1983f6c8914a1592022920da954285a5bb639f76556b5555d2a09b0
+DIST jwhois-3.2.3.tar.gz 430792 SHA256 ada17cb751ec09f91d4f22938bf9a83e7cc548f2cfce09fcc00101c142583f24
+DIST jwhois-4.0.tar.gz 493007 SHA256 fa9bb86782b915c6d730bb723f876dc9b345a617db375aaf3416ec22553cd64e SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae WHIRLPOOL 9584e765df94bddaf4ac705e0b487e8ee5533374a633cb3ead2178189bfe16b7c7ee572b58e5f724097342599851afbdf3a3c96a687c6427e6f16d46fa96ab4a
+EBUILD jwhois-3.2.3-r1.ebuild 849 SHA256 f4557665d91c4b5fb6a88b0a88519b36e471e8f37dfa04e020cf98dd05f79002 SHA512 a2142c9bb9ba6e766c80880440f376cabacf84b48409f94ba57f3ce919c3077bf6e5c0c4df0f2e213f8cc06c6ee1dc382d7fa05ed460368520641379be46675c WHIRLPOOL b54bdc6a3efb1ea233eda6caeaa28f5e19b21fac1c99721d7ecba1356179168403d0ad72336b56fd8be96e4c1c79d0b04c89a20d3d1605b77f71e59b048659ab
+EBUILD jwhois-4.0-r1.ebuild 793 SHA256 eae3e70e4bef645926656a3a29a3c65874e93951d98f021d8f970becfe7ea0df SHA512 9a8a3abb3da5a6357b4a32656ab1ac318f6c8f11ce4dd65b698edb34e67e0d0a7c115ff5b19cd54dc34b4aba6b30bd733b29305c0ba0fc444d7e75c2de6e16d6 WHIRLPOOL 7a065f8d0c21e3cf4175244b2f0e0f61ee325e1e87e463aa58ec167ceb98a3b3e3521cd3643dde737fa78411bb9e1fda46387f394805c5099e927371437eb732
+EBUILD jwhois-4.0.ebuild 791 SHA256 c6b3e5a49570534d36f14fa443a488b41d439d9af614f43c1fac18d117e8573a SHA512 b14c46f464c3a80bdcf4692f446dfc8e67320c5b6e2fa9ca56bbf98b2a55496d71c7473ea7f82d94239c5e944e1400c48d07eca8c30fac37e4bce6147db1f266 WHIRLPOOL 3cfd50c4be303f8a1d69a8864700c958f2eca70ec98d901899192a2d198026c9caeaa7211e6941614a6797419910b2770a38c67ceb14bf192033ed3a162fd5de
+MISC ChangeLog 4309 SHA256 89608310681768d547e75cef992e752e5718feeeec87b4d0dcb394d154f1a054 SHA512 54134f5551fe72d0dd6673c822e3a130f5f95c6bc1e81ad5720a1d71129dad50df482dc0aacac6a47910b97c8957e78d3cc46b789b835417575f0e1ff69c4474 WHIRLPOOL 841c1fb7e571193641d22ce9fa844cb73b88b40b0ab8aa8acad3b57714239769ab53f09794346fb2244a157e4878eef50448ae095f7384a25adf817473d18565
+MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP2eawAAoJEOTDgjZ80txdqyEIAJfQ5JkpUwI8eI40ZCqdRhbo
-/1zqB3ol/rxlehDX4keVyrg1LSO+V2GQK7V+NvC7RkK/7egndvh/cP4eNOl79QCJ
-CIVrpriQTqpNaVhHWhH8BfR2a+x31MpXu6voKZMGlFKPrK9xMnk41gmFD7yd6cf9
-DGdvIQyBF2eU00FnJaxlYkGvFkf/twBAk2GHQXVBU9OOtUzkCCBrBlQi3eyEtW0b
-Yn/hZ0W670es5hTxr+2as8jX2fQKs8D2AbceULgvKeNEyejtZEW0/ZyV3KLz2Uxq
-OLOSq5fw/TqE/mWCS5H1Jnrh87CvZklXxmz274iP0avEaGJZNiKgaPsQF0lLAg8=
-=o64O
+iQIcBAEBCAAGBQJQLycDAAoJELEHsLL7fEFWzzQP/3a8dfUFbqvTVNu8+FuAKv5y
+Z0Q/repq49P2Pjg4X8B8fzpocEEo8xnbS3AyP5Ve6BgTxJ9LAZ+MpEW0SvRGbcdD
+xNjw6eqO0NBJX7z64I9ImvVEqYjtH5BYI/vNESoEOIfwe5fkm6HvExdbqxEeN9Pg
+6DFKAbqDaOa8Fkri4ItZP17v0z0ylc9qVMJZFgZMAMZ7pW6wf7E8mc09Cy2nDDiy
+A13ObkuAxJQHy7NDNnS7u01OKmdZQ05atFUGORUCbZP/SkMcT8D60p8aSPBezhOz
+Fa+oyfTjUP96rydwveWL+4uGvTxTa+m4k2VjfmQKpJV3w9tg2Cssr1nYMAlqlFhq
+73rAp5jehhulA+aQlGavnZ7A8O5YEm49sOqFATVEMvwiK3KttckE4SBLuLljFjYH
+IuM2XM1nrXJU3ODj+CKzFRUWdIsxJMZCqGugskjYMTCm4P1uwHCmY0IJaX31ZvQy
+tSJVJB+t69LVsKPBqMAlaXvXi93T8xW6j3ZpRlClG781h2fB/zyv5eTG0kvI1mt0
+J4ImtLq8CutvS/ct0D1ZmwsU2iFQo+LPJ2gqmNHgD/JiR0HMys0ti1H7mG1L+9bX
+p5nQdYKtvSjkicTzEACgP1ARjk2HSf4m3gKR3M5j1v2SnQ8cKhAzhCaCpUJmUycS
+b3qKczCAgfp+8/Ew5VrO
+=bGAQ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/jwhois/files/jwhois-4.0-connect-logic.patch b/net-misc/jwhois/files/jwhois-4.0-connect-logic.patch
new file mode 100644
index 000000000000..315b3c9826b0
--- /dev/null
+++ b/net-misc/jwhois/files/jwhois-4.0-connect-logic.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/276751
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542148
+https://savannah.gnu.org/bugs/index.php?37135
+
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -288,7 +288,7 @@ make_connect(const char *host, int port)
+ 
+       retlen = sizeof(retval);
+       error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen);
+-      if (error < 0 || retval)
++      if (error == 0 && !retval)
+ 	{
+ 	  break;
+ 	}
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
new file mode 100644
index 000000000000..7f77f616aece
--- /dev/null
+++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/jwhois-4.0-r1.ebuild,v 1.1 2012/08/18 05:24:08 vapier Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
+HOMEPAGE="http://www.gnu.org/software/jwhois/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="idn nls"
+
+RDEPEND="idn? ( net-dns/libidn )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-connect-logic.patch #276751
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var/cache \
+		--without-cache \
+		$(use_enable nls) \
+		$(use_with idn libidn)
+}