From 8fc3764110b64ad68b5ea08c3193514c446560d7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 24 May 2016 17:31:53 -0300 Subject: [PATCH] libxslt: security bump to version 1.1.29 CVE-2015-7995 - Fix for type confusion in preprocessing attributes Also drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../0001-Make-maxvars-option-work.patch | 30 ------------------- package/libxslt/libxslt.hash | 4 +-- package/libxslt/libxslt.mk | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/libxslt/0001-Make-maxvars-option-work.patch diff --git a/package/libxslt/0001-Make-maxvars-option-work.patch b/package/libxslt/0001-Make-maxvars-option-work.patch deleted file mode 100644 index d37cf62c91..0000000000 --- a/package/libxslt/0001-Make-maxvars-option-work.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5af7ad745323004984287e48b42712e7305de35c Mon Sep 17 00:00:00 2001 -From: Per Hedeland -Date: Fri, 13 Dec 2013 14:43:06 +0100 -Subject: [PATCH] Make --maxvars option work - -From upstream: https://gitorious.org/libxslt/libxslt/commit/5af7ad745323004984287e48b42 - -Signed-off-by: Peter Korsgaard ---- - xsltproc/xsltproc.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c -index b22df37..66d8cbb 100644 ---- a/xsltproc/xsltproc.c -+++ b/xsltproc/xsltproc.c -@@ -803,6 +803,10 @@ main(int argc, char **argv) - (!strcmp(argv[i], "--maxdepth"))) { - i++; - continue; -+ } else if ((!strcmp(argv[i], "-maxvars")) || -+ (!strcmp(argv[i], "--maxvars"))) { -+ i++; -+ continue; - } else if ((!strcmp(argv[i], "-maxparserdepth")) || - (!strcmp(argv[i], "--maxparserdepth"))) { - i++; --- -2.1.0 - diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 140db09df0..8222bc590d 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c libxslt-1.1.28.tar.gz +# Locally calculated after checking pgp signature +sha256 b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce libxslt-1.1.29.tar.gz diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 0cc4bb960b..868ba6a10f 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.28 +LIBXSLT_VERSION = 1.1.29 LIBXSLT_SITE = ftp://xmlsoft.org/libxslt LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT -- 2.30.2