Attachment 171457 Details for Bug 210298 – Update libxslt to 1.1.29

[patch] Update libxslt to 1.1.29

textproc_libxslt.patch (text/plain), 3.68 KB, created by VK on 2016-06-15 10:28:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: VK

Created: 2016-06-15 10:28:21 UTC

Size: 3.68 KB

patch

obsolete

>Index: textproc/libxslt/Makefile
>===================================================================
>--- textproc/libxslt/Makefile	(revision 416921)
>+++ textproc/libxslt/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	libxslt
>-PORTVERSION=	1.1.28
>-PORTREVISION?=	8
>+PORTVERSION=	1.1.29
>+PORTREVISION?=	0
> CATEGORIES?=	textproc gnome
> MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
> 		http://xmlsoft.org/sources/ \
>Index: textproc/libxslt/distinfo
>===================================================================
>--- textproc/libxslt/distinfo	(revision 416921)
>+++ textproc/libxslt/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (gnome2/libxslt-1.1.28.tar.gz) = 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c
>-SIZE (gnome2/libxslt-1.1.28.tar.gz) = 3435907
>+TIMESTAMP = 1465983151
>+SHA256 (gnome2/libxslt-1.1.29.tar.gz) = b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce
>+SIZE (gnome2/libxslt-1.1.29.tar.gz) = 3428524
>Index: textproc/libxslt/files/patch-CVE-2015-7995
>===================================================================
>--- textproc/libxslt/files/patch-CVE-2015-7995	(revision 416921)
>+++ textproc/libxslt/files/patch-CVE-2015-7995	(nonexistent)
>@@ -1,29 +0,0 @@
>-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
>-From: Daniel Veillard <veillard@redhat.com>
>-Date: Thu, 29 Oct 2015 19:33:23 +0800
>-Subject: Fix for type confusion in preprocessing attributes
>-
>-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
>-We need to check that the parent node is an element before dereferencing
>-its namespace
>----
>- libxslt/preproc.c | 3 ++-
>- 1 file changed, 2 insertions(+), 1 deletion(-)
>-
>-diff --git a/libxslt/preproc.c b/libxslt/preproc.c
>-index 0eb80a0..7f69325 100644
>---- libxslt/preproc.c
>-+++ libxslt/preproc.c
>-@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
>- 	} else if (IS_XSLT_NAME(inst, "attribute")) {
>- 	    xmlNodePtr parent = inst->parent;
>- 
>--	    if ((parent == NULL) || (parent->ns == NULL) ||
>-+	    if ((parent == NULL) ||
>-+	        (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
>- 		((parent->ns != inst->ns) &&
>- 		 (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
>- 		(!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
>--- 
>-cgit v0.11.2
>-
>Index: textproc/libxslt/files/patch-xsltproc_xsltproc.c
>===================================================================
>--- textproc/libxslt/files/patch-xsltproc_xsltproc.c	(revision 416921)
>+++ textproc/libxslt/files/patch-xsltproc_xsltproc.c	(nonexistent)
>@@ -1,24 +0,0 @@
>-From 5af7ad745323004984287e48b42712e7305de35c Mon Sep 17 00:00:00 2001
>-From: Per Hedeland <per@hedeland.org>
>-Date: Fri, 13 Dec 2013 14:43:06 +0100
>-Subject: Make --maxvars option work
>-
>-
>-diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
>-index b22df37..66d8cbb 100644
>---- xsltproc/xsltproc.c
>-+++ 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++;
>--- 
>-cgit v0.10.2
>-
>Index: textproc/libxslt/pkg-plist
>===================================================================
>--- textproc/libxslt/pkg-plist	(revision 416921)
>+++ textproc/libxslt/pkg-plist	(working copy)
>@@ -32,7 +32,7 @@
> lib/libxslt.a
> lib/libxslt.so
> lib/libxslt.so.1
>-lib/libxslt.so.1.1.28
>+lib/libxslt.so.1.1.29
> lib/libxslt.so.2
> lib/xsltConf.sh
> libdata/pkgconfig/libexslt.pc

Flags:

vlad-fbsd: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 210298: 171457