Attachment 205310 Details for Bug 238049 – [PATCH] textproc/libxslt: update to 1.1.33, fix CVE-2019-11068

[patch] [PATCH] textproc/libxslt: update to 1.1.33, fix CVE-2019-11068

ports_r505011_PATCH__textproc_libxslt.diff (text/plain), 8.79 KB, created by Vinícius Zavam on 2019-06-24 10:29:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2019-06-24 10:29:07 UTC

Size: 8.79 KB

patch

obsolete

>Index: textproc/libxslt/Makefile
>===================================================================
>--- textproc/libxslt/Makefile	(revision 505011)
>+++ textproc/libxslt/Makefile	(working copy)
>@@ -1,51 +1,51 @@
> # Created by: Ade Lovett <ade@FreeBSD.org>
> # $FreeBSD$
> 
> PORTNAME=	libxslt
>-PORTVERSION=	1.1.32
>-PORTREVISION?=	1
>+PORTVERSION=	1.1.33
>+PORTREVISION?=	0
> CATEGORIES?=	textproc gnome
> MASTER_SITES=	http://xmlsoft.org/sources/ \
> 		https://mirror.umd.edu/xbmc/build-deps/sources/
> DIST_SUBDIR=	gnome2
> 
> MAINTAINER?=	gnome@FreeBSD.org
> COMMENT?=	The XSLT C library for GNOME
> 
> .if !defined(REFERENCE_PORT)
> 
>-USES+=		cpe gmake localbase libtool pathfix
>+LICENSE=	MIT
>+
>+USES+=		cpe gmake gnome localbase libtool pathfix
> CPE_VENDOR=	xmlsoft
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> USE_GNOME?=	libxml2
> CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
> 		--without-python
>-
>-LICENSE=	MIT
> 
> .if defined(MASTERDIR)
> _SLAVE_PORT=	yes
> .else
> 
> OPTIONS_DEFINE=	MEM_DEBUG CRYPTO
> OPTIONS_DEFAULT=CRYPTO
> MEM_DEBUG_DESC=	Enable memory debugging
> CRYPTO_DESC=	Enable crypto support for exslt
> .endif
> 
> MEM_DEBUG_CONFIGURE_ON=	--with-mem-debug
> CRYPTO_CONFIGURE_WITH=	crypto
> CRYPTO_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
> 		${WRKSRC}/doc/Makefile.in
> 	@${REINPLACE_CMD} -e 's|[$$](bindir)/xsltproc|../xsltproc/xsltproc|g ; \
> 		s|[$$](bindir)/xmllint|../xmllint/xmllint|g' \
> 		${WRKSRC}/doc/Makefile.in
> 
> .include <bsd.port.mk>
> 
> .endif
>Index: textproc/libxslt/distinfo
>===================================================================
>--- textproc/libxslt/distinfo	(revision 505011)
>+++ textproc/libxslt/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1522146585
>-SHA256 (gnome2/libxslt-1.1.32.tar.gz) = 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460
>-SIZE (gnome2/libxslt-1.1.32.tar.gz) = 3440715
>+TIMESTAMP = 1561369220
>+SHA256 (gnome2/libxslt-1.1.33.tar.gz) = 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
>+SIZE (gnome2/libxslt-1.1.33.tar.gz) = 3444093
>Index: textproc/libxslt/files/patch-libxslt_documents.c
>===================================================================
>--- textproc/libxslt/files/patch-libxslt_documents.c	(nonexistent)
>+++ textproc/libxslt/files/patch-libxslt_documents.c	(working copy)
>@@ -0,0 +1,34 @@
>+--- libxslt/documents.c.orig	2015-05-10 14:11:29 UTC
>++++ libxslt/documents.c
>+@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const x
>+ 	int res;
>+ 
>+ 	res = xsltCheckRead(ctxt->sec, ctxt, URI);
>+-	if (res == 0) {
>+-	    xsltTransformError(ctxt, NULL, NULL,
>+-		 "xsltLoadDocument: read rights for %s denied\n",
>+-			     URI);
>++	if (res <= 0) {
>++            if (res == 0)
>++                xsltTransformError(ctxt, NULL, NULL,
>++                     "xsltLoadDocument: read rights for %s denied\n",
>++                                 URI);
>+ 	    return(NULL);
>+ 	}
>+     }
>+@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const x
>+ 	int res;
>+ 
>+ 	res = xsltCheckRead(sec, NULL, URI);
>+-	if (res == 0) {
>+-	    xsltTransformError(NULL, NULL, NULL,
>+-		 "xsltLoadStyleDocument: read rights for %s denied\n",
>+-			     URI);
>++	if (res <= 0) {
>++            if (res == 0)
>++                xsltTransformError(NULL, NULL, NULL,
>++                     "xsltLoadStyleDocument: read rights for %s denied\n",
>++                                 URI);
>+ 	    return(NULL);
>+ 	}
>+     }
>
>Property changes on: textproc/libxslt/files/patch-libxslt_documents.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/libxslt/files/patch-libxslt_imports.c
>===================================================================
>--- textproc/libxslt/files/patch-libxslt_imports.c	(nonexistent)
>+++ textproc/libxslt/files/patch-libxslt_imports.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- libxslt/imports.c.orig	2015-09-28 01:15:21 UTC
>++++ libxslt/imports.c
>+@@ -131,10 +131,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xml
>+ 	int secres;
>+ 
>+ 	secres = xsltCheckRead(sec, NULL, URI);
>+-	if (secres == 0) {
>+-	    xsltTransformError(NULL, NULL, NULL,
>+-		 "xsl:import: read rights for %s denied\n",
>+-			     URI);
>++	if (secres <= 0) {
>++            if (secres == 0)
>++                xsltTransformError(NULL, NULL, NULL,
>++                     "xsl:import: read rights for %s denied\n",
>++                                 URI);
>+ 	    goto error;
>+ 	}
>+     }
>
>Property changes on: textproc/libxslt/files/patch-libxslt_imports.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/libxslt/files/patch-libxslt_transform.c
>===================================================================
>--- textproc/libxslt/files/patch-libxslt_transform.c	(nonexistent)
>+++ textproc/libxslt/files/patch-libxslt_transform.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- libxslt/transform.c.orig	2017-10-30 07:49:55 UTC
>++++ libxslt/transform.c
>+@@ -3485,10 +3485,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNode
>+      */
>+     if (ctxt->sec != NULL) {
>+ 	ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
>+-	if (ret == 0) {
>+-	    xsltTransformError(ctxt, NULL, inst,
>+-		 "xsltDocumentElem: write rights for %s denied\n",
>+-			     filename);
>++	if (ret <= 0) {
>++            if (ret == 0)
>++                xsltTransformError(ctxt, NULL, inst,
>++                     "xsltDocumentElem: write rights for %s denied\n",
>++                                 filename);
>+ 	    xmlFree(URL);
>+ 	    xmlFree(filename);
>+ 	    return;
>
>Property changes on: textproc/libxslt/files/patch-libxslt_transform.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/libxslt/files/patch-libxslt_xslt.c
>===================================================================
>--- textproc/libxslt/files/patch-libxslt_xslt.c	(nonexistent)
>+++ textproc/libxslt/files/patch-libxslt_xslt.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- libxslt/xslt.c.orig	2017-10-26 07:55:47 UTC
>++++ libxslt/xslt.c
>+@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) {
>+ 	int res;
>+ 
>+ 	res = xsltCheckRead(sec, NULL, filename);
>+-	if (res == 0) {
>+-	    xsltTransformError(NULL, NULL, NULL,
>+-		 "xsltParseStylesheetFile: read rights for %s denied\n",
>+-			     filename);
>++	if (res <= 0) {
>++            if (res == 0)
>++                xsltTransformError(NULL, NULL, NULL,
>++                     "xsltParseStylesheetFile: read rights for %s denied\n",
>++                                 filename);
>+ 	    return(NULL);
>+ 	}
>+     }
>
>Property changes on: textproc/libxslt/files/patch-libxslt_xslt.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/libxslt/pkg-plist
>===================================================================
>--- textproc/libxslt/pkg-plist	(revision 505011)
>+++ textproc/libxslt/pkg-plist	(working copy)
>@@ -1,42 +1,42 @@
> bin/xslt-config
> bin/xsltproc
> include/libexslt/exslt.h
> include/libexslt/exsltconfig.h
> include/libexslt/exsltexports.h
> include/libxslt/attributes.h
> include/libxslt/documents.h
> include/libxslt/extensions.h
> include/libxslt/extra.h
> include/libxslt/functions.h
> include/libxslt/imports.h
> include/libxslt/keys.h
> include/libxslt/namespaces.h
> include/libxslt/numbersInternals.h
> include/libxslt/pattern.h
> include/libxslt/preproc.h
> include/libxslt/security.h
> include/libxslt/templates.h
> include/libxslt/transform.h
> include/libxslt/variables.h
> include/libxslt/xslt.h
> include/libxslt/xsltInternals.h
> include/libxslt/xsltconfig.h
> include/libxslt/xsltexports.h
> include/libxslt/xsltlocale.h
> include/libxslt/xsltutils.h
> lib/libexslt.a
> lib/libexslt.so
> lib/libexslt.so.0
> lib/libexslt.so.0.8.20
> lib/libxslt.a
> lib/libxslt.so
> lib/libxslt.so.1
>-lib/libxslt.so.1.1.32
>+lib/libxslt.so.1.1.33
> lib/xsltConf.sh
> libdata/pkgconfig/libexslt.pc
> libdata/pkgconfig/libxslt.pc
> share/aclocal/libxslt.m4
> man/man1/xsltproc.1.gz
> man/man3/libexslt.3.gz
> man/man3/libxslt.3.gz
> @dir lib/libxslt-plugins

Actions: View | Diff

Attachments on bug 238049: 204539 | 205310 | 205328