[Midnightbsd-cvs] mports [18044] trunk/textproc/libxml2: libxml 2.9.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Mar 5 20:38:12 EST 2015
Revision: 18044
http://svnweb.midnightbsd.org/mports/?rev=18044
Author: laffer1
Date: 2015-03-05 20:38:11 -0500 (Thu, 05 Mar 2015)
Log Message:
-----------
libxml 2.9.2
Modified Paths:
--------------
trunk/textproc/libxml2/Makefile
trunk/textproc/libxml2/distinfo
trunk/textproc/libxml2/files/patch-Makefile.in
trunk/textproc/libxml2/files/patch-parser.c
trunk/textproc/libxml2/pkg-plist
Added Paths:
-----------
trunk/textproc/libxml2/files/patch-uri.c
Removed Paths:
-------------
trunk/textproc/libxml2/files/patch-python_drv-libxml2.py
trunk/textproc/libxml2/files/patch-python_setup.py.in
Modified: trunk/textproc/libxml2/Makefile
===================================================================
--- trunk/textproc/libxml2/Makefile 2015-03-06 01:31:21 UTC (rev 18043)
+++ trunk/textproc/libxml2/Makefile 2015-03-06 01:38:11 UTC (rev 18044)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= libxml2
-PORTVERSION= 2.9.1
-PORTREVISION?= 1
+PORTVERSION= 2.9.2
+PORTREVISION?= 0
CATEGORIES?= textproc gnome
MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
http://xmlsoft.org/sources/ \
@@ -17,7 +17,7 @@
.if !defined(REFERENCE_PORT)
GNU_CONFIGURE= yes
-USES= gmake iconv libtool:keepla pathfix pkgconfig shebangfix
+USES= gmake iconv libtool pathfix pkgconfig shebangfix
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
--with-html-dir=${PREFIX}/share/doc \
Modified: trunk/textproc/libxml2/distinfo
===================================================================
--- trunk/textproc/libxml2/distinfo 2015-03-06 01:31:21 UTC (rev 18043)
+++ trunk/textproc/libxml2/distinfo 2015-03-06 01:38:11 UTC (rev 18044)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libxml2-2.9.1.tar.gz) = fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb
-SIZE (gnome2/libxml2-2.9.1.tar.gz) = 5172503
+SHA256 (gnome2/libxml2-2.9.2.tar.gz) = 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc
+SIZE (gnome2/libxml2-2.9.2.tar.gz) = 5444991
Modified: trunk/textproc/libxml2/files/patch-Makefile.in
===================================================================
--- trunk/textproc/libxml2/files/patch-Makefile.in 2015-03-06 01:31:21 UTC (rev 18043)
+++ trunk/textproc/libxml2/files/patch-Makefile.in 2015-03-06 01:38:11 UTC (rev 18044)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2013-11-24 09:26:25.000000000 +0100
-+++ Makefile.in 2013-11-24 09:26:37.000000000 +0100
-@@ -1130,7 +1130,7 @@
+--- Makefile.in.orig 2014-10-17 20:26:52.547793054 +0200
++++ Makefile.in 2014-10-17 20:27:34.868791352 +0200
+@@ -1234,7 +1234,7 @@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@@ -9,7 +9,7 @@
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@@ -1635,7 +1635,7 @@
+@@ -1712,7 +1712,7 @@
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
@@ -18,12 +18,12 @@
config.h
install-binPROGRAMS: install-libLTLIBRARIES
-@@ -1703,7 +1703,7 @@
+@@ -1780,7 +1780,7 @@
info-am:
--install-data-am: install-data-local install-m4dataDATA install-man \
-+install-data-am: install-m4dataDATA install-man \
- install-pkgconfigDATA
+-install-data-am: install-cmakeDATA install-data-local \
++install-data-am: install-cmakeDATA \
+ install-m4dataDATA install-man install-pkgconfigDATA
install-dvi: install-dvi-recursive
Modified: trunk/textproc/libxml2/files/patch-parser.c
===================================================================
--- trunk/textproc/libxml2/files/patch-parser.c 2015-03-06 01:31:21 UTC (rev 18043)
+++ trunk/textproc/libxml2/files/patch-parser.c 2015-03-06 01:38:11 UTC (rev 18044)
@@ -1,38 +1,45 @@
-CVE-2014-0191
-
-From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001
+From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
-Date: Tue, 22 Apr 2014 15:30:56 +0800
-Subject: Do not fetch external parameter entities
+Date: Thu, 23 Oct 2014 11:35:36 +0800
+Subject: Fix missing entities after CVE-2014-3660 fix
-Unless explicitely asked for when validating or replacing entities
-with their value. Problem pointed out by Daniel Berrange <berrange at redhat.com>
+For https://bugzilla.gnome.org/show_bug.cgi?id=738805
-diff --git a/parser.c b/parser.c
-index 9347ac9..c0dea05 100644
---- parser.c
-+++ parser.c
-@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
- xmlCharEncoding enc;
-
- /*
-+ * Note: external parsed entities will not be loaded, it is
-+ * not required for a non-validating parser, unless the
-+ * option of validating, or substituting entities were
-+ * given. Doing so is far more secure as the parser will
-+ * only process data coming from the document entity by
-+ * default.
-+ */
-+ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
-+ ((ctxt->options & XML_PARSE_NOENT) == 0) &&
-+ ((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
-+ (ctxt->validate == 0))
-+ return;
-+
-+ /*
- * handle the extra spaces added before and after
- * c.f. http://www.w3.org/TR/REC-xml#as-PE
- * this is done independently.
---
-cgit v0.10.1
+The fix for CVE-2014-3660 introduced a regression in some case
+where entity substitution is required and the entity is used
+first in anotther entity referenced from an attribute value
+---
+
+From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Thu, 16 Oct 2014 19:10:59 +0200
+Subject: [PATCH] Revert "Missing initialization for the catalog module"
+
+It's not correct to always load the default catalog.
+https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+
+This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
+
+--- parser.c.orig 2014-10-29 14:28:43.755327730 +0100
++++ parser.c 2014-10-29 14:28:55.287325756 +0100
+@@ -7235,7 +7235,8 @@
+ * 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 @@
+ #ifdef LIBXML_XPATH_ENABLED
+ xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+- xmlInitializeCatalog();
+-#endif
+ xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+ }
Deleted: trunk/textproc/libxml2/files/patch-python_drv-libxml2.py
===================================================================
--- trunk/textproc/libxml2/files/patch-python_drv-libxml2.py 2015-03-06 01:31:21 UTC (rev 18043)
+++ trunk/textproc/libxml2/files/patch-python_drv-libxml2.py 2015-03-06 01:38:11 UTC (rev 18044)
@@ -1,46 +0,0 @@
-From 6c9c611beed57f001ca3ae6b964518d9c7336a69 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino at gentoo.org>
-Date: Thu, 11 Jul 2013 03:00:54 +0000
-Subject: python: fix drv_libxml2.py for python3 compatibility
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703979
----
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index e43fb1d..c9075e6 100644
---- python/drv_libxml2.py
-+++ python/drv_libxml2.py
-@@ -34,12 +34,20 @@ TODO
-
- """
-
--__author__ = u"St\xE9phane Bidoul <sbi at skynet.be>"
-+__author__ = "St\xE9phane Bidoul <sbi at skynet.be>"
- __version__ = "0.3"
-
-+import sys
- import codecs
--from types import StringType, UnicodeType
--StringTypes = (StringType,UnicodeType)
-+
-+if sys.version < "3":
-+ __author__ = codecs.unicode_escape_decode(__author__)[0]
-+
-+ from types import StringType, UnicodeType
-+ StringTypes = (StringType,UnicodeType)
-+
-+else:
-+ StringTypes = (str)
-
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -65,7 +73,7 @@ def _d(s):
-
- try:
- import libxml2
--except ImportError, e:
-+except ImportError as e:
- raise SAXReaderNotAvailable("libxml2 not available: " \
- "import error was: %s" % e)
-
---
-cgit v0.9.2
Deleted: trunk/textproc/libxml2/files/patch-python_setup.py.in
===================================================================
--- trunk/textproc/libxml2/files/patch-python_setup.py.in 2015-03-06 01:31:21 UTC (rev 18043)
+++ trunk/textproc/libxml2/files/patch-python_setup.py.in 2015-03-06 01:38:11 UTC (rev 18044)
@@ -1,142 +0,0 @@
---- python/setup.py.in.orig 2014-03-24 21:27:16.000000000 +0100
-+++ python/setup.py.in 2014-03-24 21:31:10.000000000 +0100
-@@ -67,7 +67,7 @@
- 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 @@
- 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 @@
-
- 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 @@
- 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("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"
-@@ -198,7 +198,7 @@
- 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 @@
- 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:
Added: trunk/textproc/libxml2/files/patch-uri.c
===================================================================
--- trunk/textproc/libxml2/files/patch-uri.c (rev 0)
+++ trunk/textproc/libxml2/files/patch-uri.c 2015-03-06 01:38:11 UTC (rev 18044)
@@ -0,0 +1,25 @@
+Revert the following commit, it makes the freebsd doc chain fail.
+
+From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001
+From: Dennis Filder <d.filder at web.de>
+Date: Fri, 13 Jun 2014 14:56:14 +0800
+Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=731063
+
+xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns
+bogus values when called with URIs that have rootless paths
+(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
+correct)
+
+--- uri.c.orig 2014-10-03 13:28:06.000000000 +0200
++++ uri.c 2014-10-20 14:22:57.677231158 +0200
+@@ -1198,6 +1198,8 @@
+ if (temp == NULL) goto mem_error;
+ ret = temp;
+ }
++ ret[len++] = '/';
++ ret[len++] = '/';
+ }
+ if (uri->path != NULL) {
+ p = uri->path;
Property changes on: trunk/textproc/libxml2/files/patch-uri.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/libxml2/pkg-plist
===================================================================
--- trunk/textproc/libxml2/pkg-plist 2015-03-06 01:31:21 UTC (rev 18043)
+++ trunk/textproc/libxml2/pkg-plist 2015-03-06 01:38:11 UTC (rev 18044)
@@ -48,10 +48,11 @@
include/libxml2/libxml/xpath.h
include/libxml2/libxml/xpathInternals.h
include/libxml2/libxml/xpointer.h
+lib/cmake/libxml2/libxml2-config.cmake
lib/libxml2.a
-lib/libxml2.la
lib/libxml2.so
-lib/libxml2.so.11
+lib/libxml2.so.2
+lib/libxml2.so.%%LIBVERSION%%
lib/xml2Conf.sh
libdata/pkgconfig/libxml-2.0.pc
share/aclocal/libxml.m4
@@ -59,5 +60,3 @@
man/man1/xmlcatalog.1.gz
man/man1/xmllint.1.gz
man/man3/libxml.3.gz
- at dirrm include/libxml2/libxml
- at dirrm include/libxml2
More information about the Midnightbsd-cvs
mailing list