head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.140 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.138 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.136 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.134 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.132 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.130 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.128 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.126 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.124 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.122 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.120 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.118 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.116 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.114 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.112 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.110 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.108 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.106 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.104 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.102 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.100 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.98 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.96 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.92 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.72 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.94 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.90 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.88 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.86 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.84 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.82 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.80 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.78 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.76 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.74 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.70 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.68 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.66 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.64 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.62 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.60 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.58 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.56 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.54 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.52 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.50 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.48 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.46 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.44 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.42 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.40 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.38 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.36 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.34 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.32 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.30 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.28 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.26 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.24 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.22 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.20 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.18 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.16 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.14 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.12 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.10 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.8 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.6 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.4 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.2 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.6.0.14 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.12 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.10 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.8 pkgsrc-2008Q1:1.6.0.6 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.4 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.2 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.4.0.4 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.2 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.1 buildlink2:1.1.0.4 netbsd-1-6:1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.2 pkgviews-base:1.1; locks; strict; comment @# @; 1.7 date 2008.10.09.20.22.23; author wiz; state Exp; branches; next 1.6; 1.6 date 2007.08.05.20.48.48; author joerg; state Exp; branches; next 1.5; 1.5 date 2007.07.28.08.39.35; author wiz; state dead; branches; next 1.4; 1.4 date 2007.02.20.15.08.59; author rillig; state Exp; branches; next 1.3; 1.3 date 2002.10.30.03.09.36; author rh; state dead; branches; next 1.2; 1.2 date 2002.08.25.19.23.10; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.07.18.02.19.40; author rh; state Exp; branches 1.1.4.1; next ; 1.1.4.1 date 2002.07.18.02.19.40; author jlam; state dead; branches; next 1.1.4.2; 1.1.4.2 date 2002.08.22.11.12.01; author jlam; state Exp; branches; next ; desc @@ 1.7 log @Update to 2.14.16: ORBit2-2.14.16 - bug fixes + fix make check on Mac OS/X + The ORBNetID option was not consistent in relation to ORBIIOPIPName. This fix ensures that ORBIIOPIPName always takes precedence. (Jules Colding) ORBit2-2.14.15 - bug fixes + fix some leaks (Jules Colding) + fix for Mike's recent fixes (Mike Gorse) + fix potential make loop (Diego Pettenò) @ text @$NetBSD: patch-ab,v 1.6 2007/08/05 20:48:48 joerg Exp $ --- src/orb/orb-core/Makefile.in.orig 2008-09-16 13:11:18.000000000 +0000 +++ src/orb/orb-core/Makefile.in @@@@ -623,7 +623,7 @@@@ distclean-local: -rm -rf .deps $(OPS_IDLOUT_C): $(OPS_IDLOUT_H) -$(OPS_IDLOUT_H): corba-ops.idl $(IDL_COMPILER) +$(OPS_IDLOUT_H): corba-ops.idl -(rm -f $(OPS_IDLOUT_C) $(OPS_IDLOUT_H) || true) > /dev/null $(IDL_COMPILER) $(IDL_FLAGS_CORBA_OPS) --deps .deps/corba-ops.idl.P $< for I in $(OPS_IDLOUT_C) $(OPS_IDLOUT_H); do \ @ 1.6 log @Don't run the IDL compiler multiple times due to a bogus dependency, esp. not during the install phase. This is an attempt to workaround the random breakage I see on DragonFly, but it makes the build faster as well, which is a good thing. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/orb/orb-core/Makefile.in.orig 2007-08-05 20:18:06.000000000 +0000 d5 2 a6 1 @@@@ -625,7 +625,7 @@@@ distclean-local: a7 1 true @ 1.5 log @Update to 2.14.8: ORBit2-2.14.8 * bug fixes + Fix GIOP timeouts and add unit tests (Jules Colding) + Code cleanups (Kjartan) + Fix pointer arithmetics (Roland Illig) + Fix crash with uninitialized exception (Vincent Untz) + ORBLocalOnly mode in Solaris fixes (Brian Cameron) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2007/02/20 15:08:59 rillig Exp $ d3 11 a13 173 http://bugzilla.gnome.org/show_bug.cgi?id=410002 Though shalt not use void pointers in arithmetics. NB: Cleaning up the rest of the code is left to the upstream authors as an exercise. --- src/orb/orb-core/corba-any.c.orig Mon Jan 1 18:01:32 2007 +++ src/orb/orb-core/corba-any.c Tue Feb 20 07:51:28 2007 @@@@ -3,6 +3,13 @@@@ #include "orb-core-private.h" #include +#define PTR_PLUS(ptr, offset) \ + ((gpointer) (((guchar *)(ptr)) + (offset))) + +/** Adds the size of TYPE to the gpointer PTR. */ +#define ADDSIZE(ptr, type) \ + ((gpointer) (((guchar *)(ptr)) + sizeof (type))) + #define SKIP_ALIAS(tc) \ while ((tc)->kind == CORBA_tk_alias) { (tc) = (tc)->subtypes [0]; } @@@@ -162,12 +171,12 @@@@ int offset; for (i = offset = 0; i < tc->sub_parts; i++) { offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align); - *val = val0 + offset; + *val = PTR_PLUS (val0, offset); ORBit_marshal_value (buf, val, tc->subtypes[i]); offset += ORBit_gather_alloc_info (tc->subtypes[i]); } offset = ALIGN_VALUE (offset, tc->c_align); - *val = val0 + offset; + *val = PTR_PLUS (val0, offset); break; } case CORBA_tk_union: { @@@@ -183,14 +192,14 @@@@ for (i = 0; i < tc->sub_parts; i++) sz = MAX (sz, ORBit_gather_alloc_info (tc->subtypes[i])); - *val = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), - tc->c_align); + *val = PTR_PLUS (val0, ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), + tc->c_align)); body = *val; ORBit_marshal_value (buf, &body, subtc); /* FIXME: * WATCHOUT: end of subtc may not be end of union */ - *val = *val + ALIGN_VALUE (sz, tc->c_align); + *val = PTR_PLUS (*val, ALIGN_VALUE (sz, tc->c_align)); break; } case CORBA_tk_wstring: { @@@@ -536,13 +545,13 @@@@ gpointer val0 = *val; for (i = offset = 0; i < tc->sub_parts; i++) { offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align); - *val = val0 + offset; + *val = PTR_PLUS (val0, offset); if (ORBit_demarshal_value (tc->subtypes[i], val, buf, orb)) return TRUE; offset += ORBit_gather_alloc_info (tc->subtypes[i]); } offset = ALIGN_VALUE (offset, tc->c_align); - *val = val0 + offset; + *val = PTR_PLUS (val0, offset); break; } case CORBA_tk_union: { @@@@ -560,14 +569,14 @@@@ for (i = 0; i < tc->sub_parts; i++) sz = MAX (sz, ORBit_gather_alloc_info (tc->subtypes[i])); - *val = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), - tc->c_align); + *val = PTR_PLUS (val0, ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), + tc->c_align)); body = *val; if (ORBit_demarshal_value (subtc, &body, buf, orb)) return TRUE; /* WATCHOUT: end subtc body may not be end of union */ - *val = *val + ALIGN_VALUE (sz, tc->c_align); + *val = PTR_PLUS (*val, ALIGN_VALUE (sz, tc->c_align)); break; } case CORBA_tk_string: @@@@ -860,14 +869,14 @@@@ for (i = offset = 0; i < tc->sub_parts; i++) { offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align); - *val = val0 + offset; - *newval = ((guchar *)newval0 + offset); + *val = PTR_PLUS (val0, offset); + *newval = PTR_PLUS (newval0, offset); ORBit_copy_value_core (val, newval, tc->subtypes[i]); offset += ORBit_gather_alloc_info (tc->subtypes[i]); } offset = ALIGN_VALUE (offset, tc->c_align); - *val = val0 + offset; - *newval = newval0 + offset; + *val = PTR_PLUS (val0, offset); + *newval = PTR_PLUS (newval0, offset); break; } case CORBA_tk_union: { @@@@ -876,6 +885,7 @@@@ CORBA_TypeCode utc; gint union_align = tc->c_align; size_t union_size = ORBit_gather_alloc_info (tc); + size_t aligned_size; pval1 = *val; pval2 = *newval; @@@@ -884,9 +894,10 @@@@ ORBit_copy_value_core (&pval1, &pval2, tc->discriminator); - pval1 = val0 + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), + aligned_size = ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), union_align); - pval2 = newval0 + (pval1 - val0); + pval1 = PTR_PLUS (val0, aligned_size); + pval2 = PTR_PLUS (newval0, aligned_size); ORBit_copy_value_core (&pval1, &pval2, utc); @@@@ -1044,8 +1055,8 @@@@ for (i = offset = 0; i < tc->sub_parts; i++) { offset = ALIGN_VALUE (offset, tc->subtypes[i]->c_align); - *a = a0 + offset; - *b = b0 + offset; + *a = PTR_PLUS (a0, offset); + *b = PTR_PLUS (b0, offset); if (!ORBit_value_equivalent (a, b, tc->subtypes [i], ev)) return FALSE; offset += ORBit_gather_alloc_info (tc->subtypes[i]); @@@@ -1052,8 +1063,8 @@@@ } offset = ALIGN_VALUE (offset, tc->c_align); - *a = a0 + offset; - *b = b0 + offset; + *a = PTR_PLUS (a0, offset); + *b = PTR_PLUS (b0, offset); return TRUE; } @@@@ -1084,6 +1095,7 @@@@ gint union_align = tc->c_align; size_t union_size = ORBit_gather_alloc_info (tc); gpointer a_orig, b_orig; + size_t aligned_size; a_orig = *a; b_orig = *b; @@@@ -1097,9 +1109,10 @@@@ if (!ORBit_value_equivalent (a, b, tc->discriminator, ev)) return FALSE; - *a = a_orig + ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), + aligned_size = ALIGN_VALUE (ORBit_gather_alloc_info (tc->discriminator), union_align); - *b = b_orig + (*a - a_orig); + *a = PTR_PLUS (a_orig, aligned_size); + *b = PTR_PLUS (b_orig, aligned_size); if (!ORBit_value_equivalent (a, b, utc_a, ev)) return FALSE; @ 1.4 log @Added two patches that remove void pointer arithmetic. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:10 jlam Exp $ d3 173 a175 9 --- ORBit-CosNaming-2.0.pc.in.orig Thu Nov 1 11:50:44 2001 +++ ORBit-CosNaming-2.0.pc.in @@@@ -8,5 +8,5 @@@@ Name: ORBit-CosNaming-2.0 Description: High-performance CORBA Object Request Broker - Naming Service. Version: @@ORBIT_VERSION@@ Requires: ORBit-2.0 -Libs: -L${libdir} -lORBitCosNaming-2 +Libs: -L${libdir} -Wl,-R${libdir} -lORBitCosNaming-2 Cflags: -I${includedir}/orbit-2.0 @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.4.1 2002/08/22 11:12:01 jlam Exp $ @ 1.1 log @Patch the various pkgconfig files to include proper -Wl,-R options. Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.1.4.1 log @file patch-ab was added on branch buildlink2 on 2002-08-22 11:12:01 +0000 @ text @d1 11 @ 1.1.4.2 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @a0 11 $NetBSD: patch-ab,v 1.1.4.1 2002/08/22 11:12:01 jlam Exp $ --- ORBit-CosNaming-2.0.pc.in.orig Thu Nov 1 11:50:44 2001 +++ ORBit-CosNaming-2.0.pc.in @@@@ -8,5 +8,5 @@@@ Name: ORBit-CosNaming-2.0 Description: High-performance CORBA Object Request Broker - Naming Service. Version: @@ORBIT_VERSION@@ Requires: ORBit-2.0 -Libs: -L${libdir} -lORBitCosNaming-2 +Libs: -L${libdir} -Wl,-R${libdir} -lORBitCosNaming-2 Cflags: -I${includedir}/orbit-2.0 @