Mon Nov 3 19:39:08 2014 UTC ()
Pullup ticket #4538 - requested by drochner
textproc/libxml2: security update
textproc/py-libxml2: security update

Revisions pulled up:
- textproc/libxml2/Makefile                                     1.132-1.133
- textproc/libxml2/PLIST                                        1.45
- textproc/libxml2/distinfo                                     1.104-1.105
- textproc/libxml2/patches/patch-ba                             1.3
- textproc/libxml2/patches/patch-parser.c                       deleted
- textproc/libxml2/patches/patch-xzlib.c                        deleted
- textproc/py-libxml2/Makefile                                  1.50
- textproc/py-libxml2/distinfo                                  1.31
- textproc/py-libxml2/patches/patch-ab                          1.3
- textproc/py-libxml2/patches/patch-ac                          1.2
- textproc/py-libxml2/patches/patch-drv_libxml2.py              deleted

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Fri Oct 17 15:46:47 UTC 2014

   Modified Files:
           pkgsrc/textproc/libxml2: Makefile PLIST distinfo
   Removed Files:
           pkgsrc/textproc/libxml2/patches: patch-parser.c patch-xzlib.c

   Log Message:
   update to 2.9.2
   -security fixes:
    -Fix for CVE-2014-3660 billion laugh variant
    -CVE-2014-0191 Do not fetch external parameter entities (was patched
     in pkgsrc)
   -many bugfixes, doc fixes, cleanup
   -added cmake macro

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Mon Oct 20 19:11:23 UTC 2014

   Modified Files:
           pkgsrc/textproc/py-libxml2: Makefile distinfo
           pkgsrc/textproc/py-libxml2/patches: patch-ab patch-ac
   Removed Files:
           pkgsrc/textproc/py-libxml2/patches: patch-drv_libxml2.py

   Log Message:
   sync w/ base pkg

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Oct 28 18:55:57 UTC 2014

   Modified Files:
           pkgsrc/textproc/libxml2: Makefile distinfo
   Added Files:
           pkgsrc/textproc/libxml2/patches: patch-ba

   Log Message:
   pull in two patches from upstream to fix regressions:
   -catalog initialization problem
   -problem with entity expansion
   This hopefully fixes build failures in KDE3 packages, reported by Joerg.
   bump PKGREV


(tron)
diff -r1.130 -r1.130.2.1 pkgsrc/textproc/libxml2/Makefile
diff -r1.44 -r1.44.12.1 pkgsrc/textproc/libxml2/PLIST
diff -r1.103 -r1.103.4.1 pkgsrc/textproc/libxml2/distinfo
diff -r0 -r1.3.2.2 pkgsrc/textproc/libxml2/patches/patch-ba
diff -r1.1 -r0 pkgsrc/textproc/libxml2/patches/patch-parser.c
diff -r1.1 -r0 pkgsrc/textproc/libxml2/patches/patch-xzlib.c
diff -r1.49 -r1.49.6.1 pkgsrc/textproc/py-libxml2/Makefile
diff -r1.30 -r1.30.8.1 pkgsrc/textproc/py-libxml2/distinfo
diff -r1.2 -r1.2.8.1 pkgsrc/textproc/py-libxml2/patches/patch-ab
diff -r1.1 -r1.1.12.1 pkgsrc/textproc/py-libxml2/patches/patch-ac
diff -r1.1 -r0 pkgsrc/textproc/py-libxml2/patches/patch-drv_libxml2.py
cvs diff -r1.130 -r1.130.2.1 pkgsrc/textproc/libxml2/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/Makefile 2014/07/18 10:29:37 1.130
+++ pkgsrc/textproc/libxml2/Makefile 2014/11/03 19:39:07 1.130.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.130 2014/07/18 10:29:37 ryoon Exp $ 1# $NetBSD: Makefile,v 1.130.2.1 2014/11/03 19:39:07 tron Exp $
2 2
3DISTNAME= libxml2-2.9.1 3DISTNAME= libxml2-2.9.2
4PKGREVISION= 2 4PKGREVISION= 1
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ 6MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
7 http://xmlsoft.org/sources/ 7 http://xmlsoft.org/sources/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://xmlsoft.org/ 10HOMEPAGE= http://xmlsoft.org/
11COMMENT= XML parser library from the GNOME project 11COMMENT= XML parser library from the GNOME project
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16USE_FEATURES= glob 16USE_FEATURES= glob
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
cvs diff -r1.44 -r1.44.12.1 pkgsrc/textproc/libxml2/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/PLIST 2013/05/26 09:22:14 1.44
+++ pkgsrc/textproc/libxml2/PLIST 2014/11/03 19:39:07 1.44.12.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.44 2013/05/26 09:22:14 adam Exp $ 1@comment $NetBSD: PLIST,v 1.44.12.1 2014/11/03 19:39:07 tron Exp $
2bin/xml2-config 2bin/xml2-config
3bin/xmlcatalog 3bin/xmlcatalog
4bin/xmllint 4bin/xmllint
5include/libxml2/libxml/DOCBparser.h 5include/libxml2/libxml/DOCBparser.h
6include/libxml2/libxml/HTMLparser.h 6include/libxml2/libxml/HTMLparser.h
7include/libxml2/libxml/HTMLtree.h 7include/libxml2/libxml/HTMLtree.h
8include/libxml2/libxml/SAX.h 8include/libxml2/libxml/SAX.h
9include/libxml2/libxml/SAX2.h 9include/libxml2/libxml/SAX2.h
10include/libxml2/libxml/c14n.h 10include/libxml2/libxml/c14n.h
11include/libxml2/libxml/catalog.h 11include/libxml2/libxml/catalog.h
12include/libxml2/libxml/chvalid.h 12include/libxml2/libxml/chvalid.h
13include/libxml2/libxml/debugXML.h 13include/libxml2/libxml/debugXML.h
14include/libxml2/libxml/dict.h 14include/libxml2/libxml/dict.h
@@ -39,26 +39,27 @@ include/libxml2/libxml/xmlmemory.h @@ -39,26 +39,27 @@ include/libxml2/libxml/xmlmemory.h
39include/libxml2/libxml/xmlmodule.h 39include/libxml2/libxml/xmlmodule.h
40include/libxml2/libxml/xmlreader.h 40include/libxml2/libxml/xmlreader.h
41include/libxml2/libxml/xmlregexp.h 41include/libxml2/libxml/xmlregexp.h
42include/libxml2/libxml/xmlsave.h 42include/libxml2/libxml/xmlsave.h
43include/libxml2/libxml/xmlschemas.h 43include/libxml2/libxml/xmlschemas.h
44include/libxml2/libxml/xmlschemastypes.h 44include/libxml2/libxml/xmlschemastypes.h
45include/libxml2/libxml/xmlstring.h 45include/libxml2/libxml/xmlstring.h
46include/libxml2/libxml/xmlunicode.h 46include/libxml2/libxml/xmlunicode.h
47include/libxml2/libxml/xmlversion.h 47include/libxml2/libxml/xmlversion.h
48include/libxml2/libxml/xmlwriter.h 48include/libxml2/libxml/xmlwriter.h
49include/libxml2/libxml/xpath.h 49include/libxml2/libxml/xpath.h
50include/libxml2/libxml/xpathInternals.h 50include/libxml2/libxml/xpathInternals.h
51include/libxml2/libxml/xpointer.h 51include/libxml2/libxml/xpointer.h
 52lib/cmake/libxml2/libxml2-config.cmake
52lib/libxml2.la 53lib/libxml2.la
53lib/pkgconfig/libxml-2.0.pc 54lib/pkgconfig/libxml-2.0.pc
54lib/xml2Conf.sh 55lib/xml2Conf.sh
55man/man1/xml2-config.1 56man/man1/xml2-config.1
56man/man1/xmlcatalog.1 57man/man1/xmlcatalog.1
57man/man1/xmllint.1 58man/man1/xmllint.1
58man/man3/libxml.3 59man/man3/libxml.3
59share/aclocal/libxml.m4 60share/aclocal/libxml.m4
60share/doc/${PKGNAME}/Copyright 61share/doc/${PKGNAME}/Copyright
61share/doc/libxml2/DOM.gif 62share/doc/libxml2/DOM.gif
62share/doc/libxml2/FAQ.html 63share/doc/libxml2/FAQ.html
63share/doc/libxml2/Libxml2-Logo-180x168.gif 64share/doc/libxml2/Libxml2-Logo-180x168.gif
64share/doc/libxml2/Libxml2-Logo-90x34.gif 65share/doc/libxml2/Libxml2-Logo-90x34.gif
cvs diff -r1.103 -r1.103.4.1 pkgsrc/textproc/libxml2/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/distinfo 2014/05/10 22:45:42 1.103
+++ pkgsrc/textproc/libxml2/distinfo 2014/11/03 19:39:07 1.103.4.1
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1$NetBSD: distinfo,v 1.103 2014/05/10 22:45:42 spz Exp $ 1$NetBSD: distinfo,v 1.103.4.1 2014/11/03 19:39:07 tron Exp $
2 2
3SHA1 (libxml2-2.9.1.tar.gz) = eb3e2146c6d68aea5c2a4422ed76fe196f933c21 3SHA1 (libxml2-2.9.2.tar.gz) = f46a37ea6d869f702e03f393c376760f3cbee673
4RMD160 (libxml2-2.9.1.tar.gz) = 257285d9ac070ed9f58666b7bd7c4653651c871b 4RMD160 (libxml2-2.9.2.tar.gz) = 969b4ed8782f455fd4a6ca1c1b4ffa7651090070
5Size (libxml2-2.9.1.tar.gz) = 5172503 bytes 5Size (libxml2-2.9.2.tar.gz) = 5444991 bytes
6SHA1 (patch-aa) = 589a279df1a5fac8b1b2dbd0018a1bbf0c5ab169 6SHA1 (patch-aa) = 589a279df1a5fac8b1b2dbd0018a1bbf0c5ab169
7SHA1 (patch-ab) = 11567fe9a3fde42f3901fd4ab4620bf845fe634b 7SHA1 (patch-ab) = 11567fe9a3fde42f3901fd4ab4620bf845fe634b
8SHA1 (patch-ac) = 101cd554fd22e8e9817e21591240eb784b1219b5 8SHA1 (patch-ac) = 101cd554fd22e8e9817e21591240eb784b1219b5
9SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177 9SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
10SHA1 (patch-ae) = 2823276343f65c7d244d22e548faa6a517445819 10SHA1 (patch-ae) = 2823276343f65c7d244d22e548faa6a517445819
11SHA1 (patch-ag) = 19afd69713298ecbd247ba733a7c0c13464ae572 11SHA1 (patch-ag) = 19afd69713298ecbd247ba733a7c0c13464ae572
12SHA1 (patch-aj) = 988c30b4b09a1cbaf9e7db02bb8981da0f1beaa7 12SHA1 (patch-aj) = 988c30b4b09a1cbaf9e7db02bb8981da0f1beaa7
13SHA1 (patch-parser.c) = 06b448b1e627cbe5400524f5f980faa87b9ad4fe 13SHA1 (patch-ba) = 78097bb871cc614c8d95a53d825542d23e113192
14SHA1 (patch-threads.c) = 70bb0a779dff6611f755128d609f82360a492f9a 14SHA1 (patch-threads.c) = 70bb0a779dff6611f755128d609f82360a492f9a
15SHA1 (patch-xzlib.c) = 1fa0b97f3fb52c40c4df3933f269b9b0bbadb0ff 
File Added: pkgsrc/textproc/libxml2/patches/Attic/patch-ba
$NetBSD: patch-ba,v 1.3.2.2 2014/11/03 19:39:07 tron Exp $

https://git.gnome.org/browse/libxml2/commit/?id=f65128f38289d77ff322d63aef2858cc0a819c34
https://git.gnome.org/browse/libxml2/commit/?id=72a46a519ce7326d9a00f0b6a7f2a8e958cd1675

--- parser.c.orig	2014-10-16 05:57:40.000000000 +0000
+++ parser.c
@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
      * far more secure as the parser will only process data coming from
      * the document entity by default.
      */
-    if ((ent->checked == 0) &&
+    if (((ent->checked == 0) ||
+	 ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
         ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
          (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
 	unsigned long oldnbent = ctxt->nbentities;
@@ -14830,9 +14831,6 @@ xmlInitParser(void) {
 #ifdef LIBXML_XPATH_ENABLED
 	xmlXPathInit();
 #endif
-#ifdef LIBXML_CATALOG_ENABLED
-        xmlInitializeCatalog();
-#endif
 	xmlParserInitialized = 1;
 #ifdef LIBXML_THREAD_ENABLED
     }
File Deleted: pkgsrc/textproc/libxml2/patches/Attic/patch-parser.c
File Deleted: pkgsrc/textproc/libxml2/patches/Attic/patch-xzlib.c
cvs diff -r1.49 -r1.49.6.1 pkgsrc/textproc/py-libxml2/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-libxml2/Makefile 2014/03/13 11:08:52 1.49
+++ pkgsrc/textproc/py-libxml2/Makefile 2014/11/03 19:39:08 1.49.6.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.49 2014/03/13 11:08:52 jperkin Exp $ 1# $NetBSD: Makefile,v 1.49.6.1 2014/11/03 19:39:08 tron Exp $
2 2
3DISTNAME= libxml2-2.9.1 3DISTNAME= libxml2-2.9.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ftp://xmlsoft.org/libxml2/ 6MASTER_SITES= ftp://xmlsoft.org/libxml2/
7#MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.9/} 7#MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.9/}
8 8
9MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://xmlsoft.org/ 10HOMEPAGE= http://xmlsoft.org/
11COMMENT= Python wrapper for libxml2 11COMMENT= Python wrapper for libxml2
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_GCC_RUNTIME= yes 14USE_GCC_RUNTIME= yes
15 15
16WRKSRC= ${WRKDIR}/${DISTNAME}/python 16WRKSRC= ${WRKDIR}/${DISTNAME}/python
cvs diff -r1.30 -r1.30.8.1 pkgsrc/textproc/py-libxml2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/py-libxml2/Attic/distinfo 2013/10/03 07:52:32 1.30
+++ pkgsrc/textproc/py-libxml2/Attic/distinfo 2014/11/03 19:39:08 1.30.8.1
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.30 2013/10/03 07:52:32 prlw1 Exp $ 1$NetBSD: distinfo,v 1.30.8.1 2014/11/03 19:39:08 tron Exp $
2 2
3SHA1 (libxml2-2.9.1.tar.gz) = eb3e2146c6d68aea5c2a4422ed76fe196f933c21 3SHA1 (libxml2-2.9.2.tar.gz) = f46a37ea6d869f702e03f393c376760f3cbee673
4RMD160 (libxml2-2.9.1.tar.gz) = 257285d9ac070ed9f58666b7bd7c4653651c871b 4RMD160 (libxml2-2.9.2.tar.gz) = 969b4ed8782f455fd4a6ca1c1b4ffa7651090070
5Size (libxml2-2.9.1.tar.gz) = 5172503 bytes 5Size (libxml2-2.9.2.tar.gz) = 5444991 bytes
6SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b 6SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b
7SHA1 (patch-ab) = 793db9f20df8bba2fbee61abf4239a879c182aa7 7SHA1 (patch-ab) = fcf0c129f6c6a563806882271d16f57c1bc61d54
8SHA1 (patch-ac) = b2e8fac8221ae9fb00b3de33441dd83cd7422204 8SHA1 (patch-ac) = 4d14006810239491ecda6967dee2087eb382ba08
9SHA1 (patch-drv_libxml2.py) = 95b8b71bb619c25f092019a0f950b4416cd80738 
cvs diff -r1.2 -r1.2.8.1 pkgsrc/textproc/py-libxml2/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/py-libxml2/patches/Attic/patch-ab 2013/10/03 07:52:32 1.2
+++ pkgsrc/textproc/py-libxml2/patches/Attic/patch-ab 2014/11/03 19:39:08 1.2.8.1
@@ -1,190 +1,18 @@ @@ -1,190 +1,18 @@
1$NetBSD: patch-ab,v 1.2 2013/10/03 07:52:32 prlw1 Exp $ 1$NetBSD: patch-ab,v 1.2.8.1 2014/11/03 19:39:08 tron Exp $
2 2
3- Fix build under Mac OS X (reorder os.path.join(ROOT,'include') ) 3- Fix build under Mac OS X (reorder os.path.join(ROOT,'include') )
4- White space changes for python 3 indentation (commit 4b61cf61) 
5 4
6--- setup.py.orig 2013-10-02 21:20:43.000000000 +0000 5--- setup.py.orig 2014-10-16 07:35:21.000000000 +0000
7+++ setup.py 6+++ setup.py
8@@ -6,14 +6,14 @@ import sys, os 7@@ -56,10 +56,10 @@ else:
9 from distutils.core import setup, Extension 8 # - iconv.h
10  
11 # Below ROOT, we expect to find include, include/libxml2, lib and bin. 
12-# On *nix, it is not needed (but should not harm),  
13+# On *nix, it is not needed (but should not harm), 
14 # on Windows, it is set by configure.js. 
15-ROOT = r'/usr'  
16+ROOT = r'/usr' 
17  
18 # Thread-enabled libxml2 
19 with_threads = 1 
20  
21-# If this flag is set (windows only),  
22+# If this flag is set (windows only), 
23 # a private copy of the dlls are included in the package. 
24 # If this flag is not set, the libxml2 and libxslt 
25 # dlls must be found somewhere in the PATH at runtime. 
26@@ -51,15 +51,15 @@ else: 
27 libraryPrefix = '' 
28 platformLibs = ["m","z"] 
29  
30-# those are examined to find  
31+# those are examined to find 
32 # - libxml2/libxml/tree.h 
33-# - iconv.h  
34+# - iconv.h 
35 # - libxslt/xsltconfig.h 9 # - libxslt/xsltconfig.h
36 includes_dir = [ 10 includes_dir = [
37+os.path.join(ROOT,'include'), 11+os.path.join(ROOT,'include'),
38 "/usr/include", 12 "/usr/include",
39 "/usr/local/include", 13 "/usr/local/include",
40 "/opt/include", 14 "/opt/include",
41-os.path.join(ROOT,'include'), 15-os.path.join(ROOT,'include'),
42 HOME 16 HOME
43 ]; 17 ];
44  18
45@@ -67,7 +67,7 @@ xml_includes="" 
46 for dir in includes_dir: 
47 if not missing(dir + "/libxml2/libxml/tree.h"): 
48 xml_includes=dir + "/libxml2" 
49- break; 
50+ break; 
51  
52 if xml_includes == "": 
53 print("failed to find headers for libxml2: update includes_dir") 
54@@ -77,7 +77,7 @@ iconv_includes="" 
55 for dir in includes_dir: 
56 if not missing(dir + "/iconv.h"): 
57 iconv_includes=dir 
58- break; 
59+ break; 
60  
61 if iconv_includes == "": 
62 print("failed to find headers for libiconv: update includes_dir") 
63@@ -90,22 +90,22 @@ os.path.join(ROOT,'lib'), 
64  
65 xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", 
66 "libxml.c", "libxml.py", "libxml_wrap.h", "types.c", 
67- "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] 
68+ "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] 
69  
70 xslt_files = ["libxslt-api.xml", "libxslt-python-api.xml", 
71 "libxslt.c", "libxsl.py", "libxslt_wrap.h", 
72- "xsltgenerator.py"] 
73+ "xsltgenerator.py"] 
74  
75 if missing("libxml2-py.c") or missing("libxml2.py"): 
76 try: 
77- try: 
78- import xmlgenerator 
79- except: 
80- import generator 
81+ try: 
82+ import xmlgenerator 
83+ except: 
84+ import generator 
85 except: 
86- print("failed to find and generate stubs for libxml2, aborting ...") 
87- print(sys.exc_info()[0], sys.exc_info()[1]) 
88- sys.exit(1) 
89+ print("failed to find and generate stubs for libxml2, aborting ...") 
90+ print(sys.exc_info()[0], sys.exc_info()[1]) 
91+ sys.exit(1) 
92  
93 head = open("libxml.py", "r") 
94 generated = open("libxml2class.py", "r") 
95@@ -116,7 +116,7 @@ if missing("libxml2-py.c") or missing("l 
96 else: 
97 result.write(line) 
98 for line in generated.readlines(): 
99- result.write(line) 
100+ result.write(line) 
101 head.close() 
102 generated.close() 
103 result.close() 
104@@ -126,39 +126,39 @@ if missing("libxslt-py.c") or missing("l 
105 if missing("xsltgenerator.py") or missing("libxslt-api.xml"): 
106 print("libxslt stub generator not found, libxslt not built") 
107 else: 
108- try: 
109- import xsltgenerator 
110- except: 
111- print("failed to generate stubs for libxslt, aborting ...") 
112- print(sys.exc_info()[0], sys.exc_info()[1]) 
113- else: 
114- head = open("libxsl.py", "r") 
115- generated = open("libxsltclass.py", "r") 
116- result = open("libxslt.py", "w") 
117- for line in head.readlines(): 
118+ try: 
119+ import xsltgenerator 
120+ except: 
121+ print("failed to generate stubs for libxslt, aborting ...") 
122+ print(sys.exc_info()[0], sys.exc_info()[1]) 
123+ else: 
124+ head = open("libxsl.py", "r") 
125+ generated = open("libxsltclass.py", "r") 
126+ result = open("libxslt.py", "w") 
127+ for line in head.readlines(): 
128 if WITHDLLS: 
129 result.write(altImport(line)) 
130 else: 
131 result.write(line) 
132- for line in generated.readlines(): 
133- result.write(line) 
134- head.close() 
135- generated.close() 
136- result.close() 
137- with_xslt=1 
138+ for line in generated.readlines(): 
139+ result.write(line) 
140+ head.close() 
141+ generated.close() 
142+ result.close() 
143+ with_xslt=1 
144 else: 
145 with_xslt=1 
146  
147 if with_xslt == 1: 
148 xslt_includes="" 
149 for dir in includes_dir: 
150- if not missing(dir + "/libxslt/xsltconfig.h"): 
151- xslt_includes=dir + "/libxslt" 
152- break; 
153+ if not missing(dir + "/libxslt/xsltconfig.h"): 
154+ xslt_includes=dir + "/libxslt" 
155+ break; 
156  
157 if xslt_includes == "": 
158- print("failed to find headers for libxslt: update includes_dir") 
159- with_xslt = 0 
160+ print("failed to find headers for libxslt: update includes_dir") 
161+ with_xslt = 0 
162  
163  
164 descr = "libxml2 package" 
165@@ -194,11 +194,11 @@ if with_xslt == 1: 
166  
167  
168 extens=[Extension('libxml2mod', c_files, include_dirs=includes, 
169- library_dirs=libdirs,  
170- libraries=libs, define_macros=macros)]  
171+ library_dirs=libdirs, 
172+ libraries=libs, define_macros=macros)] 
173 if with_xslt == 1: 
174 extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes, 
175- library_dirs=libdirs,  
176+ library_dirs=libdirs, 
177 libraries=libs, define_macros=macros)) 
178  
179 if missing("MANIFEST"): 
180@@ -208,8 +208,8 @@ if missing("MANIFEST"): 
181 for file in xml_files: 
182 manifest.write(file + "\n") 
183 if with_xslt == 1: 
184- for file in xslt_files: 
185- manifest.write(file + "\n") 
186+ for file in xslt_files: 
187+ manifest.write(file + "\n") 
188 manifest.close() 
189  
190 if WITHDLLS: 
cvs diff -r1.1 -r1.1.12.1 pkgsrc/textproc/py-libxml2/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/textproc/py-libxml2/patches/Attic/patch-ac 2013/05/28 22:26:13 1.1
+++ pkgsrc/textproc/py-libxml2/patches/Attic/patch-ac 2014/11/03 19:39:08 1.1.12.1
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ac,v 1.1 2013/05/28 22:26:13 drochner Exp $ 1$NetBSD: patch-ac,v 1.1.12.1 2014/11/03 19:39:08 tron Exp $
2 2
3fix for Python-2.6 3fix for Python-2.6
4 4
5--- libxml_wrap.h.orig 2013-04-02 02:25:28.000000000 +0000 5--- libxml_wrap.h.orig 2014-10-03 09:00:54.000000000 +0000
6+++ libxml_wrap.h 6+++ libxml_wrap.h
7@@ -28,7 +28,6 @@ 7@@ -28,7 +28,6 @@
8 * and don't use Capsule but CObjects 8 * and don't use Capsule but CObjects
9 */ 9 */
10 #if PY_VERSION_HEX < 0x02070000 10 #if PY_VERSION_HEX < 0x02070000
11-#ifndef PyBytes_Check 11-#ifndef PyBytes_Check
12 #define PyBytes_Check PyString_Check 12 #define PyBytes_Check PyString_Check
13 #define PyBytes_Size PyString_Size 13 #define PyBytes_Size PyString_Size
14 #define PyBytes_AsString PyString_AsString 14 #define PyBytes_AsString PyString_AsString
15@@ -40,7 +39,6 @@ 15@@ -40,7 +39,6 @@
 16 #define PyCapsule_CheckExact PyCObject_Check
16 #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o)) 17 #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
17  
18 #endif 18 #endif
19-#endif 19-#endif
20  20
21 /** 21 /**
22 * ATTRIBUTE_UNUSED: 22 * ATTRIBUTE_UNUSED:
File Deleted: pkgsrc/textproc/py-libxml2/patches/Attic/patch-drv_libxml2.py