From d7e992adec7cb58567f6335a249ecf9190e0d574 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 12 Nov 2018 16:42:19 -0200 Subject: [PATCH] libsass: update to 3.5.5. --- srcpkgs/libsass/patches/CVE-2018-11693.patch | 23 ------------------- srcpkgs/libsass/patches/CVE-2018-11696.patch | 24 -------------------- srcpkgs/libsass/template | 6 ++--- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/libsass/patches/CVE-2018-11693.patch delete mode 100644 srcpkgs/libsass/patches/CVE-2018-11696.patch diff --git a/srcpkgs/libsass/patches/CVE-2018-11693.patch b/srcpkgs/libsass/patches/CVE-2018-11693.patch deleted file mode 100644 index 6b733738d11..00000000000 --- a/srcpkgs/libsass/patches/CVE-2018-11693.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b3374e3fd1a0c3658644d2bad24e4a0ff2e0dcea Mon Sep 17 00:00:00 2001 -From: xzyfer -Date: Thu, 21 Jun 2018 21:21:26 +1000 -Subject: [PATCH] Fix handling of unclosed interpolant in url - -Fixes #2661 ---- - src/parser.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/parser.cpp b/src/parser.cpp -index d99636dd4..66ca4dc94 100644 ---- a/src/parser.cpp -+++ b/src/parser.cpp -@@ -2163,6 +2163,7 @@ namespace Sass { - while (pp && peek< exactly< hash_lbrace > >(pp)) { - pp = sequence< interpolant, real_uri_value >(pp); - } -+ if (!pp) return 0; - position = pp; - return parse_interpolated_chunk(Token(p, position)); - } - diff --git a/srcpkgs/libsass/patches/CVE-2018-11696.patch b/srcpkgs/libsass/patches/CVE-2018-11696.patch deleted file mode 100644 index 25ebe6797cf..00000000000 --- a/srcpkgs/libsass/patches/CVE-2018-11696.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 38f4c3699d06b64128bebc7cf1e8b3125be74dc4 Mon Sep 17 00:00:00 2001 -From: xzyfer -Date: Wed, 4 Jul 2018 20:36:29 +1000 -Subject: [PATCH] Fix possible bug with handling empty reference combinators - -Fixes #2665 ---- - src/inspect.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/inspect.cpp b/src/inspect.cpp -index bd0389224..b56fd89aa 100644 ---- a/src/inspect.cpp -+++ b/src/inspect.cpp -@@ -1042,7 +1042,7 @@ namespace Sass { - case Complex_Selector::REFERENCE: - append_mandatory_space(); - append_string("/"); -- c->reference()->perform(this); -+ if (c->reference()) c->reference()->perform(this); - append_string("/"); - append_mandatory_space(); - break; - diff --git a/srcpkgs/libsass/template b/srcpkgs/libsass/template index cc53b11c982..50edaa8e2b5 100644 --- a/srcpkgs/libsass/template +++ b/srcpkgs/libsass/template @@ -1,7 +1,7 @@ # Template file for 'libsass' pkgname=libsass -version=3.5.4 -revision=2 +version=3.5.5 +revision=1 patch_args="-Np1" build_style=gnu-configure hostmakedepends="automake libtool" @@ -10,7 +10,7 @@ maintainer="Gerardo Di Iorio " license="MIT" homepage="http://www.sass-lang.com/libsass" distfiles="https://github.com/sass/${pkgname}/archive/${version}.tar.gz" -checksum=5f61cbcddaf8e6ef7a725fcfa5d05297becd7843960f245197ebb655ff868770 +checksum=487ca58f1dfdc4055079af04f0ad120747385d3b3926b1c8f46e4b00540fdb70 pre_configure() { NOCONFIGURE=1 autoreconf -fi