March 2011 - openSUSE Commits - openSUSE Mailing Lists

commit pm-utils for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package pm-utils for openSUSE:11.4 checked in at Tue Mar 1 12:52:49 CET 2011. -------- --- old-versions/11.4/all/pm-utils/pm-utils.changes 2011-02-13 23:23:43.000000000 +0100 +++ /mounts/work_src_done/11.4/pm-utils/pm-utils.changes 2011-03-01 09:33:50.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 1 08:29:54 UTC 2011 - mvyskocil(a)suse.cz + +- Fix bnc#663067 - remove harddrive power.d hook + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.u5Hu0J/_old 2011-03-01 12:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.u5Hu0J/_new 2011-03-01 12:52:28.000000000 +0100 @@ -23,7 +23,7 @@ Name: pm-utils Version: 1.4.1 -Release: 5.<RELEASE2> +Release: 5.<RELEASE3> Summary: Tools to suspend and hibernate computers License: GPLv2+ Group: System/Base @@ -101,6 +101,8 @@ %install %{makeinstall} +# bnc#663067 +%{__rm} %{buildroot}/%{pm_libdir}/power.d/harddrive #FIXME: should be installed by make install %{__install} -m 644 man/*.1 %{buildroot}/%{_mandir}/man1 %{__install} -m 644 man/*.8 %{buildroot}/%{_mandir}/man8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pango for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package pango for openSUSE:11.4 checked in at Tue Mar 1 12:52:24 CET 2011. -------- --- old-versions/11.4/all/pango/pango.changes 2010-10-13 20:26:40.000000000 +0200 +++ /mounts/work_src_done/11.4/pango/pango.changes 2011-03-01 08:25:23.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 28 09:32:26 CET 2011 - vuntz(a)opensuse.org + +- Add pango-CVE-2011-0020.patch: fixes heap corruption in font + parsing with FreeType2 backend. Fix bnc#666101, CVE-2011-0020. +- Add pango-CVE-2011-0064.patch: handle realloc failure in the + buffer to fix potential crashes. Fix bnc#672502, CVE-2011-0064. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- pango-CVE-2011-0020.patch pango-CVE-2011-0064.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.BtGxy9/_old 2011-03-01 12:51:46.000000000 +0100 +++ /var/tmp/diff_new_pack.BtGxy9/_new 2011-03-01 12:51:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pango (Version 1.28.3) +# spec file for package pango # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ License: LGPLv2.1+ Group: System/Libraries Version: 1.28.3 -Release: 1 +Release: 3.<RELEASE2> # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) Summary: Library for Layout and Rendering of Text Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2 @@ -32,6 +32,10 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream. Patch0: pango64.patch +# PATCH-FIX-UPSTREAM pango-CVE-2011-0020.patch bnc#666101 CVE-2011-0020 vuntz(a)opensuse.org -- heap corruption in font parsing with FreeType2 backend +Patch1: pango-CVE-2011-0020.patch +# PATCH-FIX-UPSTREAM pango-CVE-2011-0064.patch bnc#672502 CVE-2011-0064. vuntz(a)opensuse.org -- handle realloc failure in the buffer +Patch2: pango-CVE-2011-0064.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: pkg-config @@ -128,6 +132,8 @@ cp -a %{S:1} . %patch0 -p0 %endif +%patch1 -p1 +%patch2 -p1 %build %configure --disable-static --with-pic ++++++ pango-CVE-2011-0020.patch ++++++ >From 4e6248d76f55c6184f28afe614d7d76b6fa3d455 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod <behdad(a)behdad.org> Date: Thu, 17 Feb 2011 16:19:48 +0000 Subject: Bug 639882 - Heap corruption in font parsing with FreeType2 backend --- diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c index bd3b7d4..42923f4 100644 --- a/pango/pangoft2-render.c +++ b/pango/pangoft2-render.c @@ -121,9 +121,14 @@ pango_ft2_font_render_box_glyph (int width, box->bitmap.width = width; box->bitmap.rows = height; - box->bitmap.pitch = height; + box->bitmap.pitch = width; - box->bitmap.buffer = g_malloc0 (box->bitmap.rows * box->bitmap.pitch); + box->bitmap.buffer = g_malloc0_n (box->bitmap.rows, box->bitmap.pitch); + + if (G_UNLIKELY (!box->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, box); + return NULL; + } /* draw the box */ for (j = 0; j < line_width; j++) @@ -226,6 +231,11 @@ pango_ft2_font_render_glyph (PangoFont *font, rendered->bitmap_left = face->glyph->bitmap_left; rendered->bitmap_top = face->glyph->bitmap_top; + if (G_UNLIKELY (!rendered->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, rendered); + return NULL; + } + return rendered; } else @@ -276,6 +286,8 @@ pango_ft2_renderer_draw_glyph (PangoRenderer *renderer, if (rendered_glyph == NULL) { rendered_glyph = pango_ft2_font_render_glyph (font, glyph); + if (rendered_glyph == NULL) + return; add_glyph_to_cache = TRUE; } -- cgit v0.8.3.4 ++++++ pango-CVE-2011-0064.patch ++++++ >From 3104961bc0ffaf847d2a1e116e6de4fdc1cd8ada Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod <behdad(a)behdad.org> Date: Thu, 2 Dec 2010 16:00:46 +1300 Subject: [PATCH] Handle realloc failure in the buffer Ported from http://cgit.freedesktop.org/harfbuzz/commit/?id=a6a79df5fe2e by Karl Tomlinson <karlt+(a)karlt.net> --- pango/opentype/hb-buffer-private.h | 1 + pango/opentype/hb-buffer.c | 70 +++++++++++++++++++++--------------- pango/opentype/hb-buffer.h | 2 +- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/pango/opentype/hb-buffer-private.h b/pango/opentype/hb-buffer-private.h index 45cdc4d..f194786 100644 --- a/pango/opentype/hb-buffer-private.h +++ b/pango/opentype/hb-buffer-private.h @@ -72,6 +72,7 @@ struct _hb_buffer_t { unsigned int allocated; hb_bool_t have_output; /* weather we have an output buffer going on */ + hb_bool_t in_error; /* Allocation failed */ unsigned int in_length; unsigned int out_length; unsigned int in_pos; diff --git a/pango/opentype/hb-buffer.c b/pango/opentype/hb-buffer.c index 93b51e5..e9788ad 100644 --- a/pango/opentype/hb-buffer.c +++ b/pango/opentype/hb-buffer.c @@ -52,23 +52,21 @@ static hb_buffer_t _hb_buffer_nil = { * in_string and out_string. */ -/* XXX err handling */ - /* Internal API */ -static void +static hb_bool_t hb_buffer_ensure_separate (hb_buffer_t *buffer, unsigned int size) { - hb_buffer_ensure (buffer, size); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, size))) return FALSE; if (buffer->out_string == buffer->in_string) { assert (buffer->have_output); - if (!buffer->positions) - buffer->positions = calloc (buffer->allocated, sizeof (buffer->positions[0])); buffer->out_string = (hb_internal_glyph_info_t *) buffer->positions; memcpy (buffer->out_string, buffer->in_string, buffer->out_length * sizeof (buffer->out_string[0])); } + + return TRUE; } /* Public API */ @@ -114,6 +112,7 @@ void hb_buffer_clear (hb_buffer_t *buffer) { buffer->have_output = FALSE; + buffer->in_error = FALSE; buffer->in_length = 0; buffer->out_length = 0; buffer->in_pos = 0; @@ -122,32 +121,42 @@ hb_buffer_clear (hb_buffer_t *buffer) buffer->max_lig_id = 0; } -void +hb_bool_t hb_buffer_ensure (hb_buffer_t *buffer, unsigned int size) { - unsigned int new_allocated = buffer->allocated; - - if (size > new_allocated) + if (HB_UNLIKELY (size > buffer->allocated)) { + unsigned int new_allocated = buffer->allocated; + hb_internal_glyph_position_t *new_pos; + hb_internal_glyph_info_t *new_info; + hb_bool_t separate_out; + + if (HB_UNLIKELY (buffer->in_error)) + return FALSE; + + separate_out = buffer->out_string != buffer->in_string; + while (size > new_allocated) new_allocated += (new_allocated >> 1) + 8; - if (buffer->positions) - buffer->positions = realloc (buffer->positions, new_allocated * sizeof (buffer->positions[0])); + new_pos = (hb_internal_glyph_position_t *) realloc (buffer->positions, new_allocated * sizeof (buffer->positions[0])); + new_info = (hb_internal_glyph_info_t *) realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0])); - if (buffer->out_string != buffer->in_string) - { - buffer->in_string = realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0])); - buffer->out_string = (hb_internal_glyph_info_t *) buffer->positions; - } - else - { - buffer->in_string = realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0])); - buffer->out_string = buffer->in_string; - } + if (HB_UNLIKELY (!new_pos || !new_info)) + buffer->in_error = TRUE; + + if (HB_LIKELY (new_pos)) + buffer->positions = new_pos; - buffer->allocated = new_allocated; + if (HB_LIKELY (new_info)) + buffer->in_string = new_info; + + buffer->out_string = separate_out ? (hb_internal_glyph_info_t *) buffer->positions : buffer->in_string; + if (HB_LIKELY (!buffer->in_error)) + buffer->allocated = new_allocated; } + + return HB_LIKELY (!buffer->in_error); } void @@ -158,7 +167,7 @@ hb_buffer_add_glyph (hb_buffer_t *buffer, { hb_internal_glyph_info_t *glyph; - hb_buffer_ensure (buffer, buffer->in_length + 1); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->in_length + 1))) return; glyph = &buffer->in_string[buffer->in_length]; glyph->codepoint = codepoint; @@ -213,6 +222,8 @@ _hb_buffer_swap (hb_buffer_t *buffer) assert (buffer->have_output); + if (HB_UNLIKELY (buffer->in_error)) return; + if (buffer->out_string != buffer->in_string) { hb_internal_glyph_info_t *tmp_string; @@ -265,7 +276,8 @@ _hb_buffer_add_output_glyphs (hb_buffer_t *buffer, if (buffer->out_string != buffer->in_string || buffer->out_pos + num_out > buffer->in_pos + num_in) { - hb_buffer_ensure_separate (buffer, buffer->out_pos + num_out); + if (HB_UNLIKELY (!hb_buffer_ensure_separate (buffer, buffer->out_pos + num_out))) + return; } mask = buffer->in_string[buffer->in_pos].mask; @@ -302,7 +314,7 @@ _hb_buffer_add_output_glyph (hb_buffer_t *buffer, if (buffer->out_string != buffer->in_string) { - hb_buffer_ensure (buffer, buffer->out_pos + 1); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->out_pos + 1))) return; buffer->out_string[buffer->out_pos] = buffer->in_string[buffer->in_pos]; } else if (buffer->out_pos != buffer->in_pos) @@ -332,7 +344,7 @@ _hb_buffer_next_glyph (hb_buffer_t *buffer) if (buffer->out_string != buffer->in_string) { - hb_buffer_ensure (buffer, buffer->out_pos + 1); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->out_pos + 1))) return; buffer->out_string[buffer->out_pos] = buffer->in_string[buffer->in_pos]; } else if (buffer->out_pos != buffer->in_pos) diff --git a/pango/opentype/hb-buffer.h b/pango/opentype/hb-buffer.h index b030ba9..aaf6694 100644 --- a/pango/opentype/hb-buffer.h +++ b/pango/opentype/hb-buffer.h @@ -94,7 +94,7 @@ hb_buffer_clear (hb_buffer_t *buffer); void hb_buffer_clear_positions (hb_buffer_t *buffer); -void +hb_bool_t hb_buffer_ensure (hb_buffer_t *buffer, unsigned int size); -- 1.7.2.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-lists-openSUSE for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package package-lists-openSUSE for openSUSE:11.4 checked in at Tue Mar 1 12:52:01 CET 2011. -------- --- old-versions/11.4/all/package-lists-openSUSE/package-lists-openSUSE.changes 2011-02-21 12:18:25.000000000 +0100 +++ /mounts/work_src_done/11.4/package-lists-openSUSE/package-lists-openSUSE.changes 2011-02-27 18:38:23.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Feb 27 17:38:05 UTC 2011 - coolo(a)novell.com + +- support sssd and kernel-firmware + +------------------------------------------------------------------- +Wed Feb 23 13:26:45 UTC 2011 - coolo(a)novell.com + +- add perl requires for apparmor + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-lists-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.uWlPj6/_old 2011-03-01 12:51:39.000000000 +0100 +++ /var/tmp/diff_new_pack.uWlPj6/_new 2011-03-01 12:51:39.000000000 +0100 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.4 -Release: 14.<RELEASE5> +Release: 14.<RELEASE6> BuildRoot: %{_tmppath}/%{name}-%{version}-build # ~coolo/Export/Paketlisten/filelists.tar.bz2 Source: filelists.tar.bz2 ++++++ filelists.tar.bz2 ++++++ ++++ 2063 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package lxc for openSUSE:11.4 checked in at Tue Mar 1 12:51:31 CET 2011. -------- --- old-versions/11.4/all/lxc/lxc.changes 2011-02-22 19:59:56.000000000 +0100 +++ /mounts/work_src_done/11.4/lxc/lxc.changes 2011-02-28 18:20:18.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 28 18:03:32 CET 2011 - jslaby(a)suse.de + +- update to 0.7.4 final + - fix support for >= 2.6.37 kernels +- update README.SUSE file -- it contained obsolete information + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- lxc-0.7.3.99rc1.tar.bz2 New: ---- _service _service:recompress:download_url:lxc-0.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.MhKnEL/_old 2011-03-01 12:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.MhKnEL/_new 2011-03-01 12:51:05.000000000 +0100 @@ -18,7 +18,7 @@ Name: lxc -Version: 0.7.3.99rc1 +Version: 0.7.4 Release: 1.<RELEASE2> Url: http://lxc.sourceforge.net/ Summary: Linux containers implementation ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.MhKnEL/_old 2011-03-01 12:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.MhKnEL/_new 2011-03-01 12:51:05.000000000 +0100 @@ -1,10 +1,4 @@ -Note that kernel-desktop lacks support for control groups which is -needed for lxc. Use kernel-default instead[1]. - To mount the control group file system during boot run mkdir /cgroup and add the following line to /etc/fstab: cgroup /cgroup cgroup nofail 0 0 - - -[1] https://bugzilla.novell.com/show_bug.cgi?id=530715#c11 ++++++ _service ++++++ <services> <service name="download_url"> <param name="protocol">http</param> <param name="host">lxc.sourceforge.net</param> <param name="path">/download/lxc/lxc-0.7.4.tar.gz</param> </service> <service name="recompress"> <param name="file">_service:download_url:lxc-0.7.4.tar.gz</param> <param name="compression">bz2</param> </service> </services> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libtool for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package libtool for openSUSE:11.4 checked in at Tue Mar 1 12:51:17 CET 2011. -------- --- old-versions/11.4/all/libtool/libtool.changes 2010-10-31 19:03:53.000000000 +0100 +++ /mounts/work_src_done/11.4/libtool/libtool.changes 2011-02-28 22:01:49.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 28 22:00:49 CET 2011 - jslaby(a)suse.de + +- Fix AC_LANG_PROGRAM warnings (bnc#675573) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- fix-AC_LANG_PROGRAM-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtool-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.xg0e1z/_old 2011-03-01 12:50:57.000000000 +0100 +++ /var/tmp/diff_new_pack.xg0e1z/_new 2011-03-01 12:50:57.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libtool-testsuite (Version 2.2.6b) +# spec file for package libtool-testsuite # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Group: Development/Tools/Building Summary: A Tool to Build Shared Libraries Version: 2.2.6b -Release: 10 +Release: 11.<RELEASE2> AutoReqProv: on # bug437293 %ifarch ppc64 ++++++ libtool.spec ++++++ --- /var/tmp/diff_new_pack.xg0e1z/_old 2011-03-01 12:50:57.000000000 +0100 +++ /var/tmp/diff_new_pack.xg0e1z/_new 2011-03-01 12:50:57.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libtool (Version 2.2.6b) +# spec file for package libtool # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Group: Development/Tools/Building Summary: A Tool to Build Shared Libraries Version: 2.2.6b -Release: 10 +Release: 13.<RELEASE2> AutoReqProv: on # bug437293 %ifarch ppc64 @@ -36,6 +36,7 @@ Url: http://www.gnu.org/software/libtool/ Source: ftp://ftp.gnu.org/pub/gnu/libtool/libtool-%{version}.tar.lzma Source2: baselibs.conf +Patch0: fix-AC_LANG_PROGRAM-warnings.patch Patch1: libtool-no-hostname.patch #Patch: libtool-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,6 +56,7 @@ %prep %setup -q -n libtool-%{version} +%patch0 -p1 %patch1 -p0 #%patch -p1 ++++++ fix-AC_LANG_PROGRAM-warnings.patch ++++++ >From 2680f79c22e6bb1f8b9c7b5428da728b7e028b0c Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> Date: Sat, 28 Aug 2010 11:34:24 +0200 Subject: Fix AC_LANG_PROGRAM warnings from git Autoconf. References: bnc#675573 * libltdl/m4/libtool.m4 (_LT_SYS_MODULE_PATH_AIX): Fix underquoted AC_LANG_PROGRAM call. (LT_PROG_AR): Use AC_LANG_PROGRAM. (_LT_LINKER_SHLIBS) [irix, GCC]: Use the right source for the given language. * NEWS: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> --- ChangeLog | 10 ++++++++++ libltdl/m4/libtool.m4 | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-08-28 Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> + + Fix AC_LANG_PROGRAM warnings from git Autoconf. + * libltdl/m4/libtool.m4 (_LT_SYS_MODULE_PATH_AIX): Fix + underquoted AC_LANG_PROGRAM call. + (_LT_LINKER_SHLIBS) [irix, GCC]: Use the right source for the + given language. + 2009-11-16 Peter O'Gorman <peter(a)pogma.com> Really update libltdl version-info. --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -1021,7 +1021,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], # to the aix ld manual. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +AC_LINK_IFELSE([AC_LANG_PROGRAM],[ lt_aix_libpath_sed=' /Import File Strings/,/^$/ { /^0/ { @@ -4826,9 +4826,18 @@ _LT_EOF # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], [ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) + ]) LDFLAGS="$save_LDFLAGS" else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit haveged for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package haveged for openSUSE:11.4 checked in at Tue Mar 1 12:50:49 CET 2011. -------- --- old-versions/11.4/all/haveged/haveged.changes 2010-12-07 22:26:39.000000000 +0100 +++ /mounts/work_src_done/11.4/haveged/haveged.changes 2011-03-01 10:31:24.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Mar 1 10:03:17 CET 2011 - meissner(a)suse.de + +- avoid unnecessary services. bnc#675841 + also the start should be mediated by YaST or kiwi depending + on presence of a virtualization environment, not by the package + itself. + +------------------------------------------------------------------- +Tue Jan 4 23:14:52 UTC 2011 - cristian.rodriguez(a)opensuse.org + +- Update to version 0.9_git201101042303 + * fix wrong usage of strdupa +- fix build in older distros that have no XZ + +------------------------------------------------------------------- +Tue Jan 4 17:18:34 UTC 2011 - cristian.rodriguez(a)opensuse.org + +- Fix build in older distros +- run spec cleaner + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- haveged-0.9_git201011252143.tar.xz New: ---- haveged-0.9_git201101042303.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.spec ++++++ --- /var/tmp/diff_new_pack.z0r7hw/_old 2011-03-01 12:50:33.000000000 +0100 +++ /var/tmp/diff_new_pack.z0r7hw/_new 2011-03-01 12:50:33.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package haveged (Version 0.9_git201011252143) +# spec file for package haveged # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,21 +18,25 @@ Name: haveged -Version: 0.9_git201011252143 -Release: 1 +Version: 0.9_git201101042303 +Release: 0.<RELEASE2> License: GPLv3 -Group: System/Daemons Summary: Feed entropy into random pool Url: http://www.issihosts.com/haveged/ +Group: System/Daemons # Our sources https://github.com/crrodriguez/haveged -Source0: http://www.issihosts.com/haveged/haveged-%{version}.tar.xz +Source0: http://www.issihosts.com/haveged/haveged-%{version}.tar.bz2 Source1: haveged.init Source2: haveged.service +BuildRequires: libcap-ng-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(pre): %insserv_prereq sysvinit(syslog) +Requires(pre): %insserv_prereq +%if 0%{suse_version} >= 1140 +Requires(pre): sysvinit(syslog) +%endif Requires(post): grep util-linux Enhances: openssl gpg2 php5 apache2 openvpn smtp_daemon -BuildRequires: libcap-ng-devel lzma +%{!?_initddir: %global _initddir /etc/init.d} %description The haveged daemon feeds the linux entropy pool with random @@ -53,34 +57,19 @@ make %{?_smp_mflags} check %install -make DESTDIR=$RPM_BUILD_ROOT install -%{__install} -m0755 %{S:1} %{buildroot}/etc/init.d/haveged +%makeinstall +%{__install} -m0755 %{S:1} %{buildroot}%{_initddir}/haveged %{__mkdir_p} %{buildroot}%{_sbindir} %{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} %{__mkdir_p} %{buildroot}/lib/systemd/system %{__install} -m0755 %{S:2} %{buildroot}/lib/systemd/system/haveged.service %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -## brace for impact... -%if 0%{?sles_version} - if [ -x /usr/bin/lscpu ]; then - if /usr/bin/lscpu | grep -q "Virtualization type" ; then - ## Is a VM - %{fillup_and_insserv -fy %{name}} - else - ## it isnt. - %{fillup_and_insserv -f %{name}} - fi - else - ##there is no lscpu! shouldnt happend... - %{fillup_and_insserv -f %{name}} - fi -%else - %{fillup_and_insserv -fy %{name}} -%endif +# do not enable on condition here, let YAST, kiwi or the user do it. +%{fillup_and_insserv -f %{name}} %postun %restart_on_update %{name} @@ -93,7 +82,7 @@ %defattr(-,root,root) %{_sbindir}/rc%{name} /sbin/haveged -%config /etc/init.d/haveged +%config %{_initddir}/haveged %{_mandir}/man8/haveged.8.gz %dir /lib/systemd %dir /lib/systemd/system ++++++ haveged-0.9_git201011252143.tar.xz -> haveged-0.9_git201101042303.tar.bz2 ++++++ ++++ 9747 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cobbler for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package cobbler for openSUSE:11.4 checked in at Tue Mar 1 12:50:26 CET 2011. -------- --- old-versions/11.4/all/cobbler/cobbler.changes 2011-02-17 17:25:32.000000000 +0100 +++ /mounts/work_src_done/11.4/cobbler/cobbler.changes 2011-02-28 18:25:30.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 28 18:23:38 CET 2011 - ug(a)suse.de + +- fixed a crash because xml.dom.ext is not available on 11.4 + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.h1Ggc4/_old 2011-03-01 12:49:51.000000000 +0100 +++ /var/tmp/diff_new_pack.h1Ggc4/_new 2011-03-01 12:49:51.000000000 +0100 @@ -27,7 +27,7 @@ License: GPLv2+ AutoReq: no Version: 2.0.10 -Release: 15.<RELEASE3> +Release: 15.<RELEASE4> Source0: cobbler-%{version}.tar.gz Source1: vendor-files.tar.bz2 Patch0: fix-initscript.dif ++++++ autoyast1.diff ++++++ --- /var/tmp/diff_new_pack.h1Ggc4/_old 2011-03-01 12:49:51.000000000 +0100 +++ /var/tmp/diff_new_pack.h1Ggc4/_new 2011-03-01 12:49:51.000000000 +0100 @@ -5,7 +5,7 @@ from utils import _ +import xml.dom.minidom -+import xml.dom.ext ++#import xml.dom.ext +from StringIO import StringIO class KickGen: @@ -99,9 +99,9 @@ + self.addAutoYaSTScript( document, "pre-scripts", runpre % ( srv, what, name ) ) + self.addAutoYaSTScript( document, "init-scripts", runpost % ( srv, what, name ) ) + -+ raw_result = StringIO(); -+ xml.dom.ext.PrettyPrint(document,raw_result) -+ return raw_result.getvalue() ++ #raw_result = StringIO(); ++ return document.toprettyxml() ++ #return raw_result.getvalue() + + def generate_kickstart_signal(self, is_pre=0, profile=None, system=None): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:11.4
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:11.4 checked in at Tue Mar 1 12:49:26 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/11.4/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-01 08:40:07.000000000 +0100 @@ -0,0 +1,29 @@ +------------------------------------------------------------------- +Tue Mar 1 08:40:07 CET 2011 - autobuild(a)suse.de + +- automated update on 2011-03-01 + +------------------------------------------------------------------- +Wed Jan 25 21:25:03 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Sat Nov 6 20:17:44 CET 2004 - lmuelle(a)suse.de + +- Change arpwatch of neededforbuild to arpwatch-ethercodes-build. + +------------------------------------------------------------------- +Sat Nov 6 18:18:44 CET 2004 - lmuelle(a)suse.de + +- Ensure size of ethercodes.dat is not zero, [#48005]. + +------------------------------------------------------------------- +Wed Oct 6 21:58:11 CEST 2004 - ro(a)suse.de + +- make package noarch + +------------------------------------------------------------------- +Fri Jun 25 22:18:23 CEST 2004 - lmuelle(a)suse.de + +- Initial package. calling whatdependson for 11.4-i586 New: ---- arpwatch-ethercodes.changes arpwatch-ethercodes.spec get_version_number.sh oui.txt.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ # # spec file for package arpwatch-ethercodes # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: arpwatch-ethercodes BuildRequires: arpwatch-ethercodes-build Url: http://standards.ieee.org/regauth/oui/ License: BSD3c Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch Version: 2011.3.1 Release: 1.<RELEASE2> Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description OUI and company ID data as fetched from IEEE.org prepared for arpwatch. Authors: -------- IEEE.org %prep %build pushd /usr/share/arpwatch bzip2 -cd ${RPM_SOURCE_DIR}/oui.txt.bz2 | \ ./massagevendor >${RPM_BUILD_DIR}/ethercodes.dat popd if [ ! -s ethercodes.dat ]; then echo "File ethercodes.dat is empty!" exit 1 fi %install mkdir -p \ $RPM_BUILD_ROOT/%{_datadir}/arpwatch install -m 0444 ethercodes.dat $RPM_BUILD_ROOT/%{_datadir}/arpwatch %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_datadir}/arpwatch %changelog ++++++ get_version_number.sh ++++++ get_date_version_string $( find_newest_file oui.txt.bz2) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pango for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at Tue Mar 1 10:13:06 CET 2011. -------- --- GNOME/pango/pango.changes 2010-10-13 20:26:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/pango/pango.changes 2011-03-01 08:25:23.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 28 09:32:26 CET 2011 - vuntz(a)opensuse.org + +- Add pango-CVE-2011-0020.patch: fixes heap corruption in font + parsing with FreeType2 backend. Fix bnc#666101, CVE-2011-0020. +- Add pango-CVE-2011-0064.patch: handle realloc failure in the + buffer to fix potential crashes. Fix bnc#672502, CVE-2011-0064. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pango-CVE-2011-0020.patch pango-CVE-2011-0064.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.8Fy8ng/_old 2011-03-01 10:09:12.000000000 +0100 +++ /var/tmp/diff_new_pack.8Fy8ng/_new 2011-03-01 10:09:12.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pango (Version 1.28.3) +# spec file for package pango # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ License: LGPLv2.1+ Group: System/Libraries Version: 1.28.3 -Release: 1 +Release: 5 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) Summary: Library for Layout and Rendering of Text Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2 @@ -32,6 +32,10 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream. Patch0: pango64.patch +# PATCH-FIX-UPSTREAM pango-CVE-2011-0020.patch bnc#666101 CVE-2011-0020 vuntz(a)opensuse.org -- heap corruption in font parsing with FreeType2 backend +Patch1: pango-CVE-2011-0020.patch +# PATCH-FIX-UPSTREAM pango-CVE-2011-0064.patch bnc#672502 CVE-2011-0064. vuntz(a)opensuse.org -- handle realloc failure in the buffer +Patch2: pango-CVE-2011-0064.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: pkg-config @@ -128,6 +132,8 @@ cp -a %{S:1} . %patch0 -p0 %endif +%patch1 -p1 +%patch2 -p1 %build %configure --disable-static --with-pic ++++++ pango-CVE-2011-0020.patch ++++++ >From 4e6248d76f55c6184f28afe614d7d76b6fa3d455 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod <behdad(a)behdad.org> Date: Thu, 17 Feb 2011 16:19:48 +0000 Subject: Bug 639882 - Heap corruption in font parsing with FreeType2 backend --- diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c index bd3b7d4..42923f4 100644 --- a/pango/pangoft2-render.c +++ b/pango/pangoft2-render.c @@ -121,9 +121,14 @@ pango_ft2_font_render_box_glyph (int width, box->bitmap.width = width; box->bitmap.rows = height; - box->bitmap.pitch = height; + box->bitmap.pitch = width; - box->bitmap.buffer = g_malloc0 (box->bitmap.rows * box->bitmap.pitch); + box->bitmap.buffer = g_malloc0_n (box->bitmap.rows, box->bitmap.pitch); + + if (G_UNLIKELY (!box->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, box); + return NULL; + } /* draw the box */ for (j = 0; j < line_width; j++) @@ -226,6 +231,11 @@ pango_ft2_font_render_glyph (PangoFont *font, rendered->bitmap_left = face->glyph->bitmap_left; rendered->bitmap_top = face->glyph->bitmap_top; + if (G_UNLIKELY (!rendered->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, rendered); + return NULL; + } + return rendered; } else @@ -276,6 +286,8 @@ pango_ft2_renderer_draw_glyph (PangoRenderer *renderer, if (rendered_glyph == NULL) { rendered_glyph = pango_ft2_font_render_glyph (font, glyph); + if (rendered_glyph == NULL) + return; add_glyph_to_cache = TRUE; } -- cgit v0.8.3.4 ++++++ pango-CVE-2011-0064.patch ++++++ >From 3104961bc0ffaf847d2a1e116e6de4fdc1cd8ada Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod <behdad(a)behdad.org> Date: Thu, 2 Dec 2010 16:00:46 +1300 Subject: [PATCH] Handle realloc failure in the buffer Ported from http://cgit.freedesktop.org/harfbuzz/commit/?id=a6a79df5fe2e by Karl Tomlinson <karlt+(a)karlt.net> --- pango/opentype/hb-buffer-private.h | 1 + pango/opentype/hb-buffer.c | 70 +++++++++++++++++++++--------------- pango/opentype/hb-buffer.h | 2 +- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/pango/opentype/hb-buffer-private.h b/pango/opentype/hb-buffer-private.h index 45cdc4d..f194786 100644 --- a/pango/opentype/hb-buffer-private.h +++ b/pango/opentype/hb-buffer-private.h @@ -72,6 +72,7 @@ struct _hb_buffer_t { unsigned int allocated; hb_bool_t have_output; /* weather we have an output buffer going on */ + hb_bool_t in_error; /* Allocation failed */ unsigned int in_length; unsigned int out_length; unsigned int in_pos; diff --git a/pango/opentype/hb-buffer.c b/pango/opentype/hb-buffer.c index 93b51e5..e9788ad 100644 --- a/pango/opentype/hb-buffer.c +++ b/pango/opentype/hb-buffer.c @@ -52,23 +52,21 @@ static hb_buffer_t _hb_buffer_nil = { * in_string and out_string. */ -/* XXX err handling */ - /* Internal API */ -static void +static hb_bool_t hb_buffer_ensure_separate (hb_buffer_t *buffer, unsigned int size) { - hb_buffer_ensure (buffer, size); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, size))) return FALSE; if (buffer->out_string == buffer->in_string) { assert (buffer->have_output); - if (!buffer->positions) - buffer->positions = calloc (buffer->allocated, sizeof (buffer->positions[0])); buffer->out_string = (hb_internal_glyph_info_t *) buffer->positions; memcpy (buffer->out_string, buffer->in_string, buffer->out_length * sizeof (buffer->out_string[0])); } + + return TRUE; } /* Public API */ @@ -114,6 +112,7 @@ void hb_buffer_clear (hb_buffer_t *buffer) { buffer->have_output = FALSE; + buffer->in_error = FALSE; buffer->in_length = 0; buffer->out_length = 0; buffer->in_pos = 0; @@ -122,32 +121,42 @@ hb_buffer_clear (hb_buffer_t *buffer) buffer->max_lig_id = 0; } -void +hb_bool_t hb_buffer_ensure (hb_buffer_t *buffer, unsigned int size) { - unsigned int new_allocated = buffer->allocated; - - if (size > new_allocated) + if (HB_UNLIKELY (size > buffer->allocated)) { + unsigned int new_allocated = buffer->allocated; + hb_internal_glyph_position_t *new_pos; + hb_internal_glyph_info_t *new_info; + hb_bool_t separate_out; + + if (HB_UNLIKELY (buffer->in_error)) + return FALSE; + + separate_out = buffer->out_string != buffer->in_string; + while (size > new_allocated) new_allocated += (new_allocated >> 1) + 8; - if (buffer->positions) - buffer->positions = realloc (buffer->positions, new_allocated * sizeof (buffer->positions[0])); + new_pos = (hb_internal_glyph_position_t *) realloc (buffer->positions, new_allocated * sizeof (buffer->positions[0])); + new_info = (hb_internal_glyph_info_t *) realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0])); - if (buffer->out_string != buffer->in_string) - { - buffer->in_string = realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0])); - buffer->out_string = (hb_internal_glyph_info_t *) buffer->positions; - } - else - { - buffer->in_string = realloc (buffer->in_string, new_allocated * sizeof (buffer->in_string[0])); - buffer->out_string = buffer->in_string; - } + if (HB_UNLIKELY (!new_pos || !new_info)) + buffer->in_error = TRUE; + + if (HB_LIKELY (new_pos)) + buffer->positions = new_pos; - buffer->allocated = new_allocated; + if (HB_LIKELY (new_info)) + buffer->in_string = new_info; + + buffer->out_string = separate_out ? (hb_internal_glyph_info_t *) buffer->positions : buffer->in_string; + if (HB_LIKELY (!buffer->in_error)) + buffer->allocated = new_allocated; } + + return HB_LIKELY (!buffer->in_error); } void @@ -158,7 +167,7 @@ hb_buffer_add_glyph (hb_buffer_t *buffer, { hb_internal_glyph_info_t *glyph; - hb_buffer_ensure (buffer, buffer->in_length + 1); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->in_length + 1))) return; glyph = &buffer->in_string[buffer->in_length]; glyph->codepoint = codepoint; @@ -213,6 +222,8 @@ _hb_buffer_swap (hb_buffer_t *buffer) assert (buffer->have_output); + if (HB_UNLIKELY (buffer->in_error)) return; + if (buffer->out_string != buffer->in_string) { hb_internal_glyph_info_t *tmp_string; @@ -265,7 +276,8 @@ _hb_buffer_add_output_glyphs (hb_buffer_t *buffer, if (buffer->out_string != buffer->in_string || buffer->out_pos + num_out > buffer->in_pos + num_in) { - hb_buffer_ensure_separate (buffer, buffer->out_pos + num_out); + if (HB_UNLIKELY (!hb_buffer_ensure_separate (buffer, buffer->out_pos + num_out))) + return; } mask = buffer->in_string[buffer->in_pos].mask; @@ -302,7 +314,7 @@ _hb_buffer_add_output_glyph (hb_buffer_t *buffer, if (buffer->out_string != buffer->in_string) { - hb_buffer_ensure (buffer, buffer->out_pos + 1); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->out_pos + 1))) return; buffer->out_string[buffer->out_pos] = buffer->in_string[buffer->in_pos]; } else if (buffer->out_pos != buffer->in_pos) @@ -332,7 +344,7 @@ _hb_buffer_next_glyph (hb_buffer_t *buffer) if (buffer->out_string != buffer->in_string) { - hb_buffer_ensure (buffer, buffer->out_pos + 1); + if (HB_UNLIKELY (!hb_buffer_ensure (buffer, buffer->out_pos + 1))) return; buffer->out_string[buffer->out_pos] = buffer->in_string[buffer->in_pos]; } else if (buffer->out_pos != buffer->in_pos) diff --git a/pango/opentype/hb-buffer.h b/pango/opentype/hb-buffer.h index b030ba9..aaf6694 100644 --- a/pango/opentype/hb-buffer.h +++ b/pango/opentype/hb-buffer.h @@ -94,7 +94,7 @@ hb_buffer_clear (hb_buffer_t *buffer); void hb_buffer_clear_positions (hb_buffer_t *buffer); -void +hb_bool_t hb_buffer_ensure (hb_buffer_t *buffer, unsigned int size); -- 1.7.2.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pm-utils for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '11

01 Mar '11

Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Tue Mar 1 10:08:04 CET 2011. -------- --- pm-utils/pm-utils.changes 2011-02-13 23:23:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2011-03-01 09:33:50.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 1 08:29:54 UTC 2011 - mvyskocil(a)suse.cz + +- Fix bnc#663067 - remove harddrive power.d hook + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.1A34z4/_old 2011-03-01 10:06:58.000000000 +0100 +++ /var/tmp/diff_new_pack.1A34z4/_new 2011-03-01 10:06:58.000000000 +0100 @@ -23,7 +23,7 @@ Name: pm-utils Version: 1.4.1 -Release: 7 +Release: 8 Summary: Tools to suspend and hibernate computers License: GPLv2+ Group: System/Base @@ -101,6 +101,8 @@ %install %{makeinstall} +# bnc#663067 +%{__rm} %{buildroot}/%{pm_libdir}/power.d/harddrive #FIXME: should be installed by make install %{__install} -m 644 man/*.1 %{buildroot}/%{_mandir}/man1 %{__install} -m 644 man/*.8 %{buildroot}/%{_mandir}/man8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0