diff --git a/CVE-2020-15999.patch b/CVE-2020-15999.patch deleted file mode 100644 index 4faff70..0000000 --- a/CVE-2020-15999.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a3bab162b2ae616074c8877a04556932998aeacd Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Mon, 19 Oct 2020 23:45:28 +0200 -Subject: [sfnt] Fix heap buffer overflow (#59308). - This is CVE-2020-15999. - * src/sfnt/pngshim.c (Load_SBit_Png): Test bitmap size earlier. -reference：https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=a3bab162b2ae616074c8877a04556932998aeacd ---- - src/sfnt/pngshim.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c -index 523b30a..5502108 100644 ---- a/src/sfnt/pngshim.c -+++ b/src/sfnt/pngshim.c -@@ -328,6 +328,13 @@ - - if ( populate_map_and_metrics ) - { -+ /* reject too large bitmaps similarly to the rasterizer */ -+ if ( imgHeight > 0x7FFF || imgWidth > 0x7FFF ) -+ { -+ error = FT_THROW( Array_Too_Large ); -+ goto DestroyExit; -+ } -+ - metrics->width = (FT_UShort)imgWidth; - metrics->height = (FT_UShort)imgHeight; - -@@ -336,13 +343,6 @@ - map->pixel_mode = FT_PIXEL_MODE_BGRA; - map->pitch = (int)( map->width * 4 ); - map->num_grays = 256; -- -- /* reject too large bitmaps similarly to the rasterizer */ -- if ( map->rows > 0x7FFF || map->width > 0x7FFF ) -- { -- error = FT_THROW( Array_Too_Large ); -- goto DestroyExit; -- } - } - - /* convert palette/gray image to rgb */ --- -2.27.0 \ No newline at end of file diff --git a/backport-freetype-2.3.0-enable-spr.patch b/backport-freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 421fe98..0000000 --- a/backport-freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,19 +0,0 @@ -From c1c64f8cf9264592bca747c9463814a805150346 Mon Sep 17 00:00:00 2001 -From: besfahbo -Date: Jan 18 2007 19:42:34 +0000 -Subject: - Add without_subpixel_rendering. - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/c1c64f8cf9264592bca747c9463814a805150346 - ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - * macro is not defined, FreeType offers alternative LCD rendering - * technology that produces excellent output without LCD filtering. - */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /************************************************************************** diff --git a/backport-freetype-2.10.0-internal-outline.patch b/freetype-2.10.0-internal-outline.patch similarity index 83% rename from backport-freetype-2.10.0-internal-outline.patch rename to freetype-2.10.0-internal-outline.patch index a3e7b4d..0f69ff9 100644 --- a/backport-freetype-2.10.0-internal-outline.patch +++ b/freetype-2.10.0-internal-outline.patch @@ -1,17 +1,3 @@ -From 2e6bf149908d61c2b2121dad36f2caef260a2053 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: May 28 2019 12:56:55 +0000 -Subject: Keep FT_Outline_New_Internal() and FT_Outline_Done_Internal() -for ABI compatibility but make them just throw -Unimplemented_Feature error. - -Remove them once soname has been bumped! - -Resolves: #1689117 - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/2e6bf149908d61c2b2121dad36f2caef260a2053 - --- freetype-2.10.0/include/freetype/ftoutln.h +++ freetype-2.10.0/include/freetype/ftoutln.h @@ -165,6 +165,15 @@ FT_BEGIN_HEADER diff --git a/backport-freetype-2.10.1-debughook.patch b/freetype-2.10.1-debughook.patch similarity index 58% rename from backport-freetype-2.10.1-debughook.patch rename to freetype-2.10.1-debughook.patch index 58af2d5..4421401 100644 --- a/backport-freetype-2.10.1-debughook.patch +++ b/freetype-2.10.1-debughook.patch @@ -1,11 +1,3 @@ -From ac07a003d7f75321346188eb9618d418d2b2decb Mon Sep 17 00:00:00 2001 -From: Michael Kuhn -Date: Oct 17 2019 19:06:50 +0000 -Subject: Revert FT_DebugHook_Func ABI/API changes - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/ac07a003d7f75321346188eb9618d418d2b2decb - diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h index 8d039c4f3..88488bfe8 100644 --- a/include/freetype/ftmodapi.h diff --git a/freetype-2.10.2.tar.xz b/freetype-2.10.2.tar.xz deleted file mode 100644 index 1b53918..0000000 Binary files a/freetype-2.10.2.tar.xz and /dev/null differ diff --git a/freetype-2.11.0.tar.xz b/freetype-2.11.0.tar.xz new file mode 100644 index 0000000..22a0b04 Binary files /dev/null and b/freetype-2.11.0.tar.xz differ diff --git a/backport-freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch similarity index 61% rename from backport-freetype-2.2.1-enable-valid.patch rename to freetype-2.2.1-enable-valid.patch index f39f59c..e1615aa 100644 --- a/backport-freetype-2.2.1-enable-valid.patch +++ b/freetype-2.2.1-enable-valid.patch @@ -1,12 +1,3 @@ -From cbf2c99f7813750cb82deb367a37e50dbb709395 Mon Sep 17 00:00:00 2001 -From: besfahbo -Date: Jul 08 2006 01:07:01 +0000 -Subject: - Enable modules gxvalid and otvalid - -Enable modules gxvalid and otvalid - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/cbf2c99f7813750cb82deb367a37e50dbb709395 --- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 +++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 @@ -110,7 +110,7 @@ diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch new file mode 100644 index 0000000..2c812cd --- /dev/null +++ b/freetype-2.3.0-enable-spr.patch @@ -0,0 +1,11 @@ +--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 ++++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 +@@ -92,7 +92,7 @@ + * When this macro is not defined, FreeType offers alternative LCD + * rendering technology that produces excellent output. + */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /************************************************************************** diff --git a/freetype-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch index e737cb7..7e58be7 100644 --- a/freetype-2.5.2-more-demos.patch +++ b/freetype-2.5.2-more-demos.patch @@ -14,4 +14,4 @@ + EXES += fttimer # EXES += testname - exes: $(EXES:%=$(BIN_DIR_2)/%$E) + # Not all demo programs have a man page; we thus check for existence in a diff --git a/backport-freetype-2.6.5-libtool.patch b/freetype-2.6.5-libtool.patch similarity index 52% rename from backport-freetype-2.6.5-libtool.patch rename to freetype-2.6.5-libtool.patch index b3b3a33..4e0c2cb 100644 --- a/backport-freetype-2.6.5-libtool.patch +++ b/freetype-2.6.5-libtool.patch @@ -1,10 +1,3 @@ -From 928ba6125d73435fddd73f9bf155e0f2a813bab7 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Aug 22 2016 13:08:48 +0000 -Subject: Don't show path of non-existing libtool file - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/928ba6125d73435fddd73f9bf155e0f2a813bab7 --- freetype-2.8/builds/unix/freetype-config.in.orig 2017-03-30 12:20:23.000000001 +0200 +++ freetype-2.8/builds/unix/freetype-config.in 2017-05-16 13:25:39.223041128 +0200 @@ -205,7 +205,7 @@ if test "$echo_libs" = "yes" ; then diff --git a/backport-freetype-2.8-multilib.patch b/freetype-2.8-multilib.patch similarity index 83% rename from backport-freetype-2.8-multilib.patch rename to freetype-2.8-multilib.patch index 23b6b20..3ffd146 100644 --- a/backport-freetype-2.8-multilib.patch +++ b/freetype-2.8-multilib.patch @@ -1,14 +1,3 @@ -From 1007098e54f9449281f83516f0272afa5d20ec29 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Oct 09 2017 11:57:11 +0000 -Subject: Fix multilib conflict - -Require pkgconf so we can make freetype-config multilib compatible again - -Resolves: #1497443 - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/1007098e54f9449281f83516f0272afa5d20ec29?branch=rawhide --- freetype-2.9/builds/unix/freetype-config.in +++ freetype-2.9/builds/unix/freetype-config.in @@ -13,45 +13,25 @@ LC_ALL=C diff --git a/freetype-doc-2.10.2.tar.xz b/freetype-doc-2.10.2.tar.xz deleted file mode 100644 index c7f1edf..0000000 Binary files a/freetype-doc-2.10.2.tar.xz and /dev/null differ diff --git a/freetype-doc-2.11.0.tar.xz b/freetype-doc-2.11.0.tar.xz new file mode 100644 index 0000000..dcb673a Binary files /dev/null and b/freetype-doc-2.11.0.tar.xz differ diff --git a/freetype.spec b/freetype.spec index c16108e..2876e06 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,8 +3,8 @@ %{!?with_xfree86:%define with_xfree86 1} Name: freetype -Version: 2.10.2 -Release: 3 +Version: 2.11.0 +Release: 1 Summary: FreeType is a freely available software library to render fonts License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement URL: http://www.freetype.org @@ -14,22 +14,21 @@ Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{ve Source3: ftconfig.h Patch1: freetype-2.5.2-more-demos.patch -Patch2: CVE-2020-15999.patch -Patch6000: backport-freetype-2.3.0-enable-spr.patch -Patch6001: backport-freetype-2.2.1-enable-valid.patch -Patch6002: backport-freetype-2.6.5-libtool.patch -Patch6003: backport-freetype-2.8-multilib.patch -Patch6004: backport-freetype-2.10.0-internal-outline.patch -Patch6005: backport-freetype-2.10.1-debughook.patch +Patch6000: freetype-2.3.0-enable-spr.patch +Patch6001: freetype-2.2.1-enable-valid.patch +Patch6002: freetype-2.6.5-libtool.patch +Patch6003: freetype-2.8-multilib.patch +Patch6004: freetype-2.10.0-internal-outline.patch +Patch6005: freetype-2.10.1-debughook.patch BuildRequires: gcc libX11-devel libpng-devel zlib-devel bzip2-devel -Provides: %{name}-bytecode %{name}-demos +Provides: %{name}-bytecode %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0} Provides: %{name}-subpixel %endif -Obsoletes: %{name}-demos +Obsoletes: freetype-freeworld < 2.9.1-2 %description FreeType is written in C, designed to be small,efficient, highly customizable, and portable while capable of producing high-quality @@ -57,7 +56,6 @@ Man pages and other related for freetype documents. pushd ft2demos-%{version} %patch1 -p1 -b .more-demos popd -%patch2 -p1 %patch6000 -p1 %patch6001 -p1 %patch6002 -p1 @@ -112,8 +110,8 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%license docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +%{!?_licensedir:%global license %%doc} +%license LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT %{_libdir}/libfreetype.so.* %{_bindir}/ft* @@ -135,6 +133,9 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co %{_mandir}/man1/* %changelog +* Wed Dec 08 2021 dongyuzhen - 2.11.0-1 +- update to 2.11.0 + * Tue Apr 13 2021 hanhui - 2.10.2-3 - Type:bugfix - CVE:NA diff --git a/ft2demos-2.10.2.tar.xz b/ft2demos-2.10.2.tar.xz deleted file mode 100644 index dee0c2e..0000000 Binary files a/ft2demos-2.10.2.tar.xz and /dev/null differ diff --git a/ft2demos-2.11.0.tar.xz b/ft2demos-2.11.0.tar.xz new file mode 100644 index 0000000..e7c8612 Binary files /dev/null and b/ft2demos-2.11.0.tar.xz differ