commit: 8f61052c6662f67248012539bf9ad727b01ad9f3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 12 12:18:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 12 12:18:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f61052c
media-libs/freetype: backport 2 UB fixes Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/freetype-2.14.1-deref-check.patch | 37 +++ .../files/freetype-2.14.1-ubsan-overflow.patch | 192 +++++++++++++++ media-libs/freetype/freetype-2.14.1-r1.ebuild | 257 +++++++++++++++++++++ 3 files changed, 486 insertions(+) diff --git a/media-libs/freetype/files/freetype-2.14.1-deref-check.patch b/media-libs/freetype/files/freetype-2.14.1-deref-check.patch new file mode 100644 index 000000000000..ef84aedfc8d0 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.14.1-deref-check.patch @@ -0,0 +1,37 @@ +https://gitlab.freedesktop.org/freetype/freetype/-/issues/1362 +https://gitlab.freedesktop.org/freetype/freetype/-/commit/7955c9b86abfbce40ca7b06579bb1de8c945762f + +From 7955c9b86abfbce40ca7b06579bb1de8c945762f Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <[email protected]> +Date: Wed, 24 Sep 2025 05:56:34 +0200 +Subject: [PATCH] * src/bdf/bdfdriver.c (BDF_Glyph_Load): Use + `bdf->bdffont->bpp` directly. + +Fixes issue #1362. +--- + src/bdf/bdfdrivr.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c +index f57bb0007..94549b692 100644 +--- a/src/bdf/bdfdrivr.c ++++ b/src/bdf/bdfdrivr.c +@@ -800,7 +800,6 @@ THE SOFTWARE. + FT_Error error = FT_Err_Ok; + FT_Bitmap* bitmap = &slot->bitmap; + bdf_glyph_t glyph; +- int bpp = bdf->bdffont->bpp; + + FT_UNUSED( load_flags ); + +@@ -839,7 +838,7 @@ THE SOFTWARE. + /* we can simply point to it */ + ft_glyphslot_set_bitmap( slot, glyph.bitmap ); + +- switch ( bpp ) ++ switch ( bdf->bdffont->bpp ) + { + case 1: + bitmap->pixel_mode = FT_PIXEL_MODE_MONO; +-- +GitLab diff --git a/media-libs/freetype/files/freetype-2.14.1-ubsan-overflow.patch b/media-libs/freetype/files/freetype-2.14.1-ubsan-overflow.patch new file mode 100644 index 000000000000..eb0fd78ae71f --- /dev/null +++ b/media-libs/freetype/files/freetype-2.14.1-ubsan-overflow.patch @@ -0,0 +1,192 @@ +https://gitlab.freedesktop.org/freetype/freetype/-/issues/1363 +https://gitlab.freedesktop.org/freetype/freetype/-/commit/4334f009e7d20789cc7ee1224290ea1e22a17b5b + +From 4334f009e7d20789cc7ee1224290ea1e22a17b5b Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <[email protected]> +Date: Sun, 28 Sep 2025 08:09:48 +0200 +Subject: [PATCH] [autofit] Prevent signed integer overflow. + +* src/autofit/aflatin.c (af_latin_stretch_top_tilde, + af_latin_stretch_bottom_tilde, af_latin_align_top_tilde, + af_latin_align_bottom_tilde, + af_glyph_hints_apply_vertical_separation_adjustments): Use `ADD_LONG` and + `SUB_LONG` for values that involve `FT_LONG_MAX` and `FT_LONG_MIN`. + +Fixes issue #1363. +--- + src/autofit/aflatin.c | 46 ++++++++++++++++++++++--------------------- + 1 file changed, 24 insertions(+), 22 deletions(-) + +diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c +index cb5667ff7..d7bea8348 100644 +--- a/src/autofit/aflatin.c ++++ b/src/autofit/aflatin.c +@@ -3269,9 +3269,9 @@ + next_on = next_on->next; + + if ( next_on->y > p->y && prev_on->y > p->y ) +- measurement = p->y - min_y; ++ measurement = SUB_LONG( p->y, min_y ); + else if ( next_on->y < p->y && prev_on->y < p->y ) +- measurement = max_y - p->y; ++ measurement = SUB_LONG( max_y, p->y ); + else + continue; + +@@ -3313,7 +3313,8 @@ + /* We adjust the height of the diacritic only, which means */ + /* we are never dealing with large numbers and can thus avoid */ + /* `FT_MulFix`. */ +- p->y = ( ( p->y - min_y ) * target_height / height ) + min_y; ++ p->y = ADD_LONG( SUB_LONG( p->y, min_y ) * target_height / height, ++ min_y ); + + } while ( p != first_point ); + +@@ -3370,9 +3371,9 @@ + next_on = next_on->next; + + if ( next_on->y > p->y && prev_on->y > p->y ) +- measurement = p->y - min_y; ++ measurement = SUB_LONG( p->y, min_y ); + else if ( next_on->y < p->y && prev_on->y < p->y ) +- measurement = max_y - p->y; ++ measurement = SUB_LONG( max_y, p->y ); + else + continue; + +@@ -3404,7 +3405,8 @@ + do + { + p = p->next; +- p->y = ( ( p->y - max_y ) * target_height / height ) + max_y; ++ p->y = ADD_LONG( SUB_LONG( p->y, max_y ) * target_height / height, ++ max_y ); + + } while ( p != first_point ); + +@@ -3463,8 +3465,8 @@ + + /* Align bottom of the tilde to the grid. */ + min_y_rounded = FT_PIX_ROUND( min_y ); +- delta = min_y_rounded - min_y; +- height = max_y - min_y; ++ delta = SUB_LONG( min_y_rounded, min_y ); ++ height = SUB_LONG( max_y, min_y ); + + /* If the tilde is less than 3 pixels tall, snap the center of it */ + /* to the grid instead of the bottom to improve readability. */ +@@ -3503,8 +3505,8 @@ + } while ( p != first_point ); + + max_y_rounded = FT_PIX_ROUND( max_y ); +- delta = max_y_rounded - max_y; +- height = max_y - min_y; ++ delta = SUB_LONG( max_y_rounded, max_y ); ++ height = SUB_LONG( max_y, min_y ); + + if ( height < 64 * 3 ) + delta -= ( FT_PIX_ROUND( height ) - height ) / 2; +@@ -3673,7 +3675,7 @@ + + high_min_y = hints->contour_y_minima[high_contour]; + high_max_y = hints->contour_y_maxima[high_contour]; +- high_height = high_max_y - high_min_y; ++ high_height = SUB_LONG( high_max_y, high_min_y ); + + if ( high_height > accent_height_limit ) + { +@@ -3705,7 +3707,7 @@ + /* We also check that the y minimum of the 'other' contour */ + /* is below the high contour to avoid potential false hits */ + /* with contours enclosed in the high one. */ +- distance = high_min_y - max_y; ++ distance = SUB_LONG( high_min_y, max_y ); + if ( distance < 64 && + distance < min_distance && + min_y < high_min_y ) +@@ -3724,14 +3726,14 @@ + + tilde_min_y = hints->contour_y_minima[tilde_contour]; + tilde_max_y = hints->contour_y_maxima[tilde_contour]; +- tilde_height = tilde_max_y - tilde_min_y; ++ tilde_height = SUB_LONG( tilde_max_y, tilde_min_y); + + /* The vertical separation adjustment potentially undoes a */ + /* tilde center alignment. If it would grid-align a tilde */ + /* less than 3 pixels in height, shift additionally to */ + /* re-center the tilde. */ + +- pos = high_min_y + adjustment_amount; ++ pos = ADD_LONG( high_min_y, adjustment_amount ); + if ( adjust_below_top && is_top_tilde ) + pos += high_height; + +@@ -3764,7 +3766,7 @@ + { + /* Value 8 is heuristic. */ + FT_Pos height_delta = high_height / 8; +- FT_Pos min_y_limit = high_min_y - height_delta; ++ FT_Pos min_y_limit = SUB_LONG( high_min_y, height_delta ); + + + FT_TRACE4(( " Pushing high contour %ld units up\n", +@@ -3784,7 +3786,7 @@ + centering_adjustment )); + + af_move_contours_up( hints, +- min_y_limit + high_height, ++ ADD_LONG( min_y_limit, high_height ), + centering_adjustment ); + } + } +@@ -3838,7 +3840,7 @@ + + low_min_y = hints->contour_y_minima[low_contour]; + low_max_y = hints->contour_y_maxima[low_contour]; +- low_height = low_max_y - low_min_y; ++ low_height = SUB_LONG( low_max_y, low_min_y ); + + if ( low_height > accent_height_limit ) + { +@@ -3863,7 +3865,7 @@ + min_y = hints->contour_y_minima[contour]; + max_y = hints->contour_y_maxima[contour]; + +- distance = min_y - low_max_y; ++ distance = SUB_LONG( min_y, low_max_y ); + if ( distance < 64 && + distance < min_distance && + max_y > low_max_y ) +@@ -3882,9 +3884,9 @@ + + tilde_min_y = hints->contour_y_minima[tilde_contour]; + tilde_max_y = hints->contour_y_maxima[tilde_contour]; +- tilde_height = tilde_max_y - tilde_min_y; ++ tilde_height = SUB_LONG( tilde_max_y, tilde_min_y ); + +- pos = low_max_y - adjustment_amount; ++ pos = SUB_LONG( low_max_y, adjustment_amount ); + if ( adjust_above_bottom && is_bottom_tilde ) + pos -= low_height; + +@@ -3915,7 +3917,7 @@ + ( calculated_amount <= 66 || adjustment_amount <= 66 ) ) + { + FT_Pos height_delta = low_height / 8; +- FT_Pos max_y_limit = low_max_y + height_delta; ++ FT_Pos max_y_limit = ADD_LONG( low_max_y, height_delta ); + + + FT_TRACE4(( " Pushing low contour %ld units down\n", +@@ -3929,7 +3931,7 @@ + centering_adjustment )); + + af_move_contours_down( hints, +- max_y_limit - low_height, ++ SUB_LONG( max_y_limit, low_height ), + centering_adjustment ); + } + } +-- +GitLab diff --git a/media-libs/freetype/freetype-2.14.1-r1.ebuild b/media-libs/freetype/freetype-2.14.1-r1.ebuild new file mode 100644 index 000000000000..e00dfd80ace9 --- /dev/null +++ b/media-libs/freetype/freetype-2.14.1-r1.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools libtool multilib-minimal toolchain-funcs + +DESCRIPTION="High-quality and portable font engine" +HOMEPAGE="https://www.freetype.org/"; + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 +else + SRC_URI=" + https://downloads.sourceforge.net/freetype/${P/_/}.tar.xz + mirror://nongnu/freetype/${P/_/}.tar.xz + utils? ( + https://downloads.sourceforge.net/freetype/ft2demos-${PV}.tar.xz + mirror://nongnu/freetype/ft2demos-${PV}.tar.xz + ) + doc? ( + https://downloads.sourceforge.net/freetype/${PN}-doc-${PV}.tar.xz + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz + ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="|| ( FTL GPL-2+ )" +SLOT="2" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils" + +RDEPEND=" + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) + utils? ( + svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] ) + X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" +PDEPEND="harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )" + +PATCHES=( + "${FILESDIR}"/${P}-deref-check.patch + "${FILESDIR}"/${P}-ubsan-overflow.patch +) + +_egit_repo_handler() { + if [[ ${PV} == 9999 ]] ; then + local phase="${1}" + case ${phase} in + fetch|unpack) + :; + ;; + *) + die "Please use this function with either \"fetch\" or \"unpack\"" + ;; + esac + + local EGIT_REPO_URI + EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"; + git-r3_src_${phase} + if use utils ; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"; + local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" + git-r3_src_${phase} + fi + else + default + fi +} + +pkg_pretend() { + if use svg && ! use utils ; then + einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled." + fi +} + +src_unpack() { + _egit_repo_handler ${EBUILD_PHASE} + + if [[ ${PV} == 9999 ]] ; then + # Need to copy stuff from dlg subproject (bug #758902) + local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" + local dlg_src_dir="${S}/subprojects/dlg/src/dlg" + local dlg_dest_dir="${S}/include" + mkdir -p "${dlg_dest_dir}/dlg" || die + cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die + cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die + fi +} + +src_prepare() { + if [[ ${PV} == 9999 ]] ; then + # Do NOT automagically mess with submodules! + sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die + + # Inspired by shipped autogen.sh script + eval $(sed -n \ + -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ + -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ + -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \ + include/freetype/freetype.h || die) + FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}" + [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}" + + pushd builds/unix &>/dev/null || die + sed -e "s;@VERSION@;${FREETYPE};" \ + < configure.raw > configure.ac || die + unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE + popd &>/dev/null || die + fi + + default + + pushd builds/unix &>/dev/null || die + # eautoheader produces broken ftconfig.in + AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf + popd &>/dev/null || die + + # This is the same as the 01 patch from infinality + sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die + + enable_option() { + sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to disable option $1" + } + + if ! use cleartype-hinting ; then + disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING + fi + + # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" + # via environment (new since v2.8) + enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES + + # See https://freetype.org/patents.html (expired!) + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + if ! use adobe-cff ; then + enable_option CFF_CONFIG_OPTION_OLD_ENGINE + fi + + if use debug ; then + enable_option FT_DEBUG_LEVEL_TRACE + enable_option FT_DEBUG_MEMORY + fi + + if use utils ; then + cd "${WORKDIR}/ft2demos-${PV}" || die + # Disable tests needing X11 when USE="-X". (bug #177597) + if ! use X ; then + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die + fi + cd "${S}" || die + fi + + # bug #869803 + rm docs/reference/sitemap.xml.gz || die + + # We need non-/bin/sh to run configure + if [[ -n ${CONFIG_SHELL} ]] ; then + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ + "${S}"/builds/unix/configure || die + fi + + elibtoolize --patch-only +} + +multilib_src_configure() { + export GNUMAKE=gmake + + local myeconfargs=( + --disable-freetype-config + --enable-shared + --with-zlib + $(use_with brotli) + $(use_with bzip2) + # As of 2.14.0, FT bundles its own copies of the needed headers and dlopen()s + # harfbuzz instead, which breaks an insidious circular dependency. + $(use_with harfbuzz harfbuzz dynamic) + $(use_with png) + $(use_enable static-libs static) + $(usex utils $(use_with svg librsvg) --without-librsvg) + + # Avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + case ${CHOST} in + mingw*|*-mingw*) ;; + # Workaround windows misdetection: bug #654712 + # Have to do it for both ${CHOST}-windres and windres + *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; + esac + + export CC_BUILD="$(tc-getBUILD_CC)" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use utils ; then + einfo "Building utils" + # Fix for Prefix, bug #339334 + emake \ + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use utils ; then + einfo "Installing utils" + emake DESTDIR="${D}" FT2DEMOS=1 \ + TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install + fi +} + +multilib_src_install_all() { + if use fontforge ; then + # fontforge can probably cope with fewer of these, but this is simpler + einfo "Installing internal headers required for fontforge" + local header + find src/truetype include/freetype/internal -name '*.h' | \ + while read header ; do + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + done + fi + + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} + if [[ ${PV} != 9999 ]] && use doc ; then + docinto html + dodoc -r docs/* + fi + + find "${ED}" -type f -name '*.la' -delete || die +}
