head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.8 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2010Q1:1.5.0.2 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 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.6 date 2010.05.31.17.57.37; author drochner; state dead; branches; next 1.5; 1.5 date 2010.02.21.23.51.26; author tron; state Exp; branches; next 1.4; 1.4 date 2009.11.23.17.18.52; author tron; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2002.10.30.03.09.32; author rh; state dead; branches; next 1.2; 1.2 date 2002.08.25.19.22.37; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.07.18.02.19.36; author rh; state Exp; branches 1.1.4.1; next ; 1.4.2.1 date 2010.03.27.17.51.38; author tron; state Exp; branches; next ; 1.1.4.1 date 2002.07.18.02.19.36; author jlam; state dead; branches; next 1.1.4.2; 1.1.4.2 date 2002.08.22.11.10.53; author jlam; state Exp; branches; next ; desc @@ 1.6 log @update to 1.28.0 this switches to the gnome-2.30 branch @ text @$NetBSD: patch-ae,v 1.5 2010/02/21 23:51:26 tron Exp $ Avoid high CPU usage under Mac OS X caused by questionable C++ code. Please look here for details: https://bugzilla.gnome.org/show_bug.cgi?id=593240 --- pango/opentype/hb-open-type-private.hh.orig 2009-11-26 00:44:17.000000000 +0000 +++ pango/opentype/hb-open-type-private.hh 2010-02-21 23:41:06.000000000 +0000 @@@@ -61,7 +61,7 @@@@ /* Null objects */ /* Global nul-content Null pool. Enlarge as necessary. */ -static const char NullPool[32] = ""; +static const void *NullPool[32]; /* Generic template for nul-content sizeof-sized Null objects. */ template @ 1.5 log @Change very questionable C++ code slightly to avoid high CPU usage under Mac OS X. (see https://bugzilla.gnome.org/show_bug.cgi?id=593240 for more details). Tested with XChat and Wireshark under Mac OS 10.6.2 and NetBSD/amd64 5.0_STABLE. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.4 2009/11/23 17:18:52 tron Exp $ @ 1.4 log @Add a somewhat odd workaround to stop Mac OS X's toolchain (at least Xcode 3.2.1) from breaking "pango" under Mac OS X. Bump package revision because the package would previously build but not work. [No, I have no idea why adding a random fprintf() in that loop avoids the problem. But it is the only trick I have found so far.] @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 Avoid high CPU usage caused by code generaton problems in Apple's toolchain. d8 4 a11 5 --- pango/pango-ot-info.c.orig 2009-11-17 16:35:44.000000000 +0000 +++ pango/pango-ot-info.c 2009-11-23 13:55:29.000000000 +0000 @@@@ -536,13 +536,22 @@@@ { unsigned int i; d13 3 a15 11 +#if defined(__APPLE__) && defined(__GNUC__) + (void)fflush(stdout); +#endif + for (i = 0; i < ruleset->rules->len; i++) { - PangoOTRule *rule = &g_array_index (ruleset->rules, PangoOTRule, i); + PangoOTRule *rule; hb_mask_t mask; unsigned int lookup_count, j; unsigned int lookup_indexes[1000]; d17 2 a18 20 +#if defined(__APPLE__) && defined(__GNUC__) + (void)fprintf(stdout, "%d", i); +#endif + + rule = &g_array_index (ruleset->rules, const PangoOTRule, i); if (rule->table_type != PANGO_OT_TABLE_GSUB) continue; @@@@ -561,6 +570,11 @@@@ lookup_indexes[j], rule->property_bit); } + +#if defined(__APPLE__) && defined(__GNUC__) + (void)fpurge(stdout); +#endif + } void @ 1.4.2.1 log @Pullup ticket #3066 - requested by taca pango: security patch Revisions pulled up: - devel/pango/Makefile 1.140-1.141 - devel/pango/distinfo 1.82-1.83 - devel/pango/patches/patch-ae 1.5 - devel/pango/patches/patch-am 1.1 --- Module Name: pkgsrc Committed By: tron Date: Sun Feb 21 23:51:26 UTC 2010 Modified Files: pkgsrc/devel/pango: Makefile distinfo pkgsrc/devel/pango/patches: patch-ae Log Message: Change very questionable C++ code slightly to avoid high CPU usage under Mac OS X. (see https://bugzilla.gnome.org/show_bug.cgi?id=593240 for more details). Tested with XChat and Wireshark under Mac OS 10.6.2 and NetBSD/amd64 5.0_STABLE. --- Module Name: pkgsrc Committed By: taca Date: Sat Mar 27 15:59:34 UTC 2010 Modified Files: pkgsrc/devel/pango: Makefile distinfo Added Files: pkgsrc/devel/pango/patches: patch-am Log Message: Add a patch to fix CVE-2010-0421, DoS security fix. Bump PKGREVISION. @ text @d3 1 a3 1 Avoid high CPU usage under Mac OS X caused by questionable C++ code. d8 5 a12 4 --- pango/opentype/hb-open-type-private.hh.orig 2009-11-26 00:44:17.000000000 +0000 +++ pango/opentype/hb-open-type-private.hh 2010-02-21 23:41:06.000000000 +0000 @@@@ -61,7 +61,7 @@@@ /* Null objects */ d14 11 a24 3 /* Global nul-content Null pool. Enlarge as necessary. */ -static const char NullPool[32] = ""; +static const void *NullPool[32]; d26 20 a45 2 /* Generic template for nul-content sizeof-sized Null objects. */ template @ 1.3 log @Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2002/08/25 19:22:37 jlam Exp $ d3 41 a43 9 --- pangoxft.pc.in.orig Wed Mar 6 03:20:57 2002 +++ pangoxft.pc.in @@@@ -7,6 +7,6 @@@@ Name: Pango Xft Description: Xft font support for Pango Version: @@VERSION@@ Requires: pango -Libs: -L${libdir} -lpangoxft-@@PANGO_API_VERSION@@ @@PKGCONFIG_XFT_LIBS@@ +Libs: -L${libdir} -Wl,-R${libdir} -lpangoxft-@@PANGO_API_VERSION@@ @@PKGCONFIG_XFT_LIBS@@ Cflags: -I${includedir}/pango-1.0 @@X_CFLAGS@@ @@FREETYPE_CFLAGS@@ d45 1 @ 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-ae,v 1.1.4.1 2002/08/22 11:10:53 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-ae was added on branch buildlink2 on 2002-08-22 11:10:53 +0000 @ text @d1 12 @ 1.1.4.2 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @a0 12 $NetBSD: patch-ae,v 1.1.4.1 2002/08/22 11:10:53 jlam Exp $ --- pangoxft.pc.in.orig Wed Mar 6 03:20:57 2002 +++ pangoxft.pc.in @@@@ -7,6 +7,6 @@@@ Name: Pango Xft Description: Xft font support for Pango Version: @@VERSION@@ Requires: pango -Libs: -L${libdir} -lpangoxft-@@PANGO_API_VERSION@@ @@PKGCONFIG_XFT_LIBS@@ +Libs: -L${libdir} -Wl,-R${libdir} -lpangoxft-@@PANGO_API_VERSION@@ @@PKGCONFIG_XFT_LIBS@@ Cflags: -I${includedir}/pango-1.0 @@X_CFLAGS@@ @@FREETYPE_CFLAGS@@ @