summaryrefslogtreecommitdiff
path: root/source/l/libcroco
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-04-08 20:39:32 +0000
committerEric Hameleers <alien@slackware.com>2019-04-09 08:59:45 +0200
commit98da28576517634e745ac6a4b65cf869a14bce79 (patch)
tree851d16248ded8fbc5eed627268541c7ff496aea3 /source/l/libcroco
parent262172ad7b61d5057e6278d3a485991c593632c9 (diff)
downloadcurrent-98da28576517634e745ac6a4b65cf869a14bce79.tar.gz
Mon Apr 8 20:39:32 UTC 201920190408203932
a/glibc-zoneinfo-2019a-noarch-1.txz: Upgraded. a/grub-2.02-x86_64-5.txz: Rebuilt. Support F2FS filesystem. Thanks to Nille_kungen. ap/cups-filters-1.22.5-x86_64-1.txz: Upgraded. ap/itstool-2.0.6-x86_64-1.txz: Upgraded. d/python-setuptools-41.0.0-x86_64-1.txz: Upgraded. l/gobject-introspection-1.60.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_39-x86_64-1.txz: Upgraded. l/libcroco-0.6.13-x86_64-1.txz: Upgraded. l/libnotify-0.7.8-x86_64-1.txz: Upgraded. n/cifs-utils-6.9-x86_64-1.txz: Upgraded. n/nfs-utils-2.3.3-x86_64-2.txz: Rebuilt. Include recovery directory. Thanks to upnort. n/samba-4.10.2-x86_64-1.txz: Upgraded. This is a security release in order to address the following defects: World writable files in Samba AD DC private/ dir. Save registry file outside share as unprivileged user. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3870 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3880 (* Security fix *) x/libva-2.4.1-x86_64-1.txz: Upgraded. x/pixman-0.38.2-x86_64-1.txz: Upgraded. xap/gimp-2.10.10-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/libcroco')
-rw-r--r--source/l/libcroco/898e3a8c8c03.patch58
-rwxr-xr-xsource/l/libcroco/libcroco.SlackBuild5
2 files changed, 1 insertions, 62 deletions
diff --git a/source/l/libcroco/898e3a8c8c03.patch b/source/l/libcroco/898e3a8c8c03.patch
deleted file mode 100644
index b669339c..00000000
--- a/source/l/libcroco/898e3a8c8c03.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro <qignacio@amazon.com>
-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;
---
-cgit v0.12
-
diff --git a/source/l/libcroco/libcroco.SlackBuild b/source/l/libcroco/libcroco.SlackBuild
index 25a7652b..eda23051 100755
--- a/source/l/libcroco/libcroco.SlackBuild
+++ b/source/l/libcroco/libcroco.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libcroco
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -78,9 +78,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# https://blogs.gentoo.org/ago/2017/04/17/libcroco-heap-overflow-and-undefined-behavior/
-patch -p1 --verbose < $CWD/898e3a8c8c03.patch || exit 1
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \