rpms/ORBit2/FC-5 ORBit2-2.14.3-non-local-ipv4.patch, NONE, 1.1 ORBit2.spec, 1.35, 1.36

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/ORBit2/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9504

Modified Files:
	ORBit2.spec 
Added Files:
	ORBit2-2.14.3-non-local-ipv4.patch 
Log Message:
fix a bug introduced in 2.14.3


ORBit2-2.14.3-non-local-ipv4.patch:
 linc-connection.c |   36 ------------------------------------
 1 files changed, 36 deletions(-)

--- NEW FILE ORBit2-2.14.3-non-local-ipv4.patch ---
--- ORBit2-2.14.3/linc2/src/linc-connection.c.non-local-ipv4	2006-09-10 14:43:46.000000000 -0400
+++ ORBit2-2.14.3/linc2/src/linc-connection.c	2006-09-10 14:44:00.000000000 -0400
@@ -495,27 +495,6 @@
 	CNX_UNLOCK (cnx);
 }
 
-static unsigned long
-get_inet_addr (const char *str)
-{
-        struct hostent *hp;
-        struct in_addr *addr_ptr;
-        unsigned long addr;
-
-        if (isdigit (*str)) {
-                        addr = inet_addr (str);
-                } else {
-                        if ((hp = gethostbyname (str)) != NULL) {
-
-                                addr_ptr = (struct in_addr *) hp->h_addr;
-
-                                addr = inet_addr (inet_ntoa (*addr_ptr));
-                        }
-                }
-
-        return addr;
-}
-
 static gboolean
 link_connection_do_initiate (LinkConnection        *cnx,
 			     const char            *proto_name,
@@ -535,21 +514,6 @@
 	if (!proto)
 		return FALSE;
 
-	if (host && (strcmp (proto_name, "IPv4") == 0)) {
-		
-		const char *local_host;
-		local_host = link_get_local_hostname ();
-
-		if (strcmp (host, local_host)) {
-			unsigned long inet_addr_host, inet_addr_local_host;
-			inet_addr_host = get_inet_addr (host);
-			inet_addr_local_host = get_inet_addr (local_host);
-
-			if (inet_addr_host != inet_addr_local_host)
-				return FALSE;
-		}
-	}
-
 	saddr = link_protocol_get_sockaddr (
 		proto, host, service, &saddr_len);
 


Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/FC-5/ORBit2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ORBit2.spec	8 Sep 2006 13:45:16 -0000	1.35
+++ ORBit2.spec	10 Sep 2006 18:45:19 -0000	1.36
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
 Version: 2.14.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -15,6 +15,9 @@
 BuildRequires: pkgconfig >= 0.14
 BuildRequires: gtk-doc >= 1.1
 
+# fixed in upstream cvs
+Patch0: ORBit2-2.14.3-non-local-ipv4.patch
+
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker 
 Architecture) ORB (object request broker). It allows programs to 
@@ -48,6 +51,7 @@
 
 %prep
 %setup -q
+%patcho -p1 -b .non-local-ipv4
  
 %build
 ## the shipped libtool is broken wrt. multilib
@@ -94,6 +98,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sun Sep 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-2
+- Make non-local IPv4 work again (#205950)
+
 * Fri Sep  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1
 - Update to 2.14.3