[PATCH 01/13] font-util: upgrade to 1.3.1

[PATCH 01/13] font-util: upgrade to 1.3.1

[Ross Burton]

License checksums updated as the Unicode license was modified (wording only).

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-font/{font-util_1.3.0.bb => font-util_1.3.1.bb}          | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
 rename meta/recipes-graphics/xorg-font/{font-util_1.3.0.bb => font-util_1.3.1.bb} (77%)

diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
rename to meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
index 03f70bf..2285124 100644
--- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
@@ -4,7 +4,7 @@ require xorg-font-common.inc
 
 #Unicode is MIT
 LICENSE = "BSD & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0067273d90f6336008cb2504e14bd32 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=5df208ec65eb84ce5bb8d82d8f3b9675 \
                     file://ucs2any.c;endline=28;md5=8357dc567fc628bd12696f15b2a33bcb \
                     file://bdftruncate.c;endline=26;md5=4f82ffc101a1b165eae9c6998abff937 \
                     file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34"
@@ -14,12 +14,10 @@ DEPENDS_class-native = "util-macros-native"
 RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
 RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native"
 
-PR = "${INC_PR}.0"
-
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b"
-SRC_URI[sha256sum] = "dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195"
+SRC_URI[md5sum] = "23756dab809f9ec5011bb27fb2c3c7d6"
+SRC_URI[sha256sum] = "aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921"
 
 SYSROOT_PREPROCESS_FUNCS += "fontutil_sysroot_preprocess"
 fontutil_sysroot_preprocess () {
-- 
2.1.4

[PATCH 02/13] libfontenc: upgrade to 1.1.3

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libfontenc_1.1.2.bb => libfontenc_1.1.3.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libfontenc_1.1.2.bb => libfontenc_1.1.3.bb} (71%)

diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
similarity index 71%
rename from meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb
rename to meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
index b79ab8f..a181f05 100644
--- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
@@ -13,5 +13,5 @@ PE = "1"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "ad2919764933e075bb0361ad5caa3d19"
-SRC_URI[sha256sum] = "a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62"
+SRC_URI[md5sum] = "0920924c3a9ebc1265517bdd2f9fde50"
+SRC_URI[sha256sum] = "70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21"
-- 
2.1.4

[PATCH 03/13] libx11: upgrade to 1.6.3

[Ross Burton]

Drop backported patch always-use-XCOMM patch.
Refresh Add-missing-NULL-check.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../{libx11-diet_1.6.2.bb => libx11-diet_1.6.3.bb} |   4 +-
 .../libx11/libX11-Add-missing-NULL-check.patch     |   6 +-
 ...use-XCOMM-instead-of-for-comments-in-Comp.patch | 101 ---------------------
 meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb     |  12 ---
 meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb     |  11 +++
 5 files changed, 16 insertions(+), 118 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.2.bb => libx11-diet_1.6.3.bb} (73%)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb
rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb
index 89b0716..c0d0148 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb
@@ -11,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \
 RPROVIDES_${PN}-dev = "libx11-dev"
 RPROVIDES_${PN}-locale = "libx11-locale"
 
-SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"
-SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16"
+SRC_URI[md5sum] = "2e36b73f8a42143142dda8129f02e4e0"
+SRC_URI[sha256sum] = "cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111"
 
 EXTRA_OECONF += "--disable-xlocale"
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
index 3068620..a60e985 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/libX11-Add-missing-NULL-check.patch
@@ -29,7 +29,7 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra
 -    ret = (*im->methods->set_values) (im, args);
 +    if (im && im->methods)
 +	ret = (*im->methods->set_values) (im, args);
-     if (args) Xfree(args);
+     Xfree(args);
      return ret;
  }
 @@ -196,7 +197,7 @@
@@ -48,7 +48,7 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra
 -    ret = (*im->methods->get_values) (im, args);
 +    if (im && im->methods)
 +	ret = (*im->methods->get_values) (im, args);
-     if (args) Xfree(args);
+     Xfree(args);
      return ret;
  }
 @@ -228,7 +230,7 @@
@@ -67,6 +67,6 @@ diff -ru libX11-1.6.2-orig/src/xlibi18n/ICWrap.c libX11-1.6.2/src/xlibi18n/ICWra
 -    ic = (XIC) (*im->methods->create_ic) (im, args);
 +    if (im && im->methods)
 +	ic = (XIC) (*im->methods->create_ic) (im, args);
-     if (args) Xfree(args);
+     Xfree(args);
      if (ic) {
  	ic->core.next = im->core.ic_chain;
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch b/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch
deleted file mode 100644
index b7f5356..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Upstream-Status: Backport
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
-
-From b64bee2ddb7b96f00713a8b8435f11ad9ac1c9e0 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran234@gmail.com>
-Date: Sun, 16 Feb 2014 15:24:58 +0200
-Subject: [PATCH] nls: always use XCOMM instead of # for comments in
- Compose.pre files
-
-Lines starting with # are considered as preprocessor directives in the
-.pre files.
-
-Fixes warnings like:
-<stdin>:3:0: error: invalid preprocessing directive #Khmer
-
-Signed-off-by: Ran Benita <ran234@gmail.com>
-Signed-off-by: James Cloos <cloos@jhcloos.com>
----
- nls/km_KH.UTF-8/Compose.pre |    2 +-
- nls/sr_CS.UTF-8/Compose.pre |   32 ++++++++++++++++----------------
- 2 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/nls/km_KH.UTF-8/Compose.pre b/nls/km_KH.UTF-8/Compose.pre
-index 77651d0..dc89119 100644
---- a/nls/km_KH.UTF-8/Compose.pre
-+++ b/nls/km_KH.UTF-8/Compose.pre
-@@ -1,6 +1,6 @@
- include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
- 
--# Khmer digraphs
-+XCOMM Khmer digraphs
- <U17ff>	:	"ាំ"
- <U17fe>	:	"ោះ"
- <U17fd>	:	"េះ"
-diff --git a/nls/sr_CS.UTF-8/Compose.pre b/nls/sr_CS.UTF-8/Compose.pre
-index 119e23e..b2397f7 100644
---- a/nls/sr_CS.UTF-8/Compose.pre
-+++ b/nls/sr_CS.UTF-8/Compose.pre
-@@ -1,17 +1,17 @@
- include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
- 
--# Serbian accented Cyrillic
--# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
--# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
--# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
--# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
--# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
--#
--# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
--# ́ - U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
--# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
--# ̏ - U+030F  <dead_diaeresis>, <dead_doubleacute>
--# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
-+XCOMM Serbian accented Cyrillic
-+XCOMM а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
-+XCOMM е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
-+XCOMM о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
-+XCOMM у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
-+XCOMM и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
-+XCOMM
-+XCOMM ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
-+XCOMM ́ - U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
-+XCOMM ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
-+XCOMM ̏ - U+030F  <dead_diaeresis>, <dead_doubleacute>
-+XCOMM ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
- <dead_grave> <Cyrillic_a>         : "а̀"
- <combining_grave> <Cyrillic_a>    : "а̀"
- <Multi_key> <grave> <Cyrillic_a>  : "а̀"
-@@ -42,7 +42,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
- <dead_grave> <Cyrillic_U>         : "У̀"
- <combining_grave> <Cyrillic_U>    : "У̀"
- <Multi_key> <grave> <Cyrillic_U>  : "У̀"
--# ́ - dugouzlazni, U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
-+XCOMM ́ - dugouzlazni, U+0301   <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
- <dead_acute> <Cyrillic_a>              : "а́"
- <combining_acute> <Cyrillic_a>         : "а́"
- <Multi_key> <acute> <Cyrillic_a>       : "а́"
-@@ -83,7 +83,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
- <combining_acute>        <Cyrillic_U>  : "У́"
- <Multi_key> <acute>      <Cyrillic_U>  : "У́"
- <Multi_key> <apostrophe> <Cyrillic_U>  : "У́"
--# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
-+XCOMM ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
- <dead_circumflex> <Cyrillic_a>          : "а̂"
- <Multi_key> <asciicircum> <Cyrillic_a>  : "а̂"
- <dead_circumflex> <Cyrillic_A>          : "А̂"
-@@ -104,8 +104,8 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
- <Multi_key> <asciicircum> <Cyrillic_u>  : "у̂"
- <dead_circumflex> <Cyrillic_U>          : "У̂"
- <Multi_key> <asciicircum> <Cyrillic_U>  : "У̂"
--# ̏ - kratkosilazni, U+030F  <dead_diaeresis>, <dead_doubleacute>
--# there's no appropriate dead_doublegrave, so we use these two dead keys
-+XCOMM ̏ - kratkosilazni, U+030F  <dead_diaeresis>, <dead_doubleacute>
-+XCOMM there's no appropriate dead_doublegrave, so we use these two dead keys
- <dead_diaeresis>   <Cyrillic_a>  : "а̏"
- <dead_doubleacute> <Cyrillic_a>  : "а̏"
- <dead_diaeresis>   <Cyrillic_A>  : "А̏"
--- 
-1.7.9.5
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
deleted file mode 100644
index a722648..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require libx11.inc
-inherit gettext
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI += "file://disable_tests.patch \
-            file://nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch \
-            file://libX11-Add-missing-NULL-check.patch \
-           "
-
-SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"
-SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
new file mode 100644
index 0000000..8e531c7
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.3.bb
@@ -0,0 +1,11 @@
+require libx11.inc
+inherit gettext
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += "file://disable_tests.patch \
+            file://libX11-Add-missing-NULL-check.patch \
+           "
+
+SRC_URI[md5sum] = "2e36b73f8a42143142dda8129f02e4e0"
+SRC_URI[sha256sum] = "cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111"
-- 
2.1.4

[PATCH 04/13] libxdmcp: upgrade to 1.1.2

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libxdmcp_1.1.1.bb => libxdmcp_1.1.2.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxdmcp_1.1.1.bb => libxdmcp_1.1.2.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb
rename to meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
index 3529ead..7471b9a 100644
--- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
@@ -22,5 +22,5 @@ XORG_PN = "libXdmcp"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "b94af6cef211cf3ee256f7e81f70fcd9"
-SRC_URI[sha256sum] = "9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e"
+SRC_URI[md5sum] = "18aa5c1279b01f9d18e3299969665b2e"
+SRC_URI[sha256sum] = "81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2"
-- 
2.1.4

[PATCH 05/13] libxfont: upgrade to 1.5.1

[Ross Burton]

Remove the backported patches as they're integrated in this release.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...acters-bailout-if-a-char-s-bitmap-cannot-.patch | 40 -----------
 ...acters-ensure-metrics-fit-into-xCharInfo-.patch | 80 ----------------------
 ...erties-property-count-needs-range-check-C.patch | 38 ----------
 .../{libxfont_1.5.0.bb => libxfont_1.5.1.bb}       |  9 +--
 4 files changed, 2 insertions(+), 165 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-bailout-if-a-char-s-bitmap-cannot-.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-ensure-metrics-fit-into-xCharInfo-.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch
 rename meta/recipes-graphics/xorg-lib/{libxfont_1.5.0.bb => libxfont_1.5.1.bb} (54%)

diff --git a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-bailout-if-a-char-s-bitmap-cannot-.patch b/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-bailout-if-a-char-s-bitmap-cannot-.patch
deleted file mode 100644
index cc66c12..0000000
--- a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-bailout-if-a-char-s-bitmap-cannot-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 78c2e3d70d29698244f70164428bd2868c0ab34c Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 6 Feb 2015 15:54:00 -0800
-Subject: [PATCH] bdfReadCharacters: bailout if a char's bitmap cannot be read
- [CVE-2015-1803]
-
-Previously would charge on ahead with a NULL pointer in ci->bits, and
-then crash later in FontCharInkMetrics() trying to access the bits.
-
-Found with afl-1.23b.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-
-Upstream-Status: backport
-
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- src/bitmap/bdfread.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
-index 6387908..1b29b81 100644
---- a/src/bitmap/bdfread.c
-+++ b/src/bitmap/bdfread.c
-@@ -458,7 +458,10 @@ bdfReadCharacters(FontFilePtr file, FontPtr pFont, bdfFileState *pState,
- 	    ci->metrics.descent = -bb;
- 	    ci->metrics.characterWidth = wx;
- 	    ci->bits = NULL;
--	    bdfReadBitmap(ci, file, bit, byte, glyph, scan, bitmapsSizes);
-+	    if (!bdfReadBitmap(ci, file, bit, byte, glyph, scan, bitmapsSizes)) {
-+		bdfError("could not read bitmap for character '%s'\n", charName);
-+		goto BAILOUT;
-+	    }
- 	    ci++;
- 	    ndx++;
- 	} else
--- 
-1.7.9.5
-
diff --git a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-ensure-metrics-fit-into-xCharInfo-.patch b/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-ensure-metrics-fit-into-xCharInfo-.patch
deleted file mode 100644
index b64f1d9..0000000
--- a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadCharacters-ensure-metrics-fit-into-xCharInfo-.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2351c83a77a478b49cba6beb2ad386835e264744 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 6 Mar 2015 22:54:58 -0800
-Subject: [PATCH] bdfReadCharacters: ensure metrics fit into xCharInfo struct
- [CVE-2015-1804]
-
-We use 32-bit ints to read from the bdf file, but then try to stick
-into a 16-bit int in the xCharInfo struct, so make sure they won't
-overflow that range.
-
-Found by afl-1.24b.
-
-v2: Verify that additions won't overflow 32-bit int range either.
-v3: As Julien correctly observes, the previous check for bh & bw not
-    being < 0 reduces the number of cases we need to check for overflow.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-
-Upstream-Status: backport
-
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- src/bitmap/bdfread.c |   26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
-index 1b29b81..a0ace8f 100644
---- a/src/bitmap/bdfread.c
-+++ b/src/bitmap/bdfread.c
-@@ -62,8 +62,16 @@ from The Open Group.
- 
- #if HAVE_STDINT_H
- #include <stdint.h>
--#elif !defined(INT32_MAX)
--#define INT32_MAX 0x7fffffff
-+#else
-+# ifndef INT32_MAX
-+#  define INT32_MAX 0x7fffffff
-+# endif
-+# ifndef INT16_MAX
-+#  define INT16_MAX 0x7fff
-+# endif
-+# ifndef INT16_MIN
-+#  define INT16_MIN (0 - 0x8000)
-+# endif
- #endif
- 
- #define INDICES 256
-@@ -417,6 +425,12 @@ bdfReadCharacters(FontFilePtr file, FontPtr pFont, bdfFileState *pState,
- 	    bdfError("DWIDTH y value must be zero\n");
- 	    goto BAILOUT;
- 	}
-+	/* xCharInfo metrics are stored as INT16 */
-+	if ((wx < 0) || (wx > INT16_MAX)) {
-+	    bdfError("character '%s' has out of range width, %d\n",
-+		     charName, wx);
-+	    goto BAILOUT;
-+	}
- 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
- 	if ((!line) || (sscanf((char *) line, "BBX %d %d %d %d", &bw, &bh, &bl, &bb) != 4)) {
- 	    bdfError("bad 'BBX'\n");
-@@ -427,6 +441,14 @@ bdfReadCharacters(FontFilePtr file, FontPtr pFont, bdfFileState *pState,
- 		     charName, bw, bh);
- 	    goto BAILOUT;
- 	}
-+	/* xCharInfo metrics are read as int, but stored as INT16 */
-+	if ((bl > INT16_MAX) || (bl < INT16_MIN) ||
-+	    (bb > INT16_MAX) || (bb < INT16_MIN) ||
-+	    (bw > (INT16_MAX - bl)) || (bh > (INT16_MAX - bb))) {
-+	    bdfError("character '%s' has out of range metrics, %d %d %d %d\n",
-+		     charName, bl, (bl+bw), (bh+bb), -bb);
-+	    goto BAILOUT;
-+	}
- 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
- 	if ((line) && (bdfIsPrefix(line, "ATTRIBUTES"))) {
- 	    for (p = line + strlen("ATTRIBUTES ");
--- 
-1.7.9.5
-
diff --git a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch b/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch
deleted file mode 100644
index 0779c26..0000000
--- a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 6 Feb 2015 15:50:45 -0800
-Subject: [PATCH] bdfReadProperties: property count needs range check
- [CVE-2015-1802]
-
-Avoid integer overflow or underflow when allocating memory arrays
-by multiplying the number of properties reported for a BDF font.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-
-Upstream-Status: backport
-
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- src/bitmap/bdfread.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
-index 914a024..6387908 100644
---- a/src/bitmap/bdfread.c
-+++ b/src/bitmap/bdfread.c
-@@ -604,7 +604,9 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState)
- 	bdfError("missing 'STARTPROPERTIES'\n");
- 	return (FALSE);
-     }
--    if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) {
-+    if ((sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) ||
-+	(nProps <= 0) ||
-+	(nProps > ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) {
- 	bdfError("bad 'STARTPROPERTIES'\n");
- 	return (FALSE);
-     }
--- 
-1.7.9.5
-
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb
similarity index 54%
rename from meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb
rename to meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb
index dfd2dc6..1b6e33c 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb
@@ -18,10 +18,5 @@ XORG_PN = "libXfont"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI += "file://0001-bdfReadProperties-property-count-needs-range-check-C.patch \
-            file://0001-bdfReadCharacters-bailout-if-a-char-s-bitmap-cannot-.patch \
-            file://0001-bdfReadCharacters-ensure-metrics-fit-into-xCharInfo-.patch \
-           "
-
-SRC_URI[md5sum] = "664629bfa7cdf8b984155019fd395dcb"
-SRC_URI[sha256sum] = "3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f"
+SRC_URI[md5sum] = "96f76ba94b4c909230bac1e2dcd551c4"
+SRC_URI[sha256sum] = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098"
-- 
2.1.4

[PATCH 06/13] libxkbfile: upgrade to 1.0.9

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libxkbfile_1.0.8.bb => libxkbfile_1.0.9.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxkbfile_1.0.8.bb => libxkbfile_1.0.9.bb} (73%)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb
rename to meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
index 620b414..39a344c 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.8.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
@@ -14,5 +14,5 @@ PE = "1"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "19e6533ae64abba0773816a23f2b9507"
-SRC_URI[sha256sum] = "8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a"
+SRC_URI[md5sum] = "4a4cfeaf24dab1b991903455d6d7d404"
+SRC_URI[sha256sum] = "51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a"
-- 
2.1.4

[PATCH 07/13] randrproto: upgrade to 1.5.0

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-proto/{randrproto_1.4.1.bb => randrproto_1.5.0.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-proto/{randrproto_1.4.1.bb => randrproto_1.5.0.bb} (80%)

diff --git a/meta/recipes-graphics/xorg-proto/randrproto_1.4.1.bb b/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-proto/randrproto_1.4.1.bb
rename to meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
index 601de05..b59e525 100644
--- a/meta/recipes-graphics/xorg-proto/randrproto_1.4.1.bb
+++ b/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
@@ -15,5 +15,5 @@ PE = "1"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "51ff4d45dbe8e1098740d384971805ee"
-SRC_URI[sha256sum] = "543dcb2ebb0622d8a506dcef6470c6dd066f3e3f866552a5060b91ab6129e1dc"
+SRC_URI[md5sum] = "a46765c8dcacb7114c821baf0df1e797"
+SRC_URI[sha256sum] = "4c675533e79cd730997d232c8894b6692174dce58d3e207021b8f860be498468"
-- 
2.1.4

[PATCH 08/13] libxrandr: upgrade to 1.5.0

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libxrandr_1.4.2.bb => libxrandr_1.5.0.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxrandr_1.4.2.bb => libxrandr_1.5.0.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb
rename to meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb
index 4df4b3a..abbbae5 100644
--- a/meta/recipes-graphics/xorg-lib/libxrandr_1.4.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.0.bb
@@ -19,5 +19,5 @@ XORG_PN = "libXrandr"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "210ed9499a3d9c96e3a221629b7d39b0"
-SRC_URI[sha256sum] = "caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad"
+SRC_URI[md5sum] = "309762867e41c6fd813da880d8a1bc93"
+SRC_URI[sha256sum] = "6f864959b7fc35db11754b270d71106ef5b5cf363426aa58589cb8ac8266de58"
-- 
2.1.4

[PATCH 09/13] libxrender: upgrade to 0.9.9

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libxrender_0.9.8.bb => libxrender_0.9.9.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxrender_0.9.8.bb => libxrender_0.9.9.bb} (82%)

diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb
rename to meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb
index abd7767..9fde040 100644
--- a/meta/recipes-graphics/xorg-lib/libxrender_0.9.8.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb
@@ -19,5 +19,5 @@ XORG_PN = "libXrender"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "2bd9a15fcf64d216e63b8d129e4f1f1c"
-SRC_URI[sha256sum] = "1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62"
+SRC_URI[md5sum] = "5db92962b124ca3a8147daae4adbd622"
+SRC_URI[sha256sum] = "fc2fe57980a14092426dffcd1f2d9de0987b9d40adea663bd70d6342c0e9be1a"
-- 
2.1.4

[PATCH 10/13] libxshmfence: upgrade to 1.2

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libxshmfence_1.1.bb => libxshmfence_1.2.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxshmfence_1.1.bb => libxshmfence_1.2.bb} (75%)

diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
similarity index 75%
rename from meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
rename to meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
index 7dff0d4..ae34b1f 100644
--- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
@@ -13,5 +13,5 @@ DEPENDS += "virtual/libx11"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "2dd10448c1166e71a176206a8dfabe6d"
-SRC_URI[sha256sum] = "dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe"
+SRC_URI[md5sum] = "66662e76899112c0f99e22f2fc775a7e"
+SRC_URI[sha256sum] = "d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c"
-- 
2.1.4

[PATCH 11/13] libxt: upgrade to 1.1.5

[Ross Burton]

Remove the custom compile logic as upstream now detects cross-compilation and
uses CC_FOR_BUILD.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libxt_1.1.4.bb => libxt_1.1.5.bb}           | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxt_1.1.4.bb => libxt_1.1.5.bb} (66%)

diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
similarity index 66%
rename from meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb
rename to meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
index 9c1aaa4..c1ed0bb 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
@@ -29,16 +29,5 @@ BBCLASSEXTEND = "native"
 
 EXTRA_OECONF += "--disable-xkb"
 
-do_compile() {
-	(
-		unset CC LD CXX CCLD CFLAGS
-		oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
-	)
-	if [ "$?" != "0" ]; then
-		exit 1
-	fi
-	oe_runmake
-}
-
-SRC_URI[md5sum] = "03149823ae57bb02d0cec90d5b97d56c"
-SRC_URI[sha256sum] = "843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57"
+SRC_URI[md5sum] = "8f5b5576fbabba29a05f3ca2226f74d3"
+SRC_URI[sha256sum] = "46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a"
-- 
2.1.4

[PATCH 12/13] libxvmc: upgrade to 1.0.9

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/{libxvmc_1.0.8.bb => libxvmc_1.0.9.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxvmc_1.0.8.bb => libxvmc_1.0.9.bb} (76%)

diff --git a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb
rename to meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb
index b0d5e0d..41e8498 100644
--- a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.8.bb
+++ b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.9.bb
@@ -15,5 +15,5 @@ PE = "1"
 
 XORG_PN = "libXvMC"
 
-SRC_URI[md5sum] = "2e4014e9d55c430e307999a6b3dd256d"
-SRC_URI[sha256sum] = "5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204"
+SRC_URI[md5sum] = "eba6b738ed5fdcd8f4203d7c8a470c79"
+SRC_URI[sha256sum] = "0703d7dff6ffc184f1735ca5d4eb9dbb402b522e08e008f2f96aee16c40a5756"
-- 
2.1.4

[PATCH 13/13] libxx86vm: upgrade to 1.1.4

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/{libxxf86vm_1.1.3.bb => libxxf86vm_1.1.4.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxxf86vm_1.1.3.bb => libxxf86vm_1.1.4.bb} (77%)

diff --git a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb
rename to meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
index e276a76..35f87d2 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
@@ -16,5 +16,5 @@ PE = "1"
 
 XORG_PN = "libXxf86vm"
 
-SRC_URI[md5sum] = "e46f6ee4f4567349a3189044fe1bb712"
-SRC_URI[sha256sum] = "da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8"
+SRC_URI[md5sum] = "298b8fff82df17304dfdb5fe4066fe3a"
+SRC_URI[sha256sum] = "afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57"
-- 
2.1.4