diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -42,6 +42,7 @@ libfreetype.so.6:FT_Face_GetCharsOfVariant libfreetype.so.6:FT_Face_GetVariantSelectors libfreetype.so.6:FT_Face_GetVariantsOfChar +libfreetype.so.6:FT_Face_Properties libfreetype.so.6:FT_Face_SetUnpatentedHinting libfreetype.so.6:FT_FloorFix libfreetype.so.6:FT_Get_Advance @@ -76,6 +77,7 @@ libfreetype.so.6:FT_Get_PS_Font_Value libfreetype.so.6:FT_Get_Postscript_Name libfreetype.so.6:FT_Get_Renderer +libfreetype.so.6:FT_Get_Sfnt_LangTag libfreetype.so.6:FT_Get_Sfnt_Name libfreetype.so.6:FT_Get_Sfnt_Name_Count libfreetype.so.6:FT_Get_Sfnt_Table @@ -154,6 +156,7 @@ libfreetype.so.6:FT_Set_Char_Size libfreetype.so.6:FT_Set_Charmap libfreetype.so.6:FT_Set_Debug_Hook +libfreetype.so.6:FT_Set_Default_Properties libfreetype.so.6:FT_Set_MM_Blend_Coordinates libfreetype.so.6:FT_Set_MM_Design_Coordinates libfreetype.so.6:FT_Set_Pixel_Sizes diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -42,6 +42,7 @@ libfreetype.so.6:FT_Face_GetCharsOfVariant libfreetype.so.6:FT_Face_GetVariantSelectors libfreetype.so.6:FT_Face_GetVariantsOfChar +libfreetype.so.6:FT_Face_Properties libfreetype.so.6:FT_Face_SetUnpatentedHinting libfreetype.so.6:FT_FloorFix libfreetype.so.6:FT_Get_Advance @@ -76,6 +77,7 @@ libfreetype.so.6:FT_Get_PS_Font_Value libfreetype.so.6:FT_Get_Postscript_Name libfreetype.so.6:FT_Get_Renderer +libfreetype.so.6:FT_Get_Sfnt_LangTag libfreetype.so.6:FT_Get_Sfnt_Name libfreetype.so.6:FT_Get_Sfnt_Name_Count libfreetype.so.6:FT_Get_Sfnt_Table @@ -154,6 +156,7 @@ libfreetype.so.6:FT_Set_Char_Size libfreetype.so.6:FT_Set_Charmap libfreetype.so.6:FT_Set_Debug_Hook +libfreetype.so.6:FT_Set_Default_Properties libfreetype.so.6:FT_Set_MM_Blend_Coordinates libfreetype.so.6:FT_Set_MM_Design_Coordinates libfreetype.so.6:FT_Set_Pixel_Sizes diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,3 +1,5 @@ libbz2.so.1.0 libc.so.6 +libharfbuzz.so.0 +libpng15.so.15 libz.so.1 diff --git a/abi_used_libs32 b/abi_used_libs32 --- a/abi_used_libs32 +++ b/abi_used_libs32 @@ -1,2 +1,4 @@ libc.so.6 +libharfbuzz.so.0 +libpng15.so.15 libz.so.1 diff --git a/files/security/cve-2017-7857.patch b/files/security/cve-2017-7857.patch deleted file mode 100644 --- a/files/security/cve-2017-7857.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a6f486a76edbcd8b184086705b3b139dad553f4b Mon Sep 17 00:00:00 2001 -From: Ikey Doherty -Date: Thu, 4 May 2017 03:32:45 +0100 -Subject: [PATCH] sfnt: Backport fixes for CVE-2017-7857 - -Upstream: 7bbb91fbf47fc0775cc9705673caf0c47a81f94b -https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=759 - -Signed-off-by: Ikey Doherty ---- - src/sfnt/sfobjs.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c -index 818009e..3fd419e 100644 ---- a/src/sfnt/sfobjs.c -+++ b/src/sfnt/sfobjs.c -@@ -986,7 +986,9 @@ - face->variation_support |= TT_FACE_FLAG_VAR_FVAR; - - /* we don't support Multiple Master CFFs yet */ -- if ( !face->goto_table( face, TTAG_CFF, stream, 0 ) ) -+ if ( face->goto_table( face, TTAG_glyf, stream, 0 ) && -+ face->goto_table( face, TTAG_CFF2, stream, 0 ) && -+ !face->goto_table( face, TTAG_CFF, stream, 0 ) ) - num_instances = 0; - - /* we support at most 2^15 - 1 instances */ --- -2.12.2 - diff --git a/files/security/cve-2017-7858.nopatch b/files/security/cve-2017-7858.nopatch deleted file mode 100644 --- a/files/security/cve-2017-7858.nopatch +++ /dev/null @@ -1 +0,0 @@ -# Present in 2.7.1 freetype2 diff --git a/files/security/cve-2017-7864.patch b/files/security/cve-2017-7864.patch deleted file mode 100644 --- a/files/security/cve-2017-7864.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e6699596af5c5d6f0ae0ea06e19df87dce088df8 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Thu, 2 Feb 2017 11:38:04 +0100 -Subject: [truetype] Fix MVAR post-action handling. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=509 - -* src/truetype/ttobjs.c (tt_size_reset): Do nothing for CFF2. This -is important to make `tt_size_reset_iterator' (called in -`tt_apply_mvar') always work. ---- - ChangeLog | 12 ++++++++++++ - src/truetype/ttobjs.c | 8 ++++++-- - 2 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c -index 14770a5..908e7c5 100644 ---- a/src/truetype/ttobjs.c -+++ b/src/truetype/ttobjs.c -@@ -1196,10 +1196,14 @@ - FT_Size_Metrics* metrics; - - -- size->ttmetrics.valid = FALSE; -- - face = (TT_Face)size->root.face; - -+ /* nothing to do for CFF2 */ -+ if ( face->isCFF2 ) -+ return FT_Err_Ok; -+ -+ size->ttmetrics.valid = FALSE; -+ - metrics = &size->metrics; - - /* copy the result from base layer */ --- -2.12.2 - diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,5 +1,3 @@ 0001-modules-Enable-gxvalid-otvalid.patch 0002-config-Enabel-subpixel-rendering-infinality-engine.patch 0003-truetype-Only-enable-subpixel-rendering-when-a-speci.patch -security/cve-2017-7864.patch -security/cve-2017-7857.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : freetype2 -version : 2.7.1 -release : 15 +version : 2.8 +release : 16 source : - - http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz : 162ef25aa64480b1189cdb261228e6c5c44f212aac4b4621e28cf2157efb59f5 + - https://download.savannah.gnu.org/releases/freetype/freetype-2.8.tar.gz : 33a28fabac471891d0523033e99c0005b95e5618dc8ffa7fa47f9dadcacb1c9b license : GPL-3.0 summary : Font rendering library component : system.base @@ -12,6 +12,8 @@ - devel : /usr/share/aclocal - subpixel : /usr/share/fonts/enable_subpixel_rendering builddeps : + - pkgconfig32(harfbuzz) + - pkgconfig32(libpng) - pkgconfig32(zlib) rundeps : - subpixel : diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ freetype2 - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@riseup.net GPL-3.0 system.base @@ -31,7 +31,7 @@ emul32 - freetype2 + freetype2 /usr/lib32/lib*.so.* @@ -44,8 +44,8 @@ programming.devel - freetype2-32bit - freetype2-devel + freetype2-32bit + freetype2-devel /usr/lib32/lib*.so @@ -59,7 +59,7 @@ programming.devel - freetype2 + freetype2 /usr/include/ @@ -74,19 +74,19 @@ The FreeType2 package contains a library which allows applications to properly render TrueType fonts. - freetype2 + freetype2 /usr/share/fonts/enable_subpixel_rendering - - 2017-05-04 - 2.7.1 + + 2017-05-14 + 2.8 Packaging update - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file