Attachment #205310 for bug #238049




# Created by: Ade Lovett <ade@FreeBSD.org>
# $FreeBSD$

PORTNAME=	libxslt
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)

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

Lines 1-3 Link Here

(-)textproc/libxslt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1522146585	1	TIMESTAMP = 1561369220
2	SHA256 (gnome2/libxslt-1.1.32.tar.gz) = 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460	2	SHA256 (gnome2/libxslt-1.1.33.tar.gz) = 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
3	SIZE (gnome2/libxslt-1.1.32.tar.gz) = 3440715	3	SIZE (gnome2/libxslt-1.1.33.tar.gz) = 3444093




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




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




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




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




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

Return to bug 238049

Lines 1-51 Link Here

(-)textproc/libxslt/Makefile (-5 / +5 lines)
1	# Created by: Ade Lovett <ade@FreeBSD.org>	1	# Created by: Ade Lovett <ade@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libxslt	4	PORTNAME= libxslt
5	PORTVERSION= 1.1.32	5	PORTVERSION= 1.1.33
6	PORTREVISION?= 1	6	PORTREVISION?= 0
7	CATEGORIES?= textproc gnome	7	CATEGORIES?= textproc gnome
8	MASTER_SITES= http://xmlsoft.org/sources/ \	8	MASTER_SITES= http://xmlsoft.org/sources/ \
9	https://mirror.umd.edu/xbmc/build-deps/sources/	9	https://mirror.umd.edu/xbmc/build-deps/sources/
10	DIST_SUBDIR= gnome2	10	DIST_SUBDIR= gnome2
11		11
12	MAINTAINER?= gnome@FreeBSD.org	12	MAINTAINER?= gnome@FreeBSD.org
13	COMMENT?= The XSLT C library for GNOME	13	COMMENT?= The XSLT C library for GNOME
14		14
15	.if !defined(REFERENCE_PORT)	15	.if !defined(REFERENCE_PORT)
16		16
17	USES+= cpe gmake localbase libtool pathfix	17	LICENSE= MIT
		18
		19	USES+= cpe gmake gnome localbase libtool pathfix
18	CPE_VENDOR= xmlsoft	20	CPE_VENDOR= xmlsoft
19	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
20	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
21	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
22	USE_GNOME?= libxml2	24	USE_GNOME?= libxml2
23	CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \	25	CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
24	--without-python	26	--without-python
25
26	LICENSE= MIT
27		27
28	.if defined(MASTERDIR)	28	.if defined(MASTERDIR)
29	_SLAVE_PORT= yes	29	_SLAVE_PORT= yes
30	.else	30	.else
31		31
32	OPTIONS_DEFINE= MEM_DEBUG CRYPTO	32	OPTIONS_DEFINE= MEM_DEBUG CRYPTO
33	OPTIONS_DEFAULT=CRYPTO	33	OPTIONS_DEFAULT=CRYPTO
34	MEM_DEBUG_DESC= Enable memory debugging	34	MEM_DEBUG_DESC= Enable memory debugging
35	CRYPTO_DESC= Enable crypto support for exslt	35	CRYPTO_DESC= Enable crypto support for exslt
36	.endif	36	.endif
37		37
38	MEM_DEBUG_CONFIGURE_ON= --with-mem-debug	38	MEM_DEBUG_CONFIGURE_ON= --with-mem-debug
39	CRYPTO_CONFIGURE_WITH= crypto	39	CRYPTO_CONFIGURE_WITH= crypto
40	CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt	40	CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
41		41
42	post-patch:	42	post-patch:
43	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \	43	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \
44	${WRKSRC}/doc/Makefile.in	44	${WRKSRC}/doc/Makefile.in
45	@${REINPLACE_CMD} -e 's\|[$$](bindir)/xsltproc\|../xsltproc/xsltproc\|g ; \	45	@${REINPLACE_CMD} -e 's\|[$$](bindir)/xsltproc\|../xsltproc/xsltproc\|g ; \
46	s\|[$$](bindir)/xmllint\|../xmllint/xmllint\|g' \	46	s\|[$$](bindir)/xmllint\|../xmllint/xmllint\|g' \
47	${WRKSRC}/doc/Makefile.in	47	${WRKSRC}/doc/Makefile.in
48		48
49	.include <bsd.port.mk>	49	.include <bsd.port.mk>
50		50
51	.endif	51	.endif

Line 0 Link Here

(-)textproc/libxslt/files/patch-libxslt_documents.c (+34 lines)
	1	--- libxslt/documents.c.orig 2015-05-10 14:11:29 UTC
	2	+++ libxslt/documents.c
	3	@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const x
	4	int res;
	5
	6	res = xsltCheckRead(ctxt->sec, ctxt, URI);
	7	- if (res == 0) {
	8	- xsltTransformError(ctxt, NULL, NULL,
	9	- "xsltLoadDocument: read rights for %s denied\n",
	10	- URI);
	11	+ if (res <= 0) {
	12	+ if (res == 0)
	13	+ xsltTransformError(ctxt, NULL, NULL,
	14	+ "xsltLoadDocument: read rights for %s denied\n",
	15	+ URI);
	16	return(NULL);
	17	}
	18	}
	19	@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const x
	20	int res;
	21
	22	res = xsltCheckRead(sec, NULL, URI);
	23	- if (res == 0) {
	24	- xsltTransformError(NULL, NULL, NULL,
	25	- "xsltLoadStyleDocument: read rights for %s denied\n",
	26	- URI);
	27	+ if (res <= 0) {
	28	+ if (res == 0)
	29	+ xsltTransformError(NULL, NULL, NULL,
	30	+ "xsltLoadStyleDocument: read rights for %s denied\n",
	31	+ URI);
	32	return(NULL);
	33	}
	34	}

Line 0 Link Here

(-)textproc/libxslt/files/patch-libxslt_imports.c (+18 lines)
	1	--- libxslt/imports.c.orig 2015-09-28 01:15:21 UTC
	2	+++ libxslt/imports.c
	3	@@ -131,10 +131,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xml
	4	int secres;
	5
	6	secres = xsltCheckRead(sec, NULL, URI);
	7	- if (secres == 0) {
	8	- xsltTransformError(NULL, NULL, NULL,
	9	- "xsl:import: read rights for %s denied\n",
	10	- URI);
	11	+ if (secres <= 0) {
	12	+ if (secres == 0)
	13	+ xsltTransformError(NULL, NULL, NULL,
	14	+ "xsl:import: read rights for %s denied\n",
	15	+ URI);
	16	goto error;
	17	}
	18	}

Line 0 Link Here

(-)textproc/libxslt/files/patch-libxslt_transform.c (+18 lines)
	1	--- libxslt/transform.c.orig 2017-10-30 07:49:55 UTC
	2	+++ libxslt/transform.c
	3	@@ -3485,10 +3485,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNode
	4	*/
	5	if (ctxt->sec != NULL) {
	6	ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
	7	- if (ret == 0) {
	8	- xsltTransformError(ctxt, NULL, inst,
	9	- "xsltDocumentElem: write rights for %s denied\n",
	10	- filename);
	11	+ if (ret <= 0) {
	12	+ if (ret == 0)
	13	+ xsltTransformError(ctxt, NULL, inst,
	14	+ "xsltDocumentElem: write rights for %s denied\n",
	15	+ filename);
	16	xmlFree(URL);
	17	xmlFree(filename);
	18	return;

Line 0 Link Here

(-)textproc/libxslt/files/patch-libxslt_xslt.c (+18 lines)
	1	--- libxslt/xslt.c.orig 2017-10-26 07:55:47 UTC
	2	+++ libxslt/xslt.c
	3	@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) {
	4	int res;
	5
	6	res = xsltCheckRead(sec, NULL, filename);
	7	- if (res == 0) {
	8	- xsltTransformError(NULL, NULL, NULL,
	9	- "xsltParseStylesheetFile: read rights for %s denied\n",
	10	- filename);
	11	+ if (res <= 0) {
	12	+ if (res == 0)
	13	+ xsltTransformError(NULL, NULL, NULL,
	14	+ "xsltParseStylesheetFile: read rights for %s denied\n",
	15	+ filename);
	16	return(NULL);
	17	}
	18	}

Lines 1-42 Link Here

(-)textproc/libxslt/pkg-plist (-1 / +1 lines)
1	bin/xslt-config	1	bin/xslt-config
2	bin/xsltproc	2	bin/xsltproc
3	include/libexslt/exslt.h	3	include/libexslt/exslt.h
4	include/libexslt/exsltconfig.h	4	include/libexslt/exsltconfig.h
5	include/libexslt/exsltexports.h	5	include/libexslt/exsltexports.h
6	include/libxslt/attributes.h	6	include/libxslt/attributes.h
7	include/libxslt/documents.h	7	include/libxslt/documents.h
8	include/libxslt/extensions.h	8	include/libxslt/extensions.h
9	include/libxslt/extra.h	9	include/libxslt/extra.h
10	include/libxslt/functions.h	10	include/libxslt/functions.h
11	include/libxslt/imports.h	11	include/libxslt/imports.h
12	include/libxslt/keys.h	12	include/libxslt/keys.h
13	include/libxslt/namespaces.h	13	include/libxslt/namespaces.h
14	include/libxslt/numbersInternals.h	14	include/libxslt/numbersInternals.h
15	include/libxslt/pattern.h	15	include/libxslt/pattern.h
16	include/libxslt/preproc.h	16	include/libxslt/preproc.h
17	include/libxslt/security.h	17	include/libxslt/security.h
18	include/libxslt/templates.h	18	include/libxslt/templates.h
19	include/libxslt/transform.h	19	include/libxslt/transform.h
20	include/libxslt/variables.h	20	include/libxslt/variables.h
21	include/libxslt/xslt.h	21	include/libxslt/xslt.h
22	include/libxslt/xsltInternals.h	22	include/libxslt/xsltInternals.h
23	include/libxslt/xsltconfig.h	23	include/libxslt/xsltconfig.h
24	include/libxslt/xsltexports.h	24	include/libxslt/xsltexports.h
25	include/libxslt/xsltlocale.h	25	include/libxslt/xsltlocale.h
26	include/libxslt/xsltutils.h	26	include/libxslt/xsltutils.h
27	lib/libexslt.a	27	lib/libexslt.a
28	lib/libexslt.so	28	lib/libexslt.so
29	lib/libexslt.so.0	29	lib/libexslt.so.0
30	lib/libexslt.so.0.8.20	30	lib/libexslt.so.0.8.20
31	lib/libxslt.a	31	lib/libxslt.a
32	lib/libxslt.so	32	lib/libxslt.so
33	lib/libxslt.so.1	33	lib/libxslt.so.1
34	lib/libxslt.so.1.1.32	34	lib/libxslt.so.1.1.33
35	lib/xsltConf.sh	35	lib/xsltConf.sh
36	libdata/pkgconfig/libexslt.pc	36	libdata/pkgconfig/libexslt.pc
37	libdata/pkgconfig/libxslt.pc	37	libdata/pkgconfig/libxslt.pc
38	share/aclocal/libxslt.m4	38	share/aclocal/libxslt.m4
39	man/man1/xsltproc.1.gz	39	man/man1/xsltproc.1.gz
40	man/man3/libexslt.3.gz	40	man/man3/libexslt.3.gz
41	man/man3/libxslt.3.gz	41	man/man3/libxslt.3.gz
42	@dir lib/libxslt-plugins	42	@dir lib/libxslt-plugins