[gentoo-commits] gentoo-x86 commit in dev-libs/geoip/files: geoip-1.4.5-ppc-fix.patch

[Peter Volkov (pva)]

pva         08/12/28 18:20:32

  Added:                geoip-1.4.5-ppc-fix.patch
  Log:
  Finally fixed test failure on ppc64 and marking it stable, bug #244256. Thank Brent Baude for hardware access.
  (Portage version: 2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686)

Revision  Changes    Path
1.1                  dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/geoip/files/geoip-1.4.5-ppc-fix.patch?rev=1.1&content-type=text/plain

Index: geoip-1.4.5-ppc-fix.patch
===================================================================
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);