CVS commit: pkgsrc/graphics/cairo

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jan  6 11:30:56 UTC 2018

Modified Files:
        pkgsrc/graphics/cairo: Makefile.common distinfo
        pkgsrc/graphics/cairo/patches: patch-CVE-2017-9814

Log Message:
cairo: updated to 1.14.12

Release 1.14.12:
Another bugfix release rolling up backported fixes for the past half year.

Features
--------
None

API Changes
-----------
None

Dependency Changes
------------------
None

Performance Optimizations
-------------------------
None

Bug Fixes
---------
* Fix assertion hit with PDFs using Type 4 fonts rendered with user
  fonts, due to error when destroying glyph page.
* Fix build error with util/font-view
* Fix handling of truetype fonts with excessively long font names
* Fix falling back to system font with PDFs using certain embedded
  fonts, due to truncated font names.
* Fix sigabrt printing documents with fonts lacking the mandatory .nodef
  glyph.
* Fix undefined-behavior with integer math.
* Fix various warnings and typos


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/cairo/Makefile.common
cvs rdiff -u -r1.86 -r1.87 pkgsrc/graphics/cairo/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/cairo/patches/patch-CVE-2017-9814

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/cairo/Makefile.common
diff -u pkgsrc/graphics/cairo/Makefile.common:1.12 pkgsrc/graphics/cairo/Makefile.common:1.13
--- pkgsrc/graphics/cairo/Makefile.common:1.12  Thu Sep 28 00:57:25 2017
+++ pkgsrc/graphics/cairo/Makefile.common       Sat Jan  6 11:30:56 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2017/09/28 00:57:25 spz Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/01/06 11:30:56 adam Exp $
 #
 # used by graphics/cairo/Makefile
 # used by graphics/cairo-gobject/Makefile
 
-DISTNAME=      cairo-1.14.10
-PKGREVISION=   1
+DISTNAME=      cairo-1.14.12
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/cairo/distinfo
diff -u pkgsrc/graphics/cairo/distinfo:1.86 pkgsrc/graphics/cairo/distinfo:1.87
--- pkgsrc/graphics/cairo/distinfo:1.86 Thu Sep 28 00:57:25 2017
+++ pkgsrc/graphics/cairo/distinfo      Sat Jan  6 11:30:56 2018
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.86 2017/09/28 00:57:25 spz Exp $
+$NetBSD: distinfo,v 1.87 2018/01/06 11:30:56 adam Exp $
 
-SHA1 (cairo-1.14.10.tar.xz) = 28c59d85d6b790c21b8b59ece73a6a1dda28d69a
-RMD160 (cairo-1.14.10.tar.xz) = c50d540033688e7371b2bffbe116ea70c4d2ffc2
-SHA512 (cairo-1.14.10.tar.xz) = a381d97e6046da0012eb5595118efb95ff02e3e84310682e458b503ebf22d6b2663bcc1391980768bb9cd02ae809b8df2e11d6200b48745dc5ec824c342b5852
-Size (cairo-1.14.10.tar.xz) = 36251788 bytes
+SHA1 (cairo-1.14.12.tar.xz) = 490025a0ba0622a853010f49fb6343f29fb70b9b
+RMD160 (cairo-1.14.12.tar.xz) = 7c2868a64b146bf5663b7586f59f865cc8c2bf31
+SHA512 (cairo-1.14.12.tar.xz) = ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
+Size (cairo-1.14.12.tar.xz) = 36251896 bytes
 SHA1 (patch-CVE-2016-9082) = b5020e37e7c5e589a47d053a9d51e26137986c12
 SHA1 (patch-CVE-2017-7475) = 0d4d8eea7cc63b959960a37fcdb0fd3ce31342e1
-SHA1 (patch-CVE-2017-9814) = 8679fb7820998a46089f1cc0e65ef5fba6b510c6
+SHA1 (patch-CVE-2017-9814) = 3f135b58fe5aa5ac121f990757d26cf12bfd7d68
 SHA1 (patch-aa) = b01bc60f77a7122b0c0d0d9b25ad512bac7c190c
 SHA1 (patch-ab) = 11f7e0e59bd5c51a8fdacb48dcf2f2fefdf3b768
 SHA1 (patch-ac) = 1785bbef6bcab4781bf89e1b986a7eb96e5f2b64

Index: pkgsrc/graphics/cairo/patches/patch-CVE-2017-9814
diff -u pkgsrc/graphics/cairo/patches/patch-CVE-2017-9814:1.1 pkgsrc/graphics/cairo/patches/patch-CVE-2017-9814:1.2
--- pkgsrc/graphics/cairo/patches/patch-CVE-2017-9814:1.1       Thu Sep 28 00:57:25 2017
+++ pkgsrc/graphics/cairo/patches/patch-CVE-2017-9814   Sat Jan  6 11:30:56 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-CVE-2017-9814,v 1.1 2017/09/28 00:57:25 spz Exp $
+$NetBSD: patch-CVE-2017-9814,v 1.2 2018/01/06 11:30:56 adam Exp $
 
 relevant part of https://bugs.freedesktop.org/attachment.cgi?id=132563
 
---- src/cairo-truetype-subset.c.orig   2017-06-15 22:13:55.000000000 +0000
+--- src/cairo-truetype-subset.c.orig   2017-12-05 00:20:46.000000000 +0000
 +++ src/cairo-truetype-subset.c
 @@ -187,7 +187,7 @@ _cairo_truetype_font_create (cairo_scale
      if (unlikely (status))
@@ -13,7 +13,7 @@ relevant part of https://bugs.freedeskto
      if (unlikely (font == NULL))
        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
  
-@@ -236,7 +236,7 @@ _cairo_truetype_font_create (cairo_scale
+@@ -240,7 +240,7 @@ _cairo_truetype_font_create (cairo_scale
  
      /* If the PS name is not found, create a CairoFont-x-y name. */
      if (font->base.ps_name == NULL) {
@@ -22,7 +22,7 @@ relevant part of https://bugs.freedeskto
          if (unlikely (font->base.ps_name == NULL)) {
            status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
              goto fail3;
-@@ -611,7 +611,7 @@ cairo_truetype_font_write_glyf_table (ca
+@@ -616,7 +616,7 @@ cairo_truetype_font_write_glyf_table (ca
      else
        size = sizeof (int32_t) * (font->num_glyphs_in_face + 1);
  
@@ -31,7 +31,7 @@ relevant part of https://bugs.freedeskto
      if (unlikely (u.bytes == NULL))
        return _cairo_truetype_font_set_error (font, CAIRO_STATUS_NO_MEMORY);
  
-@@ -1184,7 +1184,7 @@ cairo_truetype_subset_init_internal (cai
+@@ -1189,7 +1189,7 @@ cairo_truetype_subset_init_internal (cai
      truetype_subset->descent = (double)font->base.descent/font->base.units_per_em;
  
      if (length) {
@@ -40,7 +40,7 @@ relevant part of https://bugs.freedeskto
        if (unlikely (truetype_subset->data == NULL)) {
            status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
            goto fail4;
-@@ -1197,7 +1197,7 @@ cairo_truetype_subset_init_internal (cai
+@@ -1202,7 +1202,7 @@ cairo_truetype_subset_init_internal (cai
  
      if (num_strings) {
        offsets_length = num_strings * sizeof (unsigned long);
@@ -49,7 +49,7 @@ relevant part of https://bugs.freedeskto
        if (unlikely (truetype_subset->string_offsets == NULL)) {
            status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
            goto fail5;
-@@ -1285,7 +1285,7 @@ _cairo_truetype_reverse_cmap (cairo_scal
+@@ -1290,7 +1290,7 @@ _cairo_truetype_reverse_cmap (cairo_scal
        return CAIRO_INT_STATUS_UNSUPPORTED;
  
      size = be16_to_cpu (map->length);
@@ -58,16 +58,16 @@ relevant part of https://bugs.freedeskto
      if (unlikely (map == NULL))
        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
  
-@@ -1438,7 +1438,7 @@ find_name (tt_name_t *name, int name_id,
-             be16_to_cpu (record->encoding) == encoding &&
-           (language == -1 || be16_to_cpu (record->language) == language)) {
+@@ -1456,7 +1456,7 @@ find_name (tt_name_t *name, int name_id,
+           if (len > MAX_FONT_NAME_LENGTH)
+               break;
  
--          str = malloc (be16_to_cpu (record->length) + 1);
-+          str = _cairo_malloc (be16_to_cpu (record->length) + 1);
+-          str = malloc (len + 1);
++          str = _cairo_malloc (len + 1);
            if (str == NULL)
                return _cairo_error (CAIRO_STATUS_NO_MEMORY);
  
-@@ -1465,7 +1465,7 @@ find_name (tt_name_t *name, int name_id,
+@@ -1482,7 +1482,7 @@ find_name (tt_name_t *name, int name_id,
        for (i = 0; i < u_len; i++)
            size += _cairo_ucs4_to_utf8 (be16_to_cpu(u[i]), NULL);
  
@@ -76,7 +76,7 @@ relevant part of https://bugs.freedeskto
        if (utf8 == NULL) {
            status =_cairo_error (CAIRO_STATUS_NO_MEMORY);
            goto fail;
-@@ -1500,7 +1500,7 @@ find_name (tt_name_t *name, int name_id,
+@@ -1517,7 +1517,7 @@ find_name (tt_name_t *name, int name_id,
        }
      }
      if (has_tag) {
@@ -85,7 +85,7 @@ relevant part of https://bugs.freedeskto
        if (unlikely (p == NULL)) {
            status =_cairo_error (CAIRO_STATUS_NO_MEMORY);
            goto fail;
-@@ -1545,7 +1545,7 @@ _cairo_truetype_read_font_name (cairo_sc
+@@ -1562,7 +1562,7 @@ _cairo_truetype_read_font_name (cairo_sc
      if (status)
        return status;