From 72f7be018df76b71f6d6130b24ae7e5fba30c81a Mon Sep 17 00:00:00 2001 From: Niclas Zeising Date: Sat, 26 Sep 2020 13:08:19 +0000 Subject: MFH: r550179 x11/toolcits-pango: Actually apply security patch Rename the patch that fixes CVE-2010-1010238 so that it is actually applied when building pango. Regenerate it using make makepatch bump portrevision Reported by: tobik Security: 456375e1-cd09-11ea-9172-4c72b94353b5 Approved by: ports-secteam (implicit, security fix) --- x11-toolkits/pango/Makefile | 2 +- x11-toolkits/pango/files/CVE-20191010238 | 16 ---------------- x11-toolkits/pango/files/patch-CVE-20191010238.c | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 x11-toolkits/pango/files/CVE-20191010238 create mode 100644 x11-toolkits/pango/files/patch-CVE-20191010238.c diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 59b4cbe023f5..996c4e20df50 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,7 +3,7 @@ PORTNAME= pango PORTVERSION= 1.42.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/pango/files/CVE-20191010238 b/x11-toolkits/pango/files/CVE-20191010238 deleted file mode 100644 index 89d21cd89db1..000000000000 --- a/x11-toolkits/pango/files/CVE-20191010238 +++ /dev/null @@ -1,16 +0,0 @@ ---- ../pango/pango-bidi-type.c.orig 2020-07-23 19:10:14.338937000 +0200 -+++ ../pango/pango-bidi-type.c 2020-07-23 19:12:15.511836000 +0200 -@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar *te - 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)) diff --git a/x11-toolkits/pango/files/patch-CVE-20191010238.c b/x11-toolkits/pango/files/patch-CVE-20191010238.c new file mode 100644 index 000000000000..d02c9aa33fca --- /dev/null +++ b/x11-toolkits/pango/files/patch-CVE-20191010238.c @@ -0,0 +1,16 @@ +--- pango/pango-bidi-type.c.orig 2018-07-28 15:15:28 UTC ++++ pango/pango-bidi-type.c +@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar *te + 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)) -- cgit v1.2.3