commit: 39892b09bb0b45155d545c6fd9fec43a99ca4ecc Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Thu Aug 15 11:30:15 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Thu Aug 15 11:35:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39892b09
x11-libs/pango: fix CVE-2019-1010238 Bug: https://bugs.gentoo.org/692110 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch | 34 ++++++++++ x11-libs/pango/pango-1.42.4-r2.ebuild | 72 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch b/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch new file mode 100644 index 00000000000..eaf0784c1b3 --- /dev/null +++ b/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch @@ -0,0 +1,34 @@ +From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mcla...@redhat.com> +Date: Wed, 10 Jul 2019 20:26:23 -0400 +Subject: [PATCH] bidi: Be safer against bad input + +Don't run off the end of an array that we +allocated to certain length. + +Closes: https://gitlab.gnome.org/GNOME/pango/issues/342 +--- + pango/pango-bidi-type.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c +index 3e46b66c..5c02dbbb 100644 +--- a/pango/pango-bidi-type.c ++++ b/pango/pango-bidi-type.c +@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar *text, + for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) + { + gunichar ch = g_utf8_get_char (p); +- FriBidiCharType char_type; +- char_type = fribidi_get_bidi_type (ch); ++ FriBidiCharType char_type = fribidi_get_bidi_type (ch); ++ ++ if (i == n_chars) ++ break; ++ + bidi_types[i] = char_type; + ored_types |= char_type; + if (FRIBIDI_IS_STRONG (char_type)) +-- +2.21.0 + diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild new file mode 100644 index 00000000000..7d103157839 --- /dev/null +++ b/x11-libs/pango/pango-1.42.4-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 multilib-minimal toolchain-funcs + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="https://www.pango.org/"; +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"; + +LICENSE="LGPL-2+ FTL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="X +introspection test" + +RDEPEND=" + >=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}] + >=dev-libs/glib-2.50.2:2[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + X? ( + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.20 + virtual/pkgconfig[${MULTILIB_USEDEP}] + test? ( media-fonts/cantarell ) + X? ( x11-base/xorg-proto ) + !<=sys-devel/autoconf-2.63:2.5 +" + +PATCHES=( + "${WORKDIR}"/patches/ # bug fix cherry-picks from master by 20190216; each patch has commit id of origin/master included and will be part of 1.43.1/1.44 + "${FILESDIR}"/${PV}-CVE-2019-1010238.patch +) + +src_prepare() { + gnome2_src_prepare + # This should be updated if next release fails to pre-generate the manpage as well, or src_prepare removed if is properly generated + # https://gitlab.gnome.org/GNOME/pango/issues/270 + cp -v "${FILESDIR}"/${PV}-pango-view.1.in "${S}/utils/pango-view.1.in" || die +} + +multilib_src_configure() { + tc-export CXX + + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --with-cairo \ + $(multilib_native_use_enable introspection) \ + $(use_with X xft) \ + "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \ + "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")" + + if multilib_is_native_abi; then + ln -s "${S}"/docs/html docs/html || die + fi +} + +multilib_src_install() { + gnome2_src_install +}
