Date: Tue, 16 Jul 2019 16:12:39 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506755 - in head/textproc/libxslt: . files Message-ID: <201907161612.x6GGCd9Z026768@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Jul 16 16:12:38 2019 New Revision: 506755 URL: https://svnweb.freebsd.org/changeset/ports/506755 Log: textproc/libxslt: Update to 1.1.33 [1], fix CVE-2019-11068 [2] PR: 239166 [1] PR: 238049 [2] Submitted by: egypcio [2] Exp-run by: antoine [1] Obtained from: https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 [2] Added: head/textproc/libxslt/files/patch-libxslt_documents.c (contents, props changed) head/textproc/libxslt/files/patch-libxslt_imports.c (contents, props changed) head/textproc/libxslt/files/patch-libxslt_transform.c (contents, props changed) head/textproc/libxslt/files/patch-libxslt_xslt.c (contents, props changed) Modified: head/textproc/libxslt/Makefile (contents, props changed) head/textproc/libxslt/distinfo (contents, props changed) head/textproc/libxslt/pkg-plist (contents, props changed) Modified: head/textproc/libxslt/Makefile ============================================================================== --- head/textproc/libxslt/Makefile Tue Jul 16 16:12:27 2019 (r506754) +++ head/textproc/libxslt/Makefile Tue Jul 16 16:12:38 2019 (r506755) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libxslt -PORTVERSION= 1.1.32 -PORTREVISION?= 1 +PORTVERSION= 1.1.33 CATEGORIES?= textproc gnome MASTER_SITES= http://xmlsoft.org/sources/ \ https://mirror.umd.edu/xbmc/build-deps/sources/ @@ -14,7 +13,7 @@ COMMENT?= The XSLT C library for GNOME .if !defined(REFERENCE_PORT) -USES+= cpe gmake localbase libtool pathfix +USES+= cpe gmake gnome localbase libtool pathfix CPE_VENDOR= xmlsoft GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Modified: head/textproc/libxslt/distinfo ============================================================================== --- head/textproc/libxslt/distinfo Tue Jul 16 16:12:27 2019 (r506754) +++ head/textproc/libxslt/distinfo Tue Jul 16 16:12:38 2019 (r506755) @@ -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 = 1562883477 +SHA256 (gnome2/libxslt-1.1.33.tar.gz) = 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8 +SIZE (gnome2/libxslt-1.1.33.tar.gz) = 3444093 Added: head/textproc/libxslt/files/patch-libxslt_documents.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxslt/files/patch-libxslt_documents.c Tue Jul 16 16:12:38 2019 (r506755) @@ -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); + } + } Added: head/textproc/libxslt/files/patch-libxslt_imports.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxslt/files/patch-libxslt_imports.c Tue Jul 16 16:12:38 2019 (r506755) @@ -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; + } + } Added: head/textproc/libxslt/files/patch-libxslt_transform.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxslt/files/patch-libxslt_transform.c Tue Jul 16 16:12:38 2019 (r506755) @@ -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; Added: head/textproc/libxslt/files/patch-libxslt_xslt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxslt/files/patch-libxslt_xslt.c Tue Jul 16 16:12:38 2019 (r506755) @@ -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); + } + } Modified: head/textproc/libxslt/pkg-plist ============================================================================== --- head/textproc/libxslt/pkg-plist Tue Jul 16 16:12:27 2019 (r506754) +++ head/textproc/libxslt/pkg-plist Tue Jul 16 16:12:38 2019 (r506755) @@ -31,7 +31,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907161612.x6GGCd9Z026768>