Finally fixed test failure on ppc64 and marking it stable, bug #244256. Thank Brent Baude for hardware access.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686

4 files changed, 47 insertions, 5 deletions

diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog
index 1236763000a8..82dd90b73600 100644
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/geoip
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.95 2008/10/26 12:24:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.96 2008/12/28 18:20:32 pva Exp $
+
+  28 Dec 2008; Peter Volkov <pva@gentoo.org>
+  +files/geoip-1.4.5-ppc-fix.patch, geoip-1.4.5.ebuild:
+  Finally fixed test failure on ppc64 and marking it stable, bug #244256.
+  Thank Brent Baude for hardware access.
 
   26 Oct 2008; Raúl Porcel <armin76@gentoo.org> geoip-1.4.5.ebuild:
   alpha/ia64/sparc/x86 stable wrt #244256
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 962acf18c8d8..7d36534188ad 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,8 +1,9 @@
 AUX geoip-1.4.4-no-noinst_PROGRAMS.patch 1988 RMD160 41102282753cb980f17d382e8cd66902c33361d7 SHA1 9f4d36ab6d608c34aaffcc36b8c7ff9d934cc5e3 SHA256 3e2f0eaacdc6bf50b333270f977453cd751f13ebfc21b60d6266a85e9c432506
 AUX geoip-1.4.4-parallel-build.patch 2205 RMD160 81f95433811d8d4b90ab3d04572352aa173413eb SHA1 6386bdde567cd2468efec8c70388a147f8549745 SHA256 3bfdc6b64ed48164ef8ff73e4c330f56685d592abf05710174f6da8b9002a987
+AUX geoip-1.4.5-ppc-fix.patch 962 RMD160 734c9a07d9124173a7f18e89ad8418e24b3b5304 SHA1 9068810dfa2478235105e1b3e359ba6d2780d765 SHA256 600ee9897140adc27a08ac1daa2631aad5ffb622c319468027070f6d095976cd
 DIST GeoIP-1.4.4.tar.gz 944698 RMD160 4aa31840ec6496647551c6e12c9c5e32dceed426 SHA1 4a2937e7a8fc7c26aa88c0678791246b58d81d02 SHA256 a5b2ee9298eaf8c160ccab5b3e2ecc1c38cf67d9dd4e97419427f89d08cfb78e
 DIST GeoIP-1.4.5.tar.gz 986844 RMD160 70c99570146e8bc3b9cfa68bc8ca25c282666907 SHA1 f8ac0c8ac113a3d8def8f93f7255ef0bbff34814 SHA256 cd62034fe0206be243cbb43723520987978d8e55ee61872f34fd60a31f5c6b18
 EBUILD geoip-1.4.4.ebuild 996 RMD160 90033aec261f93916f9f716705d01927debabb77 SHA1 c5098db9f72fc15abea4c5900bf5acfcf171f255 SHA256 ce98245548edc3e4b133232ba381def99b5d4750905106f3981f807e85eb254f
-EBUILD geoip-1.4.5.ebuild 1169 RMD160 c6b81b80a5a7be8535dc8afb8ef44b98ac050a7f SHA1 830f37fc66c8bde6d3298da1d2b86728ba276f1f SHA256 9f0808a887bf4c14c4d57ea462c4e5993094d690eab28ea468fa8115245d9e43
-MISC ChangeLog 11888 RMD160 a2ea6a2f7358d3cb77093cba26bb22a48f94d2fb SHA1 02b80c008ed3130b3a18dfb8362e1ffb5bc1aac7 SHA256 7b3f7ebc1575b3fa7e3c1fe079dc37587adf17257a2d3d9b4e4ee1bdfbf7174a
+EBUILD geoip-1.4.5.ebuild 1205 RMD160 d4791cb702b5694ebb59455162e84f50290b36c2 SHA1 db14885375cf20bc434c445564e2ac4678d2af4e SHA256 41697d6729c1c4b8cae9b8626707d1c6bc16905391d3f9854d8b17f078ae7d47
+MISC ChangeLog 12101 RMD160 1efa2fc70ef297ddfab35cd8fc775062cf843e97 SHA1 3427d852f4d9dd9cfb44262cabc08d90187abfea SHA256 7332da8db92897c221e2895cb0867bdfa11eeb22a8c523505e1e93de99a6825c
 MISC metadata.xml 277 RMD160 a6bd0a35777e017f79890c0e0947cba8435b40ea SHA1 fed8c3fe1e00a1388e3df0430d59a75d8721395e SHA256 18a7e85115c3f66c1686d6dca5efed20d16700a57bdd738222976f174d46a508
diff --git a/dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch b/dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch
new file mode 100644
index 000000000000..423c0712f797
--- /dev/null
+++ b/dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch
@@ -0,0 +1,35 @@
+Status of this patch: Reported upstream.
+
+The following assignment in libGeoIP/GeoIP.c is broken on ppc64:
+  addr = *((unsigned long *) phe->h_addr_list[0]);
+
+phe->h_addr_list[0] on linux has type in_addr_t which is defined as:
+  typedef uint32_t in_addr_t;
+
+On ppc64 sizeof(unsigned long) is 8 (!= 4, sizeof(uint32_t)). This code works
+on amd64 as it's little endian, while it became broken on big endian ppc64
+systems.
+
+
+--- libGeoIP/GeoIP.c	2008-12-28 17:36:55 +0000
++++ libGeoIP/GeoIP.c	2008-12-28 17:37:41 +0000
+@@ -811,8 +811,7 @@
+ 			buflength = buflength * 2;
+ 			buf = realloc(buf,buflength);
+ 		}
+-#endif
+-#ifndef HAVE_GETHOSTBYNAME_R
++#else
+ 		/* Some systems do not support gethostbyname_r, such as Mac OS X */
+ 		phe = gethostbyname(host);
+ #endif
+@@ -820,7 +819,7 @@
+ 			free(buf);
+ 			return 0;
+ 		}
+-		addr = *((unsigned long *) phe->h_addr_list[0]);
++		addr = *((in_addr_t *) phe->h_addr_list[0]);
+ 	}
+ #ifdef HAVE_GETHOSTBYNAME_R
+ 	free(buf);
+
diff --git a/dev-libs/geoip/geoip-1.4.5.ebuild b/dev-libs/geoip/geoip-1.4.5.ebuild
index de77b0e7d7ff..eed7385c15d1 100644
--- a/dev-libs/geoip/geoip-1.4.5.ebuild
+++ b/dev-libs/geoip/geoip-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.5.ebuild,v 1.5 2008/10/26 12:24:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.5.ebuild,v 1.6 2008/12/28 18:20:32 pva Exp $
 
 inherit autotools eutils libtool
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz"
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
@@ -23,6 +23,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-1.4.4-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-1.4.4-no-noinst_PROGRAMS.patch
+	epatch "${FILESDIR}"/${P}-ppc-fix.patch
 	eautoreconf
 	# FreeBSD requires this
 	#elibtoolize