diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
| commit | 3937c88166a493900a694ea8fe53b860f4099d83 (patch) | |
| tree | 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/pango | |
| parent | df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff) | |
| parent | 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/pango')
| -rw-r--r-- | recipes/pango/pango-1.24.4/CVE-2010-0421.patch | 32 | ||||
| -rw-r--r-- | recipes/pango/pango-native-1.22.0/no-tests.patch | 10 | ||||
| -rw-r--r-- | recipes/pango/pango-native_1.22.0.bb | 12 | ||||
| -rw-r--r-- | recipes/pango/pango.inc | 5 | ||||
| -rw-r--r-- | recipes/pango/pango_1.24.4.bb | 4 |
5 files changed, 41 insertions, 22 deletions
diff --git a/recipes/pango/pango-1.24.4/CVE-2010-0421.patch b/recipes/pango/pango-1.24.4/CVE-2010-0421.patch new file mode 100644 index 0000000000..b3656d7b61 --- /dev/null +++ b/recipes/pango/pango-1.24.4/CVE-2010-0421.patch @@ -0,0 +1,32 @@ +CVE-2010-0421 +--- a/pango/opentype/harfbuzz-gdef.c ++++ b/pango/opentype/harfbuzz-gdef.c +@@ -923,7 +923,7 @@ HB_Error HB_GDEF_Build_ClassDefinition( + goto Fail1; + } + +- if ( gcrr[count - 1].End != num_glyphs - 1 ) ++ if ( gcrr[count - 1].End + 1 < num_glyphs ) + { + if ( ALLOC_ARRAY( ngc[count], + ( num_glyphs - gcrr[count - 1].End + 2 ) / 4, +@@ -938,7 +938,9 @@ HB_Error HB_GDEF_Build_ClassDefinition( + HB_UShort ) ) + goto Fail2; + } +- ++ else ++ num_glyphs = 1; ++ + gdef->LastGlyph = num_glyphs - 1; + + gdef->MarkAttachClassDef_offset = 0L; +@@ -996,6 +998,8 @@ _HB_GDEF_Add_Glyph_Property( HB_GDEFHead + HB_ClassRangeRecord* gcrr; + HB_UShort** ngc; + ++ if ( glyphID >= gdef->LastGlyph ) ++ return 0; + + error = _HB_OPEN_Get_Class( &gdef->GlyphClassDef, glyphID, &class, &index ); + if ( error && error != HB_Err_Not_Covered ) diff --git a/recipes/pango/pango-native-1.22.0/no-tests.patch b/recipes/pango/pango-native-1.22.0/no-tests.patch deleted file mode 100644 index dafcb20c3b..0000000000 --- a/recipes/pango/pango-native-1.22.0/no-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 -+++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests -+SUBDIRS= pango modules pango-view examples docs tools - - EXTRA_DIST = \ - autogen.sh \ diff --git a/recipes/pango/pango-native_1.22.0.bb b/recipes/pango/pango-native_1.22.0.bb deleted file mode 100644 index ba2cf4ca3b..0000000000 --- a/recipes/pango/pango-native_1.22.0.bb +++ /dev/null @@ -1,12 +0,0 @@ - -require pango_1.22.0.bb - -inherit native - -DEPENDS += "glib-2.0-native cairo-native" -PROVIDES = "pango-native" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2" - -PR = "r0" - diff --git a/recipes/pango/pango.inc b/recipes/pango/pango.inc index 5189d950c1..d0b18755b9 100644 --- a/recipes/pango/pango.inc +++ b/recipes/pango/pango.inc @@ -10,10 +10,15 @@ SECTION = "x11/libs" DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc cairo" +DEPENDS_virtclass-native = "glib-2.0-native cairo-native" +BBCLASSEXTEND = "native" + PACKAGES_DYNAMIC = "pango-module-*" RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +INC_PR = "r0" + # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/recipes/pango/pango_1.24.4.bb b/recipes/pango/pango_1.24.4.bb index ce81d89263..7211534593 100644 --- a/recipes/pango/pango_1.24.4.bb +++ b/recipes/pango/pango_1.24.4.bb @@ -1,2 +1,6 @@ require pango.inc +PR = "${INC_PR}.1" + +SRC_URI += "file://CVE-2010-0421.patch;patch=1" + |