commit 6e7a59c69115882f147016895e96050999e3f96e Author: Kevin Kofler <kevin.kofler(a)chello.at&gt; Date: Sun May 28 10:18:53 2017 +0200 Add freetype-2.7.1-pcf-encoding.patch from Fedora freetype (rh#1451795) * Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.7.1-6 - Add freetype-2.7.1-pcf-encoding.patch from Fedora freetype: Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795) freetype-2.7.1-pcf-encoding.patch | 58 +++++++++++++++++++++++++++++++++++++++ freetype-freeworld.spec | 20 ++++++++++---- 2 files changed, 73 insertions(+), 5 deletions(-) --- diff --git a/freetype-2.7.1-pcf-encoding.patch b/freetype-2.7.1-pcf-encoding.patch new file mode 100644 index 0000000..fd1c706 --- /dev/null +++ b/freetype-2.7.1-pcf-encoding.patch @@ -0,0 +1,58 @@ +From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <wl(a)gnu.org&gt; +Date: Wed, 24 May 2017 07:40:46 +0200 +Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka + ASCII). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Marek Kašík <mkasik(a)redhat.com&gt;, cf. + + https://bugzilla.redhat.com/show_bug.cgi?id=1451795 + +* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c +(PCF_Face_Init): Implement it. +--- + ChangeLog | 11 +++++++++++ + src/bdf/bdfdrivr.c | 6 +++++- + src/pcf/pcfdrivr.c | 6 +++++- + 3 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c +index a2242be0..c0a5a5c5 100644 +--- a/src/bdf/bdfdrivr.c ++++ b/src/bdf/bdfdrivr.c +@@ -545,7 +545,11 @@ THE SOFTWARE. + if ( !ft_strcmp( s, "10646" ) || + ( !ft_strcmp( s, "8859" ) && + !ft_strcmp( face->charset_encoding, "1" ) ) ) +- unicode_charmap = 1; ++ unicode_charmap = 1; ++ /* another name for ASCII */ ++ else if ( !ft_strcmp( s, "646.1991" ) && ++ !ft_strcmp( face->charset_encoding, "IRV" ) ) ++ unicode_charmap = 1; + } + + { +diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c +index 9f4d36d1..50530941 100644 +--- a/src/pcf/pcfdrivr.c ++++ b/src/pcf/pcfdrivr.c +@@ -387,7 +387,11 @@ THE SOFTWARE. + if ( !ft_strcmp( s, "10646" ) || + ( !ft_strcmp( s, "8859" ) && + !ft_strcmp( face->charset_encoding, "1" ) ) ) +- unicode_charmap = 1; ++ unicode_charmap = 1; ++ /* another name for ASCII */ ++ else if ( !ft_strcmp( s, "646.1991" ) && ++ !ft_strcmp( face->charset_encoding, "IRV" ) ) ++ unicode_charmap = 1; + } + } + +-- +2.13.0 + diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec index ad2237b..805338e 100644 --- a/freetype-freeworld.spec +++ b/freetype-freeworld.spec @@ -1,15 +1,19 @@ Summary: A free and portable font rendering engine Name: freetype-freeworld Version: 2.7.1 -Release: 5%{?dist} +Release: 6%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement URL: http://www.freetype.org Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta... -Patch21: freetype-2.3.0-enable-spr.patch +Patch0: freetype-2.3.0-enable-spr.patch # Enable otvalid and gxvalid modules -Patch46: freetype-2.2.1-enable-valid.patch +Patch1: freetype-2.2.1-enable-valid.patch + +# Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers +# https://bugzilla.redhat.com/show_bug.cgi?id=1451795 +Patch4: freetype-2.7.1-pcf-encoding.patch ## Security fixes: # https://bugzilla.redhat.com/show_bug.cgi?id=1446500 @@ -42,9 +46,11 @@ It transparently overrides the system library using ld.so.conf.d. %prep %setup -q -n freetype-%{version} -%patch21 -p1 -b .enable-spr +%patch0 -p1 -b .enable-spr + +%patch1 -p1 -b .enable-valid -%patch46 -p1 -b .enable-valid +%patch4 -p1 -b .pcf-encoding %patch94 -p1 -b .protect-flex-handling %patch95 -p1 -b .safety-guard @@ -91,6 +97,10 @@ echo "%{_libdir}/%{name}" \ %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Sun May 28 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.7.1-6 +- Add freetype-2.7.1-pcf-encoding.patch from Fedora freetype: Accept + ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers (rh#1451795) + * Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.7.1-5 - Add freetype-2.7.1-protect-flex-handling.patch from Fedora freetype: Better protect `flex' handling (CVE-2017-8105, rh#1446501)