--- a/components/gnome/libcroco/Makefile Mon May 01 08:43:32 2017 -0700
+++ b/components/gnome/libcroco/Makefile Mon May 01 16:02:10 2017 -0700
@@ -27,18 +27,18 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= libcroco
-COMPONENT_VERSION= 0.6.8
+COMPONENT_VERSION= 0.6.10
COMPONENT_PROJECT_URL= https://wiki.gnome.org/Projects/Libcroco
COMPONENT_ARCHIVE_HASH= \
- sha256:ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570
+ sha256:72066611df77f5c4fb28268cfc7306ecc1517212a6182c2ea756c326a154246c
COMPONENT_BUGDB= gnome/libraries
COMPONENT_ANITYA_ID= 11787
-TPNO= 24633
+TPNO= 34491
include $(WS_MAKE_RULES)/gnome-component.mk
-# Needed because of patch to configure.in.
+# Needed because of patch to configure.ac
COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
# Actually, -Bsymbolic-functions; the option is misnamed -- Solaris linker
--- a/components/gnome/libcroco/patches/01-studio.patch Mon May 01 08:43:32 2017 -0700
+++ b/components/gnome/libcroco/patches/01-studio.patch Mon May 01 16:02:10 2017 -0700
@@ -2,9 +2,9 @@
Needs investigation before filing upstream bug; may be Solaris-specific issue.
---- libcroco-0.6.8/configure.in 2012-10-15 15:55:43.000000000 -0700
-+++ libcroco-0.6.8/configure.in 2015-05-22 16:54:40.646534907 -0700
-@@ -133,7 +133,7 @@
+--- a/configure.ac 2012-10-15 15:55:43.000000000 -0700
++++ b/configure.ac 2015-05-22 16:54:40.646534907 -0700
+@@ -135,7 +135,7 @@
-Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
-Wdeclaration-after-statement -Wold-style-definition \
-Wno-missing-field-initializers -Wno-unused-parameter \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/libcroco/patches/CVE-2017-7960.patch Mon May 01 16:02:10 2017 -0700
@@ -0,0 +1,58 @@
+Security fix, which we should be able to drop once it's packaged in a tarball
+
+From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <[email protected]>
+Date: Sun, 16 Apr 2017 13:13:43 +0200
+Subject: input: check end of input before reading a byte
+
+When reading bytes we weren't check that the index wasn't
+out of bound and this could produce an invalid read which
+could deal to a security bug.
+---
+ src/cr-input.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/cr-input.c b/src/cr-input.c
+index 49000b1..3b63a88 100644
+--- a/src/cr-input.c
++++ b/src/cr-input.c
+@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc)
+ *we should free buf here because it's own by CRInput.
+ *(see the last parameter of cr_input_new_from_buf().
+ */
+- buf = NULL ;
++ buf = NULL;
+ }
+
+ cleanup:
+@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this)
+ enum CRStatus
+ cr_input_read_byte (CRInput * a_this, guchar * a_byte)
+ {
++ gulong nb_bytes_left = 0;
++
+ g_return_val_if_fail (a_this && PRIVATE (a_this)
+ && a_byte, CR_BAD_PARAM_ERROR);
+
+@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte)
+ if (PRIVATE (a_this)->end_of_input == TRUE)
+ return CR_END_OF_INPUT_ERROR;
+
++ nb_bytes_left = cr_input_get_nb_bytes_left (a_this);
++
++ if (nb_bytes_left < 1) {
++ return CR_END_OF_INPUT_ERROR;
++ }
++
+ *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index];
+
+ if (PRIVATE (a_this)->nb_bytes -
+@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char)
+ if (*a_char == '\n') {
+ PRIVATE (a_this)->end_of_line = TRUE;
+ }
+-
+ }
+
+ return status;
+--
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/libcroco/patches/CVE-2017-7961.patch Mon May 01 16:02:10 2017 -0700
@@ -0,0 +1,42 @@
+Security fix, which we should be able to drop once it's packaged in a tarball
+
+From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <[email protected]>
+Date: Sun, 16 Apr 2017 13:56:09 +0200
+Subject: tknzr: support only max long rgb values
+
+This fixes a possible out of bound when reading rgbs which
+are longer than the support MAXLONG
+---
+ src/cr-tknzr.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c
+index 1a7cfeb..1548c35 100644
+--- a/src/cr-tknzr.c
++++ b/src/cr-tknzr.c
+@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
+ status = cr_tknzr_parse_num (a_this, &num);
+ ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
+
++ if (num->val > G_MAXLONG) {
++ status = CR_PARSING_ERROR;
++ goto error;
++ }
++
+ red = num->val;
+ cr_num_destroy (num);
+ num = NULL;
+@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb)
+ status = cr_tknzr_parse_num (a_this, &num);
+ ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL));
+
++ if (num->val > G_MAXLONG) {
++ status = CR_PARSING_ERROR;
++ goto error;
++ }
++
+ PEEK_BYTE (a_this, 1, &next_bytes[0]);
+ if (next_bytes[0] == '%') {
+ SKIP_CHARS (a_this, 1);
+--
--- a/components/gnome/libcroco/test/results-all.master Mon May 01 08:43:32 2017 -0700
+++ b/components/gnome/libcroco/test/results-all.master Mon May 01 16:02:10 2017 -0700
@@ -49,6 +49,18 @@
make[5]: Entering directory '$(@D)/build/win32/vs10'
make[5]: Nothing to be done for 'all'.
make[5]: Leaving directory '$(@D)/build/win32/vs10'
+Making all in vs11
+make[5]: Entering directory '$(@D)/build/win32/vs11'
+make[5]: Nothing to be done for 'all'.
+make[5]: Leaving directory '$(@D)/build/win32/vs11'
+Making all in vs12
+make[5]: Entering directory '$(@D)/build/win32/vs12'
+make[5]: Nothing to be done for 'all'.
+make[5]: Leaving directory '$(@D)/build/win32/vs12'
+Making all in vs14
+make[5]: Entering directory '$(@D)/build/win32/vs14'
+make[5]: Nothing to be done for 'all'.
+make[5]: Leaving directory '$(@D)/build/win32/vs14'
make[5]: Entering directory '$(@D)/build/win32'
make[5]: Nothing to be done for 'all-am'.
make[5]: Leaving directory '$(@D)/build/win32'