Wed Feb 13 19:36:48 2008 UTC ()
update to 2.14.12
changes:
-Fix off by one in all method name lengths. Fixes interoperability
 with other ORBs
-Fix the build with glib 2.15

pkgsrc fix: don't touch _res (resolver state) on NetBSD, it is
not thread safe


(drochner)
diff -r1.60 -r1.61 pkgsrc/net/ORBit2/Makefile
diff -r1.39 -r1.40 pkgsrc/net/ORBit2/distinfo
diff -r1.3 -r0 pkgsrc/net/ORBit2/patches/patch-ad
diff -r0 -r1.1 pkgsrc/net/ORBit2/patches/patch-ae
cvs diff -r1.60 -r1.61 pkgsrc/net/ORBit2/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ORBit2/Makefile 2007/10/31 19:48:32 1.60
+++ pkgsrc/net/ORBit2/Makefile 2008/02/13 19:36:48 1.61
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.60 2007/10/31 19:48:32 drochner Exp $ 1# $NetBSD: Makefile,v 1.61 2008/02/13 19:36:48 drochner Exp $
2# 2#
3 3
4DISTNAME= ORBit2-2.14.10 4DISTNAME= ORBit2-2.14.12
5CATEGORIES= net gnome 5CATEGORIES= net gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit2/2.14/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit2/2.14/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= rh@NetBSD.org 9MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://orbit-resource.sourceforge.net/ 10HOMEPAGE= http://orbit-resource.sourceforge.net/
11COMMENT= High-performance CORBA ORB with C language support 11COMMENT= High-performance CORBA ORB with C language support
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS= linc>=1.1 16CONFLICTS= linc>=1.1
17 17
@@ -39,16 +39,19 @@ CPPFLAGS+= -DINET6 @@ -39,16 +39,19 @@ CPPFLAGS+= -DINET6
39PKGCONFIG_OVERRIDE= ORBit-2.0.pc.in 39PKGCONFIG_OVERRIDE= ORBit-2.0.pc.in
40PKGCONFIG_OVERRIDE+= ORBit-CosNaming-2.0.pc.in 40PKGCONFIG_OVERRIDE+= ORBit-CosNaming-2.0.pc.in
41PKGCONFIG_OVERRIDE+= ORBit-imodule-2.0.pc.in 41PKGCONFIG_OVERRIDE+= ORBit-imodule-2.0.pc.in
42PKGCONFIG_OVERRIDE+= src/idl-compiler/ORBit-idl-2.0.pc.in 42PKGCONFIG_OVERRIDE+= src/idl-compiler/ORBit-idl-2.0.pc.in
43 43
44CPPFLAGS.Darwin+= -DBIND_8_COMPAT 44CPPFLAGS.Darwin+= -DBIND_8_COMPAT
45 45
46PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \ 46PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \
47 { print "@unexec $${RMDIR} %D/" $$2 \ 47 { print "@unexec $${RMDIR} %D/" $$2 \
48 " 2>/dev/null || $${TRUE}"; next; } 48 " 2>/dev/null || $${TRUE}"; next; }
49 49
50BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 50BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
51 51
 52# needs interaction
 53#TEST_TARGRT= check
 54
52.include "../../devel/glib2/buildlink3.mk" 55.include "../../devel/glib2/buildlink3.mk"
53.include "../../net/libIDL/buildlink3.mk" 56.include "../../net/libIDL/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.39 -r1.40 pkgsrc/net/ORBit2/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ORBit2/distinfo 2007/11/26 14:00:41 1.39
+++ pkgsrc/net/ORBit2/distinfo 2008/02/13 19:36:48 1.40
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.39 2007/11/26 14:00:41 tron Exp $ 1$NetBSD: distinfo,v 1.40 2008/02/13 19:36:48 drochner Exp $
2 2
3SHA1 (ORBit2-2.14.10.tar.bz2) = f5d7bbe36562b5daad48b92cc5b17afa12d211ee 3SHA1 (ORBit2-2.14.12.tar.bz2) = 0ae64c5e458c5cadab5af0e22d69ffea25f9f3fb
4RMD160 (ORBit2-2.14.10.tar.bz2) = f6df0bf38218ba0d02e2e332d570cf3e1831ec53 4RMD160 (ORBit2-2.14.12.tar.bz2) = ab535a00dacef3f4a80d685406c0dd115b424207
5Size (ORBit2-2.14.10.tar.bz2) = 734630 bytes 5Size (ORBit2-2.14.12.tar.bz2) = 746309 bytes
6SHA1 (patch-aa) = 6e87e28e3634908f35c219f81a47d0353cfaf551 6SHA1 (patch-aa) = 6e87e28e3634908f35c219f81a47d0353cfaf551
7SHA1 (patch-ab) = 1661eaaa0119895a860e0c667990ea71b80e8ace 7SHA1 (patch-ab) = 1661eaaa0119895a860e0c667990ea71b80e8ace
8SHA1 (patch-ac) = 075a11883b9d0a3ec7d5d93b37007ba64e1baf41 8SHA1 (patch-ac) = 075a11883b9d0a3ec7d5d93b37007ba64e1baf41
9SHA1 (patch-ad) = a6599d163cf577230b310845999cee2d343d7613 9SHA1 (patch-ae) = d92c0c8985be666e6ec60b46ff8007447ffc4275
File Deleted: pkgsrc/net/ORBit2/patches/patch-ad
File Added: pkgsrc/net/ORBit2/patches/patch-ae
$NetBSD: patch-ae,v 1.1 2008/02/13 19:36:48 drochner Exp $

--- linc2/src/linc-protocols.c.orig	2008-01-30 12:08:40.000000000 +0100
+++ linc2/src/linc-protocols.c
@@ -582,14 +582,20 @@ link_protocol_get_sockaddr_ipv4 (const L
 	if ((saddr->sin_addr.s_addr = inet_addr (hostname)) == INADDR_NONE) {
 	        int i;
 
+#ifndef __NetBSD__ /* don't touch global state */
 		LINK_RESOLV_UNSET_IPV6;
 #ifdef HAVE_RESOLV_H
 		if (!(_res.options & RES_INIT))
 			res_init();
 #endif
+#endif /* NetBSD */
 		
                 d_printf("%s:%s:%d:gethostbyname(%s)\n", __FILE__, __FUNCTION__, __LINE__, hostname);
+#ifdef __NetBSD__
+		host = gethostbyname2 (hostname, AF_INET);
+#else
 		host = gethostbyname (hostname);
+#endif
 		if (!host) {
 		  g_free (saddr);
 		  return NULL;