Attachment #209029 for bug #241853

View | Details | Raw Unified | Return to bug 241853
Collapse All | Expand All

Lines 2-9 Link Here

(-)b/devel/py-lxml/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lxml	4	PORTNAME= lxml
5	PORTVERSION= 4.3.4	5	PORTVERSION= 4.4.1
6	PORTREVISION= 1
7	CATEGORIES= devel python	6	CATEGORIES= devel python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/py-lxml/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1563610055	1	TIMESTAMP = 1573373768
2	SHA256 (lxml-4.3.4.tar.gz) = 3ce1c49d4b4a7bc75fb12acb3a6247bb7a91fe420542e6d671ba9187d12a12c2	2	SHA256 (lxml-4.4.1.tar.gz) = c81cb40bff373ab7a7446d6bbca0190bccc5be3448b47b51d729e37799bb5692
3	SIZE (lxml-4.3.4.tar.gz) = 2488557	3	SIZE (lxml-4.4.1.tar.gz) = 4532114

Lines 2-8 Link Here

(-)b/textproc/libxslt/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libxslt	4	PORTNAME= libxslt
5	PORTVERSION= 1.1.33	5	DISTVERSION= 1.1.34
6	CATEGORIES?= textproc gnome	6	CATEGORIES?= textproc gnome
7	MASTER_SITES= http://xmlsoft.org/sources/ \	7	MASTER_SITES= http://xmlsoft.org/sources/ \
8	https://mirror.umd.edu/xbmc/build-deps/sources/	8	https://mirror.umd.edu/xbmc/build-deps/sources/

Lines 1-3 Link Here

(-)b/textproc/libxslt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562883477	1	TIMESTAMP = 1572803425
2	SHA256 (gnome2/libxslt-1.1.33.tar.gz) = 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8	2	SHA256 (gnome2/libxslt-1.1.34.tar.gz) = 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
3	SIZE (gnome2/libxslt-1.1.33.tar.gz) = 3444093	3	SIZE (gnome2/libxslt-1.1.34.tar.gz) = 3552258




--- Makefile.in.orig	2012-10-22 16:13:46.000000000 +0000
+++ Makefile.in	2012-10-22 16:14:29.000000000 +0000
@@ -327,8 +327,7 @@
 	libexslt \
 	xsltproc \
 	doc \
-	$(PYTHON_SUBDIR) \
-	tests
+	$(PYTHON_SUBDIR)
 
 DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
 confexecdir = $(libdir)




--- configure.orig	2009-09-18 15:31:26.000000000 -0400
+++ configure	2009-09-18 15:35:31.000000000 -0400
@@ -4770,7 +4770,7 @@ fi
 if test "${with_html_subdir+set}" = set; then
   withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"
 else
-  HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"
+  HTML_DIR="$HTML_DIR/\$(PACKAGE)"
 fi
 
 
@@ -15572,11 +15572,12 @@ except: print 0"`
     fi
     if test "$PYTHON_VERSION" != ""
     then
+	with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
 	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
 	   -d $with_python/lib/python$PYTHON_VERSION/site-packages
 	then
 	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
-	    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+	    PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
 	else
 	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
 	    then




--- libxslt/keys.c.orig	2017-12-02 03:58:51.000000000 -0500
+++ libxslt/keys.c	2019-06-12 08:38:40.214472000 -0400
@@ -629,6 +629,7 @@ xsltInitCtxtKey(xsltTransformContextPtr ctxt, xsltDocu
     xmlNodePtr oldContextNode;
     xsltDocumentPtr oldDocInfo;
     int	oldXPPos, oldXPSize;
+    xmlNodePtr oldXPNode;
     xmlDocPtr oldXPDoc;
     int oldXPNsNr;
     xmlNsPtr *oldXPNamespaces;
@@ -667,6 +668,7 @@ fprintf(stderr, "xsltInitCtxtKey %s : %d\n", keyDef->n
     oldDocInfo = ctxt->document;
     oldContextNode = ctxt->node;
 
+    oldXPNode = xpctxt->node;
     oldXPDoc = xpctxt->doc;
     oldXPPos = xpctxt->proximityPosition;
     oldXPSize = xpctxt->contextSize;
@@ -865,6 +867,7 @@ error:
     /*
     * Restore context state.
     */
+    xpctxt->node = oldXPNode;
     xpctxt->doc = oldXPDoc;
     xpctxt->nsNr = oldXPNsNr;
     xpctxt->namespaces = oldXPNamespaces;

Removed Link Here

(-)a/textproc/libxslt/files/patch-libxslt__xsltconfig.h.in (-8 lines)
1	--- libxslt/xsltconfig.h.in.orig Mon Mar 26 20:55:08 2001
2	+++ libxslt/xsltconfig.h.in Thu Apr 19 22:20:46 2001
3	@@ -23,3 +23,5 @@
4	#ifdef __GNUC__
5	+#ifndef __FreeBSD__
6	#include <ansidecl.h>
7	+#endif
8	#ifndef ATTRIBUTE_UNUSED




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

Lines 31-37 lib/libexslt.so.0.8.20 Link Here

(-)b/textproc/libxslt/pkg-plist (-1 / +1 lines)
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.33	34	lib/libxslt.so.1.1.34
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

Lines 3-9 Link Here

(-)b/textproc/py-libxslt/pkg-plist (-1 lines)
3	%%PYTHON_SITELIBDIR%%/libxslt.pyo	3	%%PYTHON_SITELIBDIR%%/libxslt.pyo
4	%%PYTHON_SITELIBDIR%%/libxsltmod.a	4	%%PYTHON_SITELIBDIR%%/libxsltmod.a
5	%%PYTHON_SITELIBDIR%%/libxsltmod.so	5	%%PYTHON_SITELIBDIR%%/libxsltmod.so
6	%%DOCSDIR%%/TODO
7	%%EXAMPLESDIR%%/basic.py	6	%%EXAMPLESDIR%%/basic.py
8	%%EXAMPLESDIR%%/exslt.py	7	%%EXAMPLESDIR%%/exslt.py
9	%%EXAMPLESDIR%%/extelem.py	8	%%EXAMPLESDIR%%/extelem.py

Return to bug 241853

Removed Link Here

(-)a/textproc/libxslt/files/patch-Makefile.in (-12 lines)
1	--- Makefile.in.orig 2012-10-22 16:13:46.000000000 +0000
2	+++ Makefile.in 2012-10-22 16:14:29.000000000 +0000
3	@@ -327,8 +327,7 @@
4	libexslt \
5	xsltproc \
6	doc \
7	- $(PYTHON_SUBDIR) \
8	- tests
9	+ $(PYTHON_SUBDIR)
10
11	DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
12	confexecdir = $(libdir)

Removed Link Here

(-)a/textproc/libxslt/files/patch-configure (-25 lines)
1	--- configure.orig 2009-09-18 15:31:26.000000000 -0400
2	+++ configure 2009-09-18 15:35:31.000000000 -0400
3	@@ -4770,7 +4770,7 @@ fi
4	if test "${with_html_subdir+set}" = set; then
5	withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"
6	else
7	- HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"
8	+ HTML_DIR="$HTML_DIR/\$(PACKAGE)"
9	fi
10
11
12	@@ -15572,11 +15572,12 @@ except: print 0"`
13	fi
14	if test "$PYTHON_VERSION" != ""
15	then
16	+ with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
17	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
18	-d $with_python/lib/python$PYTHON_VERSION/site-packages
19	then
20	PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
21	- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
22	+ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
23	else
24	if test -r $prefix/include/python$PYTHON_VERSION/Python.h
25	then

Removed Link Here

(-)a/textproc/libxslt/files/patch-libxslt-keys.c (-26 lines)
1	--- libxslt/keys.c.orig 2017-12-02 03:58:51.000000000 -0500
2	+++ libxslt/keys.c 2019-06-12 08:38:40.214472000 -0400
3	@@ -629,6 +629,7 @@ xsltInitCtxtKey(xsltTransformContextPtr ctxt, xsltDocu
4	xmlNodePtr oldContextNode;
5	xsltDocumentPtr oldDocInfo;
6	int oldXPPos, oldXPSize;
7	+ xmlNodePtr oldXPNode;
8	xmlDocPtr oldXPDoc;
9	int oldXPNsNr;
10	xmlNsPtr *oldXPNamespaces;
11	@@ -667,6 +668,7 @@ fprintf(stderr, "xsltInitCtxtKey %s : %d\n", keyDef->n
12	oldDocInfo = ctxt->document;
13	oldContextNode = ctxt->node;
14
15	+ oldXPNode = xpctxt->node;
16	oldXPDoc = xpctxt->doc;
17	oldXPPos = xpctxt->proximityPosition;
18	oldXPSize = xpctxt->contextSize;
19	@@ -865,6 +867,7 @@ error:
20	/*
21	* Restore context state.
22	*/
23	+ xpctxt->node = oldXPNode;
24	xpctxt->doc = oldXPDoc;
25	xpctxt->nsNr = oldXPNsNr;
26	xpctxt->namespaces = oldXPNamespaces;

Removed Link Here

(-)a/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	}

Removed Link Here

(-)a/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	}

Removed Link Here

(-)a/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;

Removed Link Here

(-)a/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	}