1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-04 11:23:46 +00:00

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:	e03553605b [2]
This commit is contained in:
Steve Wills 2019-07-16 16:12:38 +00:00
parent 834bf7574b
commit ec4e4d59c7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=506755
7 changed files with 94 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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);
}
}

View File

@ -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;
}
}

View File

@ -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;

View File

@ -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);
}
}

View File

@ -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