head 1.5; access; symbols pkgsrc-2017Q3:1.4.0.18 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.14 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.12 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.10 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.8 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.6 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.4 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.2 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.3.0.8 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.6 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.4 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.2 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.2.0.8 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.6 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.4 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.2 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.1.0.54 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.52 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.50 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.48 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.46 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.44 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.42 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.40 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.38 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.36 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.34 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.32 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.30 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.28 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.26 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.24 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.22 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.20 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.18 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.16 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.14 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.12 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.10 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.8 pkgsrc-2008Q1:1.1.0.6 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.4 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.2 pkgsrc-2007Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2017.10.31.13.15.44; author fhajny; state dead; branches; next 1.4; commitid o0VaumEqA6yyPcdA; 1.4 date 2015.10.23.20.01.08; author tnn; state Exp; branches; next 1.3; commitid mrIXoF783UM4QgGy; 1.3 date 2014.10.20.19.11.23; author drochner; state Exp; branches; next 1.2; commitid MxG1cM7mhLi5pYUx; 1.2 date 2013.10.03.07.52.32; author prlw1; state Exp; branches 1.2.8.1; next 1.1; commitid EbiKGSsWImZwVO7x; 1.1 date 2007.07.16.13.24.32; author jmmv; state Exp; branches; next ; 1.2.8.1 date 2014.11.03.19.39.08; author tron; state Exp; branches; next ; commitid ToRe6fvmovhN6MWx; desc @@ 1.5 log @textproc/*libxml2: Move patches and distinfo files under the main package since the distfile is just one anyway. @ text @$NetBSD: patch-ab,v 1.4 2015/10/23 20:01:08 tnn Exp $ Trust pkgsrc to know which iconv to use. It will be either in the buildlink directory, or in the compiler's default search path. --- setup.py.orig 2014-10-16 07:35:21.000000000 +0000 +++ setup.py @@@@ -56,11 +56,7 @@@@ else: # - iconv.h # - libxslt/xsltconfig.h includes_dir = [ -"/usr/include", -"/usr/local/include", -"/opt/include", -os.path.join(ROOT,'include'), -HOME +os.path.join(ROOT,'include') ]; xml_includes="" @@@@ -73,11 +69,7 @@@@ if xml_includes == "": print("failed to find headers for libxml2: update includes_dir") sys.exit(1) -iconv_includes="" -for dir in includes_dir: - if not missing(dir + "/iconv.h"): - iconv_includes=dir - break; +iconv_includes=os.path.join(ROOT,'include') if iconv_includes == "": print("failed to find headers for libiconv: update includes_dir") @ 1.4 log @Fix packages' broken iconv.h detection by removing it. Have faith in that that pkgsrc will provide the correct iconv.h to use in either the buildlink directory or otherwise in the compiler's default search path. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @sync w/ base pkg @ text @d3 3 a5 1 - Fix build under Mac OS X (reorder os.path.join(ROOT,'include') ) d9 1 a9 1 @@@@ -56,10 +56,10 @@@@ else: d13 3 a15 4 +os.path.join(ROOT,'include'), "/usr/include", "/usr/local/include", "/opt/include", d17 2 a18 1 HOME d21 14 @ 1.2 log @Enable Python 3 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2007/07/16 13:24:32 jmmv Exp $ a3 1 - White space changes for python 3 indentation (commit 4b61cf61) d5 1 a5 1 --- setup.py.orig 2013-10-02 21:20:43.000000000 +0000 d7 2 a8 27 @@@@ -6,14 +6,14 @@@@ import sys, os from distutils.core import setup, Extension # Below ROOT, we expect to find include, include/libxml2, lib and bin. -# On *nix, it is not needed (but should not harm), +# On *nix, it is not needed (but should not harm), # on Windows, it is set by configure.js. -ROOT = r'/usr' +ROOT = r'/usr' # Thread-enabled libxml2 with_threads = 1 -# If this flag is set (windows only), +# If this flag is set (windows only), # a private copy of the dlls are included in the package. # If this flag is not set, the libxml2 and libxslt # dlls must be found somewhere in the PATH at runtime. @@@@ -51,15 +51,15 @@@@ else: libraryPrefix = '' platformLibs = ["m","z"] -# those are examined to find +# those are examined to find # - libxml2/libxml/tree.h -# - iconv.h +# - iconv.h a18 146 @@@@ -67,7 +67,7 @@@@ xml_includes="" for dir in includes_dir: if not missing(dir + "/libxml2/libxml/tree.h"): xml_includes=dir + "/libxml2" - break; + break; if xml_includes == "": print("failed to find headers for libxml2: update includes_dir") @@@@ -77,7 +77,7 @@@@ iconv_includes="" for dir in includes_dir: if not missing(dir + "/iconv.h"): iconv_includes=dir - break; + break; if iconv_includes == "": print("failed to find headers for libiconv: update includes_dir") @@@@ -90,22 +90,22 @@@@ os.path.join(ROOT,'lib'), xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", "libxml.c", "libxml.py", "libxml_wrap.h", "types.c", - "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] + "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] xslt_files = ["libxslt-api.xml", "libxslt-python-api.xml", "libxslt.c", "libxsl.py", "libxslt_wrap.h", - "xsltgenerator.py"] + "xsltgenerator.py"] if missing("libxml2-py.c") or missing("libxml2.py"): try: - try: - import xmlgenerator - except: - import generator + try: + import xmlgenerator + except: + import generator except: - print("failed to find and generate stubs for libxml2, aborting ...") - print(sys.exc_info()[0], sys.exc_info()[1]) - sys.exit(1) + print("failed to find and generate stubs for libxml2, aborting ...") + print(sys.exc_info()[0], sys.exc_info()[1]) + sys.exit(1) head = open("libxml.py", "r") generated = open("libxml2class.py", "r") @@@@ -116,7 +116,7 @@@@ if missing("libxml2-py.c") or missing("l else: result.write(line) for line in generated.readlines(): - result.write(line) + result.write(line) head.close() generated.close() result.close() @@@@ -126,39 +126,39 @@@@ if missing("libxslt-py.c") or missing("l if missing("xsltgenerator.py") or missing("libxslt-api.xml"): print("libxslt stub generator not found, libxslt not built") else: - try: - import xsltgenerator - except: - print("failed to generate stubs for libxslt, aborting ...") - print(sys.exc_info()[0], sys.exc_info()[1]) - else: - head = open("libxsl.py", "r") - generated = open("libxsltclass.py", "r") - result = open("libxslt.py", "w") - for line in head.readlines(): + try: + import xsltgenerator + except: + print("failed to generate stubs for libxslt, aborting ...") + print(sys.exc_info()[0], sys.exc_info()[1]) + else: + head = open("libxsl.py", "r") + generated = open("libxsltclass.py", "r") + result = open("libxslt.py", "w") + for line in head.readlines(): if WITHDLLS: result.write(altImport(line)) else: result.write(line) - for line in generated.readlines(): - result.write(line) - head.close() - generated.close() - result.close() - with_xslt=1 + for line in generated.readlines(): + result.write(line) + head.close() + generated.close() + result.close() + with_xslt=1 else: with_xslt=1 if with_xslt == 1: xslt_includes="" for dir in includes_dir: - if not missing(dir + "/libxslt/xsltconfig.h"): - xslt_includes=dir + "/libxslt" - break; + if not missing(dir + "/libxslt/xsltconfig.h"): + xslt_includes=dir + "/libxslt" + break; if xslt_includes == "": - print("failed to find headers for libxslt: update includes_dir") - with_xslt = 0 + print("failed to find headers for libxslt: update includes_dir") + with_xslt = 0 descr = "libxml2 package" @@@@ -194,11 +194,11 @@@@ if with_xslt == 1: extens=[Extension('libxml2mod', c_files, include_dirs=includes, - library_dirs=libdirs, - libraries=libs, define_macros=macros)] + library_dirs=libdirs, + libraries=libs, define_macros=macros)] if with_xslt == 1: extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes, - library_dirs=libdirs, + library_dirs=libdirs, libraries=libs, define_macros=macros)) if missing("MANIFEST"): @@@@ -208,8 +208,8 @@@@ if missing("MANIFEST"): for file in xml_files: manifest.write(file + "\n") if with_xslt == 1: - for file in xslt_files: - manifest.write(file + "\n") + for file in xslt_files: + manifest.write(file + "\n") manifest.close() if WITHDLLS: @ 1.2.8.1 log @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 @ text @d1 1 a1 1 $NetBSD$ d4 1 d6 1 a6 1 --- setup.py.orig 2014-10-16 07:35:21.000000000 +0000 d8 27 a34 2 @@@@ -56,10 +56,10 @@@@ else: # - iconv.h d45 146 @ 1.1 log @Fix build under Mac OS X (and supposedly in any other which provides libxml2 natively). @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 1 --- setup.py.orig 2007-06-12 18:20:40.000000000 +0200 d8 27 a34 2 @@@@ -56,10 +56,10 @@@@ else: # - iconv.h d45 146 @