mico-2.3.13-r5: try to find bug#343827 via extra patch upon USE=findbug

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

5 files changed, 75 insertions, 9 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index a4dacd759e01..bb1faa9df373 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mico
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.34 2011/05/26 20:47:56 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.35 2011/06/29 11:44:04 haubi Exp $
+
+  29 Jun 2011; Michael Haubenwallner <haubi@gentoo.org>
+  +files/find-bug343827.patch, mico-2.3.13-r5.ebuild, metadata.xml:
+  try to find bug#343827 via extra patch upon USE=findbug
 
   26 May 2011; Michael Haubenwallner <haubi@gentoo.org> mico-9999.ebuild:
   err, do not try to trigger the description problem
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index e6264f862a04..7d52d355661d 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX find-bug343827.patch 1682 RMD160 8739dc6e32e348445a9c7525ca633180420b3ee1 SHA1 de11d77241feb4036189a57409d9a956a9ad3a23 SHA256 65a3fdd6343305b7965a2ef6182e5b99b23209b89cc7db6fc5b5b13f20c2d0b1
 DIST mico-2.3.13-gentoo-patches-0.1.tar.bz2 10142 RMD160 d881d21a8d9bb65b46b086d52c55a5f99f135fa5 SHA1 e4fb0fe33d149151f03f9314863158a23ebc2b2c SHA256 87a4d2440ac4ff78054f4435df4f1ebb7a26ece8b31a708ed2a4aafa833b7205
 DIST mico-2.3.13-gentoo-patches-0.2.tar.bz2 8870 RMD160 0e838aee0d4dc34ea64843aa248790e391570744 SHA1 d4c0288f8ef6534d20fd63c0ca6e2dc26060b489 SHA256 344a7cf4a863476b5d7e630566e0d9fe592bc0329a5815e8d77a1cade2b72f61
 DIST mico-2.3.13.tar.gz 3269814 RMD160 70c8b9e68deac853ed2a28f48cd719bdef4e60fb SHA1 ee0138deb4d9ad0a50fe18e0b2add99fb5831c93 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
 DIST mico-9999-gentoo-patches-20110526.tar.bz2 8718 RMD160 3c3f191983fe5cc367f1de9d031059e877f9852a SHA1 8e87600ef92e42423a03f736982df52b57de5ad5 SHA256 de8295b480cc21cdb01f5a6b35010c51e82ddf130564dd941a8be9b3f0a1885b
 EBUILD mico-2.3.13-r4.ebuild 3943 RMD160 36ae94175783c3fbe441e0dffcefe579bd886dde SHA1 ecc3e513c59352a1f2407af9322a26505901bef0 SHA256 b3d51067ae3e7782de202fa9ab98741053ac0e134a9f93bc4f76a830e8c0726f
-EBUILD mico-2.3.13-r5.ebuild 3797 RMD160 bdaa0b328278d4ab4598eae31c34810874685bcc SHA1 9c84c7720e9f4ef7293083aced0e1a7ae18da59e SHA256 6249efeb143b74d704710217de8a55f993bb5f6baaa061a055e27d58b26717b9
+EBUILD mico-2.3.13-r5.ebuild 3948 RMD160 86690ca988448804cb62290c6802090d1140009d SHA1 3ef2358f9ac10f8af67002992447773e9fd83137 SHA256 b5e0ff30a1f9370b101ff56eafc11e72c733b71592addaca9d10086253c1b5fd
 EBUILD mico-9999.ebuild 3895 RMD160 0aa373fe72c498a4540c55a64788a1a95c589e38 SHA1 f2c7946d2831438b075b1ca412ad75e366a1950e SHA256 22d4ab2eacc3b0a07bf5225f750acf9cd03c1a057b78944221015ae1acad833d
-MISC ChangeLog 4218 RMD160 5da8f4e008eff3a56f1f7a445b04e7941304cafa SHA1 88dfa66bf4ebaa9ac378f8a37cc87e303b37a3a5 SHA256 28576d2707f7bee1cafb1542a77baad02738156b5414a2dbb585f6b5c84d4acc
-MISC metadata.xml 640 RMD160 7c861b35cb15bad094830b9e83d0077fb7177a4b SHA1 5426b40b5f7a464c4a4577bef86ab0fcd1be117f SHA256 1f8be72dd1c133d7a282c5e5564466680dff87ed0c5daf688b6dca00327d9f85
+MISC ChangeLog 4401 RMD160 7328eaffe6e6c13e513e78fe1ad70c0023af770d SHA1 026bda562cd4146b2c9395a00235ab4d6cba1106 SHA256 a811e9e417255342bfac7244156dbe32fb0746b0c6da963cee233a01170534f1
+MISC metadata.xml 723 RMD160 d5b7e623d8c7cbb9d8e18dc60e38ecfa5475ef14 SHA1 32e768a470dd7d26fa0596c46fdf1c239ca6f9a2 SHA256 e4e81d6ed16b0b8df2bf0337ecd57161362e9139390eaa6c304b823483cfe18f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3evIYACgkQLc0TWKYwzLi6UwCgmWbeCCfIM3btugG9nPYT8zBd
-txEAnj5q32eClqkecXTcDxJKR2TMwc3f
-=izzx
+iEYEARECAAYFAk4LEBEACgkQLc0TWKYwzLgcJQCgpVAbdYyVGrr/im2nV+LnfDbh
+fL8AoKfGe+9Gp5E+CnP/2u5B3VhlvQGb
+=N30J
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mico/files/find-bug343827.patch b/net-misc/mico/files/find-bug343827.patch
new file mode 100644
index 000000000000..df4c8cce21eb
--- /dev/null
+++ b/net-misc/mico/files/find-bug343827.patch
@@ -0,0 +1,51 @@
+--- orb/address.cc.orig	2011-06-28 17:22:58.275355766 +0200
++++ orb/address.cc	2011-06-28 17:46:12.268357549 +0200
+@@ -269,21 +269,30 @@
+ {
+     if (_ipaddr.size() > 0)
+ 	return TRUE;
+-    if (_host.length() == 0)
++
++    if (_host.length() == 0) {
++::std::cerr << "for gentoo bug#343827: resolve_ip() detected _host.length() == 0, failed." << ::std::endl;
+ 	return FALSE;
++    }
+ 
+     InetAddress &me = (InetAddress &)*this;
+ 
++::std::cerr << "for gentoo bug#343827: resolve_ip() for hostname '" << _host << "' using ::inet_addr()...";
++
+     CORBA::ULong addr = ::inet_addr ((char *)_host.c_str());
+     if (addr != (CORBA::ULong)-1L || _host == string("255.255.255.255")) {
+ 	me._ipaddr.insert (me._ipaddr.begin(),
+ 			   (CORBA::Octet *)&addr,
+ 			   (CORBA::Octet *)&addr + sizeof (CORBA::ULong));
++::std::cerr << " succeeded." << ::std::endl;
+ 	return TRUE;
+     }
++::std::cerr << " failed, using ::gethostbyname() ";
+ #ifndef HAVE_THREADS
++::std::cerr << "without threads...";
+     struct hostent *hent = ::gethostbyname ((char *)_host.c_str());
+ #else // HAVE_THREADS
++::std::cerr << "with threads...";
+     struct hostent* hent = NULL;
+     {
+         MICOMT::AutoLock lock(S_netdb_lock_);
+@@ -293,6 +302,7 @@
+         me._ipaddr.insert (me._ipaddr.begin(),
+                            (CORBA::Octet *)hent->h_addr,
+                            (CORBA::Octet *)hent->h_addr + hent->h_length);
++::std::cerr << " succeeded." << ::std::endl;
+         return TRUE;
+     }
+ #ifdef HAVE_THREADS
+@@ -305,6 +315,8 @@
+ 	<< "Warning: cannot resolve hostname '" << _host
+ 	<< "' into an IP address." << endl;
+     }
++
++::std::cerr << " failed." << ::std::endl;
+     return FALSE;
+ }
+ 
diff --git a/net-misc/mico/metadata.xml b/net-misc/mico/metadata.xml
index 12c76754a6be..e99010bd661c 100644
--- a/net-misc/mico/metadata.xml
+++ b/net-misc/mico/metadata.xml
@@ -13,5 +13,8 @@
 		renowned for its market-leading security features, its great
 		user-friendliness, and its full standard-compliance.
 	</longdescription>
+	<use>
+		<flag name="findbug">Adds patch to help finding bug#343827</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/net-misc/mico/mico-2.3.13-r5.ebuild b/net-misc/mico/mico-2.3.13-r5.ebuild
index 95f0f9a9fec5..18a587a2c345 100644
--- a/net-misc/mico/mico-2.3.13-r5.ebuild
+++ b/net-misc/mico/mico-2.3.13-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild,v 1.1 2011/05/26 09:46:17 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r5.ebuild,v 1.2 2011/06/29 11:44:04 haubi Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ PATCH_VER=0.2
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
+IUSE="gtk postgres qt4 ssl tcl threads X findbug"
 RESTRICT="test" #298101
 
 [[ -z ${PATCH_VER} ]] || \
@@ -42,6 +42,8 @@ S=${WORKDIR}/${PN}
 src_prepare() {
 	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
 
+	use findbug && epatch "${FILESDIR}"/find-bug343827.patch
+
 	eautoreconf
 
 	# cannot use big TOC (AIX only), gdb doesn't like it.
@@ -111,6 +113,11 @@ src_configure() {
 	econf ${myconf}
 }
 
+src_compile() {
+	use findbug && export EXTRA_EMAKE="${EXTRA_EMAKE} -j1"
+	default
+}
+
 src_install() {
 	emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: || die "install failed"