svn commit: r550180 - in branches/2020Q3/x11-toolkits/pango: . files

[Niclas Zeising]

Author: zeising
Date: Sat Sep 26 13:08:19 2020
New Revision: 550180
URL: https://svnweb.freebsd.org/changeset/ports/550180

Log:
  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)

Added:
  branches/2020Q3/x11-toolkits/pango/files/patch-CVE-20191010238.c
     - copied unchanged from r550179, head/x11-toolkits/pango/files/patch-CVE-20191010238.c
Deleted:
  branches/2020Q3/x11-toolkits/pango/files/CVE-20191010238
Modified:
  branches/2020Q3/x11-toolkits/pango/Makefile
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/x11-toolkits/pango/Makefile
==============================================================================
--- branches/2020Q3/x11-toolkits/pango/Makefile	Sat Sep 26 13:06:35 2020	(r550179)
+++ branches/2020Q3/x11-toolkits/pango/Makefile	Sat Sep 26 13:08:19 2020	(r550180)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.42.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2

Copied: branches/2020Q3/x11-toolkits/pango/files/patch-CVE-20191010238.c (from r550179, head/x11-toolkits/pango/files/patch-CVE-20191010238.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/x11-toolkits/pango/files/patch-CVE-20191010238.c	Sat Sep 26 13:08:19 2020	(r550180, copy of r550179, head/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))