rpms/bzflag/devel bzflag-2.0.2-lookup.patch, NONE, 1.1 bzflag.spec, 1.10, 1.11

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22190

Modified Files:
	bzflag.spec 
Added Files:
	bzflag-2.0.2-lookup.patch 
Log Message:
apply name lookup patch


bzflag-2.0.2-lookup.patch:

--- NEW FILE bzflag-2.0.2-lookup.patch ---
--- bzflag-2.0.2.20050318/src/net/Address.cxx.lookup	2005-04-07 15:59:16.352779078 +0200
+++ bzflag-2.0.2.20050318/src/net/Address.cxx	2005-04-07 16:18:15.328900190 +0200
@@ -152,6 +152,8 @@
   int j;
 
   struct hostent* hent;
+  struct hostent myhostent;
+
   if (hname == "") {				// local address
     char hostname[MAXHOSTNAMELEN+1];
     if (gethostname(hostname, sizeof(hostname)) >= 0)
@@ -181,7 +183,23 @@
     }
 #endif
 
-    hent = gethostbyname(hname.c_str());
+    // hent = gethostbyname(hname.c_str());
+    {
+    const char *hn = hname.c_str() ;
+    char  buf[1024] ;
+    int   my_herrno = 0;
+
+    memset(&myhostent, 0, sizeof(myhostent)) ;
+    hent = 0 ;
+
+    if(gethostbyname2_r (hn, AF_INET, &myhostent, buf,sizeof(buf), 
+                       &hent, &my_herrno) != 0) {
+      sprintf(buf,"gethostbyname2_r failed %d", my_herrno) ;
+      printError(buf) ;
+    }
+    }
+
+    // hent = gethostbyname2(hname.c_str(), AF_INET);
 
 #if !defined(_WIN32)
     if (oldAlarm != SIG_ERR) {


Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bzflag.spec	7 Apr 2005 12:10:58 -0000	1.10
+++ bzflag.spec	7 Apr 2005 14:37:16 -0000	1.11
@@ -8,8 +8,9 @@
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
-Source: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
+Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
+Patch0: bzflag-2.0.2-lookup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-devel
 BuildRequires: libGL-devel
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?date:.%{date}}
+%patch0 -p1 -b .lookup
 
 %build
 # Use PIE because bzflag/bzfs are networked server applications
@@ -72,6 +74,7 @@
 - build with adns
 - build require libGL-devel and libGLU-devel to hopefully resolve building
   problems
+- apply name lookup patch
 
 * Wed Mar 23 2005 Nils Philippsen <nphilipp at redhat.com>
 - work around missing dependency in xorg-x11-devel