Pullup ticket #4413 - requested by he

x11/fontsproto: security update
x11/libXfont: security patch

Revisions pulled up:
- x11/fontsproto/Makefile                                       1.7
- x11/fontsproto/distinfo                                       1.4
- x11/libXfont/Makefile                                         1.31-1.32
- x11/libXfont/distinfo                                         1.22-1.23
- x11/libXfont/patches/patch-src_fc_fsconvert.c                 1.1
- x11/libXfont/patches/patch-src_fc_fserve.c                    1.1
- x11/libXfont/patches/patch-src_util_patcache.c                1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr 15 08:22:53 UTC 2014

   Modified Files:
   	pkgsrc/x11/fontsproto: Makefile distinfo

   Log Message:
   Update to 2.1.3:

   2.1.3:

   This release features a number of spec formatting improvements, and some
   header adjustments for current xserver.

   Adam Jackson (1):
         configure: Remove AM_MAINTAINER_MODE

   Alan Coopersmith (35):
         spec: Replace ASCII => & -> arrows with Unicode ▶ & ◀
         spec: add olinks to X11 protocol & XLFD specs
         spec: fixup bibliography entries (correct authors, link to references)
         spec: convert from article with sections to book with chapters
         spec: markup introduction of new terms with <firstterm>
         spec: fixup markup/formatting of the naming syntax section
         spec: change ids for encoding sections from *_2 to Encoding::*
         spec: add links to references to other sections
         spec: Use <figure> markup for figure labels
         spec: remove some extra quotes from nroff conversion
         spec: add <acronym> markup
         spec: convert list of license models from itemizedlist to variablelist
         spec: Convert .IN comments to indexterm tags
         spec: add autogenerated index
         spec: fix boundaries of <function> tags
         spec: Use <errorname> instead of <function> for error names
         spec: Convert Requests chapter to have a section per request
         spec: Convert Events chapter to have a section per request
         spec: Convert Errors chapter to have a section per request
         spec: make links from encoding section to definitions
         spec: Use <personname> markup in Acknowledgements
         spec: Use tables for contents of Requests, Events & Errors
         spec: Convert a bunch of AccessContext references from <function> to </type>
         spec: Use <superscript> for exponents
         spec: markup data type names with <type>
         spec: Finish replacing nroff .sp macros with <para> breaks
         spec: Convert Data Types section to have a section per type, with tables
         spec: give footnotes ids for more stable links
         spec: fixup quote characters
         spec: add enumerated constants to index
         spec: markup enumerated constant names with <constant>
         spec: Make links to data types, requests, events & errors
         spec: Remove <!- .LP --> comments leftover from nroff migration
         spec: use <parameter> markup for elements of requests & replies
         spec: Make alignment of columns in Encoding section more consistent

   Colin Walters (1):
         autogen.sh: Implement GNOME Build API

   Gaetan Nadon (1):
         config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES

   Julien Cristau (1):
         fontsproto 2.1.3

   Keith Packard (2):
         Replace 'pointer' with the equivalent 'void *'.
         Allow paths and patterns to be const

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr 15 16:47:26 UTC 2014

   Modified Files:
   	pkgsrc/x11/libXfont: Makefile distinfo
   Added Files:
   	pkgsrc/x11/libXfont/patches: patch-src_util_patcache.c

   Log Message:
   Fix compatibility with fontsproto-2.1.3 and depend on it.
   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Thu May 15 23:48:05 UTC 2014

   Modified Files:
   	pkgsrc/x11/libXfont: Makefile distinfo
   Added Files:
   	pkgsrc/x11/libXfont/patches: patch-src_fc_fsconvert.c
   	    patch-src_fc_fserve.c

   Log Message:
   Fix CVE-2014-0209, CVE-2014-0210 and CVE-2014-0211, validation errors
   triggerable via XFS or local font directories under user control.
   Bump revision.

1 files changed, 4 insertions, 4 deletions

diff --git a/x11/fontsproto/distinfo b/x11/fontsproto/distinfo
index bacebe917ce..a45f34b0270 100644
--- a/x11/fontsproto/distinfo
+++ b/x11/fontsproto/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/03 19:43:14 wiz Exp $
+$NetBSD: distinfo,v 1.3.16.1 2014/05/21 13:14:03 tron Exp $
 
-SHA1 (fontsproto-2.1.2.tar.bz2) = 538f0880faa6981cb1a348ced93dc715c42840f7
-RMD160 (fontsproto-2.1.2.tar.bz2) = 5a196c43dab89c7f4887dc14b419d53604e5672b
-Size (fontsproto-2.1.2.tar.bz2) = 141990 bytes
+SHA1 (fontsproto-2.1.3.tar.bz2) = 28c108bd6438c332122c10871c1fc6415591755f
+RMD160 (fontsproto-2.1.3.tar.bz2) = caa89b1818cc4ee5bd202faa25224aa6c89db1ed
+Size (fontsproto-2.1.3.tar.bz2) = 154087 bytes