[src/netbsd-6]: src/doc 1280

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58b40d1501d2
branches:  netbsd-6
changeset: 776919:58b40d1501d2
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Mar 17 18:38:13 2015 +0000

description:
1280

diffstat:

 doc/CHANGES-6.2 |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 472202c35421 -r 58b40d1501d2 doc/CHANGES-6.2
--- a/doc/CHANGES-6.2   Sun Mar 08 16:32:56 2015 +0000
+++ b/doc/CHANGES-6.2   Tue Mar 17 18:38:13 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.201 2015/03/05 22:27:23 riz Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.202 2015/03/17 18:38:13 snj Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -9693,3 +9693,12 @@
        man pages on a system that doesn't have the text set.  Fixes PR 49230.
        [snj, ticket #1263]
 
+xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c patch
+xsrc/xfree/xc/lib/font/bitmap/bdfread.c        patch
+
+       Fix CVE-2015-1802 (bdfReadProperties: property count needs
+       range check), CVE-2015-1803 (bdfReadCharacters: bailout if a
+       char's bitmap cannot be read), and CVE-2015-1804
+       (bdfReadCharacters: ensure metrics fit into xCharInfo struct)
+       [mrg, ticket #1280]
+