diff options
Diffstat (limited to 'dev-libs/libxml2/files')
24 files changed, 0 insertions, 1298 deletions
diff --git a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch b/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch deleted file mode 100644 index 25ea4783..00000000 --- a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- catalog.c -+++ catalog.c -@@ -68,10 +68,10 @@ - #define XML_URN_PUBID "urn:publicid:" - #define XML_CATAL_BREAK ((xmlChar *) -1) - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" - #endif - #ifndef XML_SGML_DEFAULT_CATALOG --#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog" -+#define XML_SGML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" - #endif - - #if defined(_WIN32) && defined(_MSC_VER) -@@ -76,7 +76,7 @@ - - #if defined(_WIN32) && defined(_MSC_VER) - #undef XML_XML_DEFAULT_CATALOG --static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog"; -+static char XML_XML_DEFAULT_CATALOG[256] = "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"; - #if defined(_WIN32_WCE) - /* Windows CE don't have a A variant */ - #define GetModuleHandleA GetModuleHandle ---- xmlcatalog.c -+++ xmlcatalog.c -@@ -43,7 +43,7 @@ - - - #ifndef XML_SGML_DEFAULT_CATALOG --#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog" -+#define XML_SGML_DEFAULT_CATALOG "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" - #endif - - /************************************************************************ ---- runtest.c -+++ runtest.c -@@ -2747,7 +2747,7 @@ - */ - static int - uripMatch(const char * URI) { -- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) -+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) - return(0); - /* Verify we received the escaped URL */ - if (strcmp(urip_rcvsURLs[urip_current], URI)) -@@ -2766,7 +2766,7 @@ - */ - static void * - uripOpen(const char * URI) { -- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) -+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) - return(NULL); - /* Verify we received the escaped URL */ - if (strcmp(urip_rcvsURLs[urip_current], URI)) ---- xmllint.c -+++ xmllint.c -@@ -103,7 +103,7 @@ - #endif - - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" - #endif - - typedef enum { diff --git a/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch b/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch deleted file mode 100644 index be9cfee0..00000000 --- a/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a36fbe3b3e001a8a840b5c1fdd81cefc9947f0d Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Mon, 29 Oct 2012 10:39:55 +0800 -Subject: [PATCH] Fix potential out of bound access - ---- - parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index 0d8d7f2..bd634e9 100644 ---- a/parser.c -+++ b/parser.c -@@ -4076,7 +4076,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { - goto error; - - if ((in_space) && (normalize)) { -- while (buf[len - 1] == 0x20) len--; -+ while ((len > 0) && (buf[len - 1] == 0x20)) len--; - } - buf[len] = 0; - if (RAW == '<') { --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch b/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch deleted file mode 100644 index cce3ecb0..00000000 --- a/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 168e20836fe9614dd2dd4b42006c17a783f11c48 Mon Sep 17 00:00:00 2001 -From: Markus Duft <mduft@gentoo.org> -Date: Thu, 20 Nov 2008 11:04:33 -0500 -Subject: [PATCH] Fix for ~x86-winnt - -[Alexandre Rostovtsev <tetromino@gentoo.org>: port to 2.8.0-rc1] ---- - dict.c | 2 +- - include/wsockcompat.h | 2 +- - nanohttp.c | 2 +- - xmlIO.c | 4 ++++ - 4 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/dict.c b/dict.c -index 3579f64..71e7bc6 100644 ---- a/dict.c -+++ b/dict.c -@@ -47,7 +47,7 @@ - #else - #ifdef HAVE_INTTYPES_H - #include <inttypes.h> --#elif defined(WIN32) -+#elif defined(WIN32) || defined (__PARITY__) - typedef unsigned __int32 uint32_t; - #endif - #endif -diff --git a/include/wsockcompat.h b/include/wsockcompat.h -index c762a64..1ed822b 100644 ---- a/include/wsockcompat.h -+++ b/include/wsockcompat.h -@@ -27,7 +27,7 @@ - #endif - #endif - --#if defined( __MINGW32__ ) || defined( _MSC_VER ) -+#if defined( __MINGW32__ ) || defined( _MSC_VER ) || defined(__PARITY__) - /* Include <errno.h> here to ensure that it doesn't get included later - * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */ - #include <errno.h> -diff --git a/nanohttp.c b/nanohttp.c -index 2437fed..dbe97a7 100644 ---- a/nanohttp.c -+++ b/nanohttp.c -@@ -74,7 +74,7 @@ - #define XML_SOCKLEN_T unsigned int - #endif - --#if defined(__MINGW32__) || defined(_WIN32_WCE) -+#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(__PARITY__) - #ifndef _WINSOCKAPI_ - #define _WINSOCKAPI_ - #endif -diff --git a/xmlIO.c b/xmlIO.c -index 73a995d..99562f6 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -47,6 +47,7 @@ - #include <winnls.h> /* for CP_UTF8 */ - #endif - -+#ifndef __PARITY__ - /* Figure a portable way to know if a file is a directory. */ - #ifndef HAVE_STAT - # ifdef HAVE__STAT -@@ -82,6 +83,7 @@ - # endif - # endif - #endif -+#endif /* __PARITY__ */ - - #include <libxml/xmlmemory.h> - #include <libxml/parser.h> -@@ -657,6 +659,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info) - { - #ifdef HAVE_STAT - int retval = -1; -+#ifndef __PARITY__ - wchar_t *wPath; - - wPath = __xmlIOWin32UTF8ToWChar(path); -@@ -665,6 +668,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info) - retval = _wstat(wPath,info); - xmlFree(wPath); - } -+#endif - /* maybe path in native encoding */ - if(retval < 0) - retval = stat(path,info); --- -1.7.8.6 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch b/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch deleted file mode 100644 index a7a8215d..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/python/Makefile.am b/python/Makefile.am -index 4a8b5d5..b976893 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -19,13 +19,14 @@ if WITH_PYTHON - AM_CPPFLAGS = \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ -- -I$(PYTHON_INCLUDES) -+ -I$(PYTHON_INCLUDES) \ -+ -shared - - python_LTLIBRARIES = libxml2mod.la - - libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c - libxml2mod_la_LIBADD = $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) -lpython$(PYTHON_VERSION) --libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -+libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -shared - - BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch b/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch deleted file mode 100644 index d7ff539d..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 23f05e0c33987d6605387b300c4be5da2120a7ab Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Tue, 19 Feb 2013 10:21:49 +0800 -Subject: [PATCH] Detect excessive entities expansion upon replacement - -If entities expansion in the XML parser is asked for, -it is possble to craft relatively small input document leading -to excessive on-the-fly content generation. -This patch accounts for those replacement and stop parsing -after a given threshold. it can be bypassed as usual with the -HUGE parser option. ---- - include/libxml/parser.h | 1 + - parser.c | 44 ++++++++++++++++++++++++++++++++++++++------ - parserInternals.c | 2 ++ - 3 files changed, 41 insertions(+), 6 deletions(-) - -diff --git a/include/libxml/parser.h b/include/libxml/parser.h -index e1346e4..3f5730d 100644 ---- a/include/libxml/parser.h -+++ b/include/libxml/parser.h -@@ -310,6 +310,7 @@ struct _xmlParserCtxt { - xmlParserNodeInfo *nodeInfoTab; /* array of nodeInfos */ - - int input_id; /* we need to label inputs */ -+ unsigned long sizeentcopy; /* volume of entity copy */ - }; - - /** -diff --git a/parser.c b/parser.c -index 91f8c90..ddf3b5b 100644 ---- a/parser.c -+++ b/parser.c -@@ -122,7 +122,7 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID, - */ - static int - xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, -- xmlEntityPtr ent) -+ xmlEntityPtr ent, size_t replacement) - { - size_t consumed = 0; - -@@ -130,7 +130,24 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, - return (0); - if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) - return (1); -- if (size != 0) { -+ if (replacement != 0) { -+ if (replacement < XML_MAX_TEXT_LENGTH) -+ return(0); -+ -+ /* -+ * If the volume of entity copy reaches 10 times the -+ * amount of parsed data and over the large text threshold -+ * then that's very likely to be an abuse. -+ */ -+ if (ctxt->input != NULL) { -+ consumed = ctxt->input->consumed + -+ (ctxt->input->cur - ctxt->input->base); -+ } -+ consumed += ctxt->sizeentities; -+ -+ if (replacement < XML_PARSER_NON_LINEAR * consumed) -+ return(0); -+ } else if (size != 0) { - /* - * Do the check based on the replacement size of the entity - */ -@@ -176,7 +193,6 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, - */ - return (0); - } -- - xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); - return (1); - } -@@ -2743,7 +2759,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - while (*current != 0) { /* non input consuming loop */ - buffer[nbchars++] = *current++; - if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { -- if (xmlParserEntityCheck(ctxt, nbchars, ent)) -+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0)) - goto int_error; - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } -@@ -2785,7 +2801,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - while (*current != 0) { /* non input consuming loop */ - buffer[nbchars++] = *current++; - if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { -- if (xmlParserEntityCheck(ctxt, nbchars, ent)) -+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0)) - goto int_error; - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } -@@ -7203,7 +7219,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - xmlFreeNodeList(list); - return; - } -- if (xmlParserEntityCheck(ctxt, 0, ent)) { -+ if (xmlParserEntityCheck(ctxt, 0, ent, 0)) { - xmlFreeNodeList(list); - return; - } -@@ -7361,6 +7377,13 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - xmlNodePtr nw = NULL, cur, firstChild = NULL; - - /* -+ * We are copying here, make sure there is no abuse -+ */ -+ ctxt->sizeentcopy += ent->length; -+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) -+ return; -+ -+ /* - * when operating on a reader, the entities definitions - * are always owning the entities subtree. - if (ctxt->parseMode == XML_PARSE_READER) -@@ -7400,6 +7423,14 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - } else if ((list == NULL) || (ctxt->inputNr > 0)) { - xmlNodePtr nw = NULL, cur, next, last, - firstChild = NULL; -+ -+ /* -+ * We are copying here, make sure there is no abuse -+ */ -+ ctxt->sizeentcopy += ent->length; -+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) -+ return; -+ - /* - * Copy the entity child list and make it the new - * entity child list. The goal is to make sure any -@@ -14767,6 +14798,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt) - ctxt->catalogs = NULL; - ctxt->nbentities = 0; - ctxt->sizeentities = 0; -+ ctxt->sizeentcopy = 0; - xmlInitNodeInfoSeq(&ctxt->node_seq); - - if (ctxt->attsDefault != NULL) { -diff --git a/parserInternals.c b/parserInternals.c -index 02032d5..f8a7041 100644 ---- a/parserInternals.c -+++ b/parserInternals.c -@@ -1719,6 +1719,8 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt) - ctxt->charset = XML_CHAR_ENCODING_UTF8; - ctxt->catalogs = NULL; - ctxt->nbentities = 0; -+ ctxt->sizeentities = 0; -+ ctxt->sizeentcopy = 0; - ctxt->input_id = 1; - xmlInitNodeInfoSeq(&ctxt->node_seq); - return(0); --- -1.8.1.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch b/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch deleted file mode 100644 index 61de4d62..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 153cf15905cf4ec080612ada6703757d10caba1e Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Fri, 26 Oct 2012 13:50:47 +0800 -Subject: [PATCH] Fix large parse of file from memory - -https://bugzilla.redhat.com/show_bug.cgi?id=862969 -The new code trying to detect excessive input lookup would -just get wrong sometimes in the case of very large file parsed -directly from memory. ---- - libxml.h | 2 ++ - parser.c | 1 + - xmlIO.c | 2 +- - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libxml.h b/libxml.h -index efe285b..7558b5f 100644 ---- a/libxml.h -+++ b/libxml.h -@@ -91,6 +91,8 @@ void __xmlGlobalInitMutexDestroy(void); - int __xmlRandom(void); - #endif - -+int xmlNop(void); -+ - #ifdef IN_LIBXML - #ifdef __GNUC__ - #ifdef PIC -diff --git a/parser.c b/parser.c -index 43f53d9..0d8d7f2 100644 ---- a/parser.c -+++ b/parser.c -@@ -2025,6 +2025,7 @@ static void xmlSHRINK (xmlParserCtxtPtr ctxt) { - static void xmlGROW (xmlParserCtxtPtr ctxt) { - if ((((ctxt->input->end - ctxt->input->cur) > XML_MAX_LOOKUP_LIMIT) || - ((ctxt->input->cur - ctxt->input->base) > XML_MAX_LOOKUP_LIMIT)) && -+ ((ctxt->input->buf) && (ctxt->input->buf->readcallback != xmlNop)) && - ((ctxt->options & XML_PARSE_HUGE) == 0)) { - xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "Huge input lookup"); - ctxt->instate = XML_PARSER_EOF; -diff --git a/xmlIO.c b/xmlIO.c -index f8f438b..44254e4 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -800,7 +800,7 @@ xmlCheckFilename (const char *path) - return 1; - } - --static int -+int - xmlNop(void) { - return(0); - } --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch b/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch deleted file mode 100644 index 2ebb4f04..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2a74d41325c9e8043a2beec8b957ddf66f57cfd5 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Tue, 18 Dec 2012 02:09:14 -0500 -Subject: [PATCH] build/test/install python bindings manually - -To support building for multiple python ABIs, we want to skip checks for -python in configure, and build/test/install python bindings manually. ---- - configure.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.in b/configure.in -index 3d5f48b..b467c51 100644 ---- a/configure.in -+++ b/configure.in -@@ -748,7 +748,7 @@ PYTHON_INCLUDES= - PYTHON_SITE_PACKAGES= - PYTHON_TESTS= - pythondir= --if test "$with_python" != "no" ; then -+if false ; then - if test -x "$with_python/bin/python" - then - echo Found python in $with_python/bin/python -@@ -823,7 +823,7 @@ if test "$with_python" != "no" ; then - else - PYTHON= - fi --AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") -+AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no") - if test "$PYTHON_INCLUDES" != "" - then - PYTHON_SUBDIR=python -@@ -1429,7 +1429,7 @@ else - echo "Enabled Schemas/Relax-NG support" - WITH_SCHEMAS=1 - TEST_SCHEMAS="Schemastests Relaxtests" -- if test "$PYTHON_INCLUDES" != "" ; then -+ if test "$with_python" != "no" ; then - PYTHON_TESTS="$PYTHON_TESTS RelaxNGPythonTests SchemasPythonTests" - fi - with_regexps=yes --- -1.8.0.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch b/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch deleted file mode 100644 index 994363fa..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 711b15d545713b3a34a51ce8163d1162533647c9 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 25 Oct 2012 19:23:26 +0800 -Subject: [PATCH] Fix a bug in the nsclean option of the parser - -Raised as a side effect of: -https://bugzilla.gnome.org/show_bug.cgi?id=663844 ---- - parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index 19f1217..43f53d9 100644 ---- a/parser.c -+++ b/parser.c -@@ -1540,7 +1540,7 @@ nsPush(xmlParserCtxtPtr ctxt, const xmlChar *prefix, const xmlChar *URL) - { - if (ctxt->options & XML_PARSE_NSCLEAN) { - int i; -- for (i = 0;i < ctxt->nsNr;i += 2) { -+ for (i = ctxt->nsNr - 2;i >= 0;i -= 2) { - if (ctxt->nsTab[i] == prefix) { - /* in scope */ - if (ctxt->nsTab[i + 1] == URL) --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch b/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch deleted file mode 100644 index 7798a2c7..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e7715a5963afebfb027120db6914926ec9a7373d Mon Sep 17 00:00:00 2001 -From: Wouter Van Rooy <rooywo@vasco.com> -Date: Fri, 14 Sep 2012 14:39:42 +0800 -Subject: [PATCH] rand_seed should be static in dict.c - -For https://bugzilla.gnome.org/show_bug.cgi?id=683933 -rand_seed should be a static variable in dict.c - -We ran into a problem with another library that exports rand_seed as a -function. Combined with 2.7.8 this was not a problem but later versions -have this problem. ---- - dict.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dict.c b/dict.c -index 9935a25..164c7f2 100644 ---- a/dict.c -+++ b/dict.c -@@ -143,7 +143,7 @@ static int xmlDictInitialized = 0; - /* - * Internal data for random function, protected by xmlDictMutex - */ --unsigned int rand_seed = 0; -+static unsigned int rand_seed = 0; - #endif - #endif - --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-remove-redundant-pthread-defs.patch b/dev-libs/libxml2/files/libxml2-2.9.0-remove-redundant-pthread-defs.patch deleted file mode 100644 index f02f650b..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-remove-redundant-pthread-defs.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur libxml2-2.9.0.orig/threads.c libxml2-2.9.0/threads.c ---- libxml2-2.9.0.orig/threads.c 2013-07-06 19:58:28.098680769 +0000 -+++ libxml2-2.9.0/threads.c 2013-07-06 21:40:17.672022393 +0000 -@@ -47,6 +47,7 @@ - #ifdef HAVE_PTHREAD_H - - static int libxml_is_threaded = -1; -+#if 0 - #ifdef __GNUC__ - #ifdef linux - #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) -@@ -90,6 +91,7 @@ - #endif - #endif /* linux */ - #endif /* __GNUC__ */ -+#endif - #endif /* HAVE_PTHREAD_H */ - - /* diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch b/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch deleted file mode 100644 index 5fa2d6f0..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6c91aa384f48ff6d406553a6dd47fd556c1ef2e6 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 25 Oct 2012 15:33:59 +0800 -Subject: [PATCH] Fix a regression in 2.9.0 breaking validation while - streaming - -https://bugzilla.gnome.org/show_bug.cgi?id=684774 -with help from Kjell Ahlstedt <kjell.ahlstedt@bredband.net> ---- - SAX2.c | 2 +- - parser.c | 7 +++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/SAX2.c b/SAX2.c -index a24abc8..3eea39a 100644 ---- a/SAX2.c -+++ b/SAX2.c -@@ -2202,7 +2202,7 @@ xmlSAX2StartElementNs(void *ctx, - (ctxt->myDoc->intSubset->elements == NULL) && - (ctxt->myDoc->intSubset->attributes == NULL) && - (ctxt->myDoc->intSubset->entities == NULL)))) { -- xmlErrValid(ctxt, XML_ERR_NO_DTD, -+ xmlErrValid(ctxt, XML_DTD_NO_DTD, - "Validation failed: no DTD found !", NULL, NULL); - ctxt->validate = 0; - } -diff --git a/parser.c b/parser.c -index 28b0d80..19f1217 100644 ---- a/parser.c -+++ b/parser.c -@@ -11633,7 +11633,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { - "PP: Parsing internal subset\n"); - #endif - ctxt->inSubset = 1; -- ctxt->progressive = 1; -+ ctxt->progressive = 0; - ctxt->checkIndex = 0; - xmlParseDocTypeDecl(ctxt); - if (RAW == '[') { -@@ -12219,7 +12219,10 @@ xmldecl_done: - } - ctxt->instate = XML_PARSER_EOF; - } -- return((xmlParserErrors) ctxt->errNo); -+ if (ctxt->wellFormed == 0) -+ return((xmlParserErrors) ctxt->errNo); -+ else -+ return(0); - } - - /************************************************************************ --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch b/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch deleted file mode 100644 index 2d0d5f78..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0ad948ede2b5060a144c72e4e27c38d24a272ef4 Mon Sep 17 00:00:00 2001 -From: Tim Starling <tstarling@wikimedia.org> -Date: Mon, 29 Oct 2012 13:41:55 +1100 -Subject: [PATCH] Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h - -Otherwise, direct calls to xmlFree() etc. from the application will -use a different set of allocation functions to what was used to allocate -the memory internally. ---- - configure.in | 4 +++- - include/libxml/xmlversion.h.in | 9 +++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 6da057c..245c033 100644 ---- a/configure.in -+++ b/configure.in -@@ -954,6 +954,7 @@ WITH_THREADS=0 - THREAD_CFLAGS="" - TEST_THREADS="" - THREADS_W32="" -+WITH_THREAD_ALLOC=0 - - if test "$with_threads" = "no" ; then - echo Disabling multithreaded support -@@ -1017,7 +1018,7 @@ else - fi - fi - if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then -- THREAD_CFLAGS="$THREAD_CFLAGS -DLIBXML_THREAD_ALLOC_ENABLED" -+ WITH_THREAD_ALLOC=1 - fi - - AC_SUBST(THREAD_LIBS) -@@ -1025,6 +1026,7 @@ AC_SUBST(BASE_THREAD_LIBS) - AC_SUBST(WITH_THREADS) - AC_SUBST(THREAD_CFLAGS) - AC_SUBST(TEST_THREADS) -+AC_SUBST(WITH_THREAD_ALLOC) - AM_CONDITIONAL([THREADS_W32],[test -n "$THREADS_W32"]) - - dnl -diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in -index c98e7ca..00a836f 100644 ---- a/include/libxml/xmlversion.h.in -+++ b/include/libxml/xmlversion.h.in -@@ -98,6 +98,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); - #endif - - /** -+ * LIBXML_THREAD_ALLOC_ENABLED: -+ * -+ * Whether the allocation hooks are per-thread -+ */ -+#if @WITH_THREAD_ALLOC@ -+#define LIBXML_THREAD_ALLOC_ENABLED -+#endif -+ -+/** - * LIBXML_TREE_ENABLED: - * - * Whether the DOM like tree manipulation API support is configured in --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch b/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch deleted file mode 100644 index a85d6129..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001 -From: Friedrich Haubensak <hsk@fli-leibniz.de> -Date: Wed, 12 Sep 2012 17:34:53 +0200 -Subject: [PATCH] Fix a thread portability problem - -cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10 - -I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in -a structure assignment anyway ---- - threads.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/threads.c b/threads.c -index f206149..7e85a26 100644 ---- a/threads.c -+++ b/threads.c -@@ -146,6 +146,7 @@ struct _xmlRMutex { - static pthread_key_t globalkey; - static pthread_t mainthread; - static pthread_once_t once_control = PTHREAD_ONCE_INIT; -+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT; - static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER; - #elif defined HAVE_WIN32_THREADS - #if defined(HAVE_COMPILER_TLS) -@@ -915,7 +916,7 @@ xmlCleanupThreads(void) - #ifdef HAVE_PTHREAD_H - if ((libxml_is_threaded) && (pthread_key_delete != NULL)) - pthread_key_delete(globalkey); -- once_control = PTHREAD_ONCE_INIT; -+ once_control = once_control_init; - #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) - if (globalkey != TLS_OUT_OF_INDEXES) { - xmlGlobalStateCleanupHelperParams *p; --- -1.8.0 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch b/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch deleted file mode 100644 index 16ea5c19..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 63588f476f2dc89d4c6ef70a474d7230fbf4d45e Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Fri, 10 May 2013 14:01:46 +0800 -Subject: [PATCH] Fix a regression in xmlGetDocCompressMode() - -The switch to xzlib had for consequence that the compression -level of the input was not gathered anymore in ctxt->input->buf, -then the parser compression flags was left to -1 and propagated -to the resulting document. -Fix the I/O layer to get compression detection in xzlib, -then carry it in the input buffer and the resulting document - - This should fix - https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=3456 ---- - parser.c | 4 ++++ - xmlIO.c | 17 +++++++++++++++++ - xzlib.c | 25 +++++++++++++++++++++++++ - xzlib.h | 1 + - 4 files changed, 47 insertions(+) - -diff --git a/parser.c b/parser.c -index 1d478c3..4a442bb 100644 ---- a/parser.c -+++ b/parser.c -@@ -10681,6 +10681,10 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) { - ctxt->sax->startDocument(ctxt->userData); - if (ctxt->instate == XML_PARSER_EOF) - return(-1); -+ if ((ctxt->myDoc != NULL) && (ctxt->input != NULL) && -+ (ctxt->input->buf != NULL) && (ctxt->input->buf->compressed >= 0)) { -+ ctxt->myDoc->compression = ctxt->input->buf->compressed; -+ } - - /* - * The Misc part of the Prolog -diff --git a/xmlIO.c b/xmlIO.c -index 847cb7e..fc4e111 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -2669,6 +2669,12 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { - #endif - } - #endif -+#ifdef HAVE_LZMA_H -+ if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) && -+ (strcmp(URI, "-") != 0)) { -+ ret->compressed = __libxml2_xzcompressed(context); -+ } -+#endif - } - else - xmlInputCallbackTable[i].closecallback (context); -@@ -3325,6 +3331,17 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) { - if (res < 0) { - return(-1); - } -+ -+ /* -+ * try to establish compressed status of input if not done already -+ */ -+ if (in->compressed == -1) { -+#ifdef HAVE_LZMA_H -+ if (in->readcallback == xmlXzfileRead) -+ in->compressed = __libxml2_xzcompressed(in->context); -+#endif -+ } -+ - len = res; - if (in->encoder != NULL) { - unsigned int use; -diff --git a/xzlib.c b/xzlib.c -index 928bd17..150e803 100644 ---- a/xzlib.c -+++ b/xzlib.c -@@ -182,12 +182,37 @@ xz_open(const char *path, int fd, const char *mode ATTRIBUTE_UNUSED) - return (xzFile) state; - } - -+static int -+xz_compressed(xzFile f) { -+ xz_statep state; -+ -+ if (f == NULL) -+ return(-1); -+ state = (xz_statep) f; -+ if (state->init <= 0) -+ return(-1); -+ -+ switch (state->how) { -+ case COPY: -+ return(0); -+ case GZIP: -+ case LZMA: -+ return(1); -+ } -+ return(-1); -+} -+ - xzFile - __libxml2_xzopen(const char *path, const char *mode) - { - return xz_open(path, -1, mode); - } - -+int -+__libxml2_xzcompressed(xzFile f) { -+ return xz_compressed(f); -+} -+ - xzFile - __libxml2_xzdopen(int fd, const char *mode) - { -diff --git a/xzlib.h b/xzlib.h -index 43c75e1..29ba55e 100644 ---- a/xzlib.h -+++ b/xzlib.h -@@ -15,4 +15,5 @@ xzFile __libxml2_xzopen(const char *path, const char *mode); - xzFile __libxml2_xzdopen(int fd, const char *mode); - int __libxml2_xzread(xzFile file, void *buf, unsigned len); - int __libxml2_xzclose(xzFile file); -+int __libxml2_xzcompressed(xzFile f); - #endif /* LIBXML2_XZLIB_H */ --- -1.8.3.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch b/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch deleted file mode 100644 index 81f692fc..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Tue, 22 Apr 2014 15:30:56 +0800 -Subject: [PATCH] Do not fetch external parameter entities - -Unless explicitely asked for when validating or replacing entities -with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com> ---- - parser.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/parser.c b/parser.c -index 9347ac9..c0dea05 100644 ---- a/parser.c -+++ b/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. --- -1.9.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch b/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch deleted file mode 100644 index ab330389..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure.in b/configure.in -index 7374564..13c8d4e 100644 ---- a/configure.in -+++ b/configure.in -@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la" - AC_SUBST(WITH_ICONV) - - WITH_ICU=0 --ICU_LIBS="" - if test "$with_icu" != "yes" ; then - echo Disabling ICU support - else -- ICU_CONFIG=icu-config -- if ${ICU_CONFIG} --cflags >/dev/null 2>&1 -- then -- ICU_LIBS=`${ICU_CONFIG} --ldflags` -- WITH_ICU=1 -- echo Enabling ICU support -- else -- AC_MSG_ERROR([libicu config program icu-config not found]) -- fi -+ PKG_CHECK_MODULES(ICU, icu-i18n) -+ WITH_ICU=1 - fi - AC_SUBST(WITH_ICU) - AC_SUBST(ICU_LIBS) diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch b/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch deleted file mode 100644 index 57665323..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 10ec19ab0a49936ca8ca0d6962d24d3f889960a5 Mon Sep 17 00:00:00 2001 -From: dcb <dcb314@hotmail.com> -Date: Thu, 2 May 2013 16:11:46 +0800 -Subject: [PATCH] Fix missing break on last() function for attributes - -pointed out by cppcheck ---- - python/libxml.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/python/libxml.c b/python/libxml.c -index 03cfb9f..3338b83 100644 ---- a/python/libxml.c -+++ b/python/libxml.c -@@ -2683,6 +2683,7 @@ libxml_last(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) - xmlAttrPtr attr = (xmlAttrPtr) cur; - - res = attr->last; -+ break; - } - default: - res = NULL; --- -1.8.3.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch b/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch deleted file mode 100644 index 51a92ada..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch +++ /dev/null @@ -1,168 +0,0 @@ -From dcc19503193c71596278a252064a8ce66331b3cd Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Wed, 22 May 2013 22:56:45 +0200 -Subject: [PATCH] Fix a parsing bug on non-ascii element and CR/LF usage - -https://bugzilla.gnome.org/show_bug.cgi?id=698550 - -Somehow the behaviour of the internal parser routine changed -slightly when encountering CR/LF, which led to a bug when -parsing document with non-ascii Names ---- - parser.c | 6 +++++- - result/japancrlf.xml | 4 ++++ - result/japancrlf.xml.rde | 7 +++++++ - result/japancrlf.xml.rdr | 7 +++++++ - result/japancrlf.xml.sax | 11 +++++++++++ - result/japancrlf.xml.sax2 | 11 +++++++++++ - result/noent/japancrlf.xml | 4 ++++ - test/japancrlf.xml | 6 ++++++ - 8 files changed, 55 insertions(+), 1 deletion(-) - create mode 100644 result/japancrlf.xml - create mode 100644 result/japancrlf.xml.rde - create mode 100644 result/japancrlf.xml.rdr - create mode 100644 result/japancrlf.xml.sax - create mode 100644 result/japancrlf.xml.sax2 - create mode 100644 result/noent/japancrlf.xml - create mode 100644 test/japancrlf.xml - -diff --git a/parser.c b/parser.c -index 4a442bb..4739add 100644 ---- a/parser.c -+++ b/parser.c -@@ -3404,6 +3404,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { - int len = 0, l; - int c; - int count = 0; -+ const xmlChar *end; /* needed because CUR_CHAR() can move cur on \r\n */ - - #ifdef DEBUG - nbParseNCNameComplex++; -@@ -3413,6 +3414,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { - * Handler for more complex cases - */ - GROW; -+ end = ctxt->input->cur; - c = CUR_CHAR(l); - if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */ - (!xmlIsNameStartChar(ctxt, c) || (c == ':'))) { -@@ -3434,12 +3436,14 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { - } - len += l; - NEXTL(l); -+ end = ctxt->input->cur; - c = CUR_CHAR(l); - if (c == 0) { - count = 0; - GROW; - if (ctxt->instate == XML_PARSER_EOF) - return(NULL); -+ end = ctxt->input->cur; - c = CUR_CHAR(l); - } - } -@@ -3448,7 +3452,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { - xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName"); - return(NULL); - } -- return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len)); -+ return(xmlDictLookup(ctxt->dict, end - len, len)); - } - - /** -diff --git a/result/japancrlf.xml b/result/japancrlf.xml -new file mode 100644 -index 0000000..60b307c ---- /dev/null -+++ b/result/japancrlf.xml -@@ -0,0 +1,4 @@ -+<?xml version="1.0"?> -+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"> -+ <c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/> -+</入力メッセージ> -diff --git a/result/japancrlf.xml.rde b/result/japancrlf.xml.rde -new file mode 100644 -index 0000000..0bc5af7 ---- /dev/null -+++ b/result/japancrlf.xml.rde -@@ -0,0 +1,7 @@ -+0 1 入力メッセージ 0 0 -+1 14 #text 0 1 -+ -+1 1 c8c:Ele 1 0 -+1 14 #text 0 1 -+ -+0 15 入力メッセージ 0 0 -diff --git a/result/japancrlf.xml.rdr b/result/japancrlf.xml.rdr -new file mode 100644 -index 0000000..0bc5af7 ---- /dev/null -+++ b/result/japancrlf.xml.rdr -@@ -0,0 +1,7 @@ -+0 1 入力メッセージ 0 0 -+1 14 #text 0 1 -+ -+1 1 c8c:Ele 1 0 -+1 14 #text 0 1 -+ -+0 15 入力メッセージ 0 0 -diff --git a/result/japancrlf.xml.sax b/result/japancrlf.xml.sax -new file mode 100644 -index 0000000..c3bbdc6 ---- /dev/null -+++ b/result/japancrlf.xml.sax -@@ -0,0 +1,11 @@ -+SAX.setDocumentLocator() -+SAX.startDocument() -+SAX.startElement(入力メッセージ, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826') -+SAX.characters( -+ , 2) -+SAX.startElement(c8c:Ele, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826') -+SAX.endElement(c8c:Ele) -+SAX.characters( -+, 1) -+SAX.endElement(入力メッセージ) -+SAX.endDocument() -diff --git a/result/japancrlf.xml.sax2 b/result/japancrlf.xml.sax2 -new file mode 100644 -index 0000000..878eae4 ---- /dev/null -+++ b/result/japancrlf.xml.sax2 -@@ -0,0 +1,11 @@ -+SAX.setDocumentLocator() -+SAX.startDocument() -+SAX.startElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0) -+SAX.characters( -+ , 2) -+SAX.startElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0) -+SAX.endElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826') -+SAX.characters( -+, 1) -+SAX.endElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826') -+SAX.endDocument() -diff --git a/result/noent/japancrlf.xml b/result/noent/japancrlf.xml -new file mode 100644 -index 0000000..60b307c ---- /dev/null -+++ b/result/noent/japancrlf.xml -@@ -0,0 +1,4 @@ -+<?xml version="1.0"?> -+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"> -+ <c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/> -+</入力メッセージ> -diff --git a/test/japancrlf.xml b/test/japancrlf.xml -new file mode 100644 -index 0000000..480cb2d ---- /dev/null -+++ b/test/japancrlf.xml -@@ -0,0 +1,6 @@ -+<入力メッセージ -+ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"> -+ <c8c:Ele -+ xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826" -+ /> -+</入力メッセージ> -\ No newline at end of file --- -1.8.3.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch deleted file mode 100644 index c79709db..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 722923bc9b788f028e4221c77138fc66735a3113 Mon Sep 17 00:00:00 2001 -From: Petr Sumbera <petr.sumbera@oracle.com> -Date: Fri, 3 May 2013 22:25:38 +0800 -Subject: [PATCH] Fix for compilation with python 2.6.8 - -Remap PyCapsule to PyCObject based on the macro being available -instead of using the python version ---- - python/libxml_wrap.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h -index a9b9739..53a0618 100644 ---- a/python/libxml_wrap.h -+++ b/python/libxml_wrap.h -@@ -34,11 +34,11 @@ - #define PyBytes_AsString PyString_AsString - #define PyBytes_AS_STRING PyString_AS_STRING - #define PyBytes_GET_SIZE PyString_GET_SIZE -- -+#endif -+#ifndef PyCapsule_New - #define PyCapsule_New PyCObject_FromVoidPtrAndDesc - #define PyCapsule_CheckExact PyCObject_Check - #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o)) -- - #endif - #endif - --- -1.8.3.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch deleted file mode 100644 index 5c4e83da..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 927faac6113b625a9a3423eef8f144fc7d9a8547 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Wed, 10 Jul 2013 23:00:54 -0400 -Subject: [PATCH] python: fix drv_libxml2.py for python3 compatibility - -https://bugzilla.gnome.org/show_bug.cgi?id=703979 ---- - python/drv_libxml2.py | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py -index e43fb1d..c9075e6 100644 ---- a/python/drv_libxml2.py -+++ b/python/drv_libxml2.py -@@ -34,12 +34,20 @@ TODO - - """ - --__author__ = u"Stéphane Bidoul <sbi@skynet.be>" -+__author__ = "Stéphane Bidoul <sbi@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) - --- -1.8.3.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch deleted file mode 100644 index d07a1e28..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6dd7775f3506741093890d99f09c242e0b34b55f Mon Sep 17 00:00:00 2001 -From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail..com> -Date: Fri, 12 Jul 2013 11:18:11 +0800 -Subject: [PATCH] Another round of fixes for older versions of Python - ---- - python/drv_libxml2.py | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py -index c9075e6..c2ec3e2 100644 ---- a/python/drv_libxml2.py -+++ b/python/drv_libxml2.py -@@ -40,14 +40,12 @@ __version__ = "0.3" - import sys - import codecs - --if sys.version < "3": -+if sys.version_info[0] < 3: - __author__ = codecs.unicode_escape_decode(__author__)[0] - -- from types import StringType, UnicodeType -- StringTypes = (StringType,UnicodeType) -- -+ StringTypes = (str, unicode) - else: -- StringTypes = (str) -+ StringTypes = str - - from xml.sax._exceptions import * - from xml.sax import xmlreader, saxutils -@@ -73,9 +71,9 @@ def _d(s): - - try: - import libxml2 --except ImportError as e: -+except ImportError: - raise SAXReaderNotAvailable("libxml2 not available: " \ -- "import error was: %s" % e) -+ "import error was: %s" % sys.exc_info()[1]) - - class Locator(xmlreader.Locator): - """SAX Locator adapter for libxml2.xmlTextReaderLocator""" -@@ -142,7 +140,7 @@ class LibXml2Reader(xmlreader.XMLReader): - self.__parsing = 1 - try: - # prepare source and create reader -- if type(source) in StringTypes: -+ if isinstance(source, StringTypes): - reader = libxml2.newTextReaderFilename(source) - else: - source = saxutils.prepare_input_source(source) --- -1.8.3.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch b/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch deleted file mode 100644 index 7ce2f3b9..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7c3c663e4f844aaecbb0cfc29567fe2ee9506fc4 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Fri, 16 May 2014 22:46:00 -0400 -Subject: [PATCH] xmllint: a posteriori validation needs to load exernal - entities - -For https://bugzilla.gnome.org/show_bug.cgi?id=730290 ---- - xmllint.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xmllint.c b/xmllint.c -index 9d46ac5..b142b3b 100644 ---- a/xmllint.c -+++ b/xmllint.c -@@ -3530,7 +3530,12 @@ main(int argc, char **argv) { - xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; - if (noent != 0) xmlSubstituteEntitiesDefault(1); - #ifdef LIBXML_VALID_ENABLED -- if (valid != 0) xmlDoValidityCheckingDefaultValue = 1; -+ /* If we will validate only a posteriori, ensure that entities get loaded, -+ * but suppress validation messages during initial parsing */ -+ if (postvalid != 0 && valid == 0) -+ options |= XML_PARSE_DTDVALID | XML_PARSE_NOERROR | XML_PARSE_NOWARNING; -+ else if (valid != 0) -+ xmlDoValidityCheckingDefaultValue = 1; - #endif /* LIBXML_VALID_ENABLED */ - if ((htmlout) && (!nowrap)) { - xmlGenericError(xmlGenericErrorContext, --- -1.9.3 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch b/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch deleted file mode 100644 index 7a84fac5..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure.in b/configure.in -index 7374564..13c8d4e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la" - AC_SUBST(WITH_ICONV) - - WITH_ICU=0 --ICU_LIBS="" - if test "$with_icu" != "yes" ; then - echo Disabling ICU support - else -- ICU_CONFIG=icu-config -- if ${ICU_CONFIG} --cflags >/dev/null 2>&1 -- then -- ICU_LIBS=`${ICU_CONFIG} --ldflags` -- WITH_ICU=1 -- echo Enabling ICU support -- else -- AC_MSG_ERROR([libicu config program icu-config not found]) -- fi -+ PKG_CHECK_MODULES(ICU, icu-i18n) -+ WITH_ICU=1 - fi - AC_SUBST(WITH_ICU) - AC_SUBST(ICU_LIBS) diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch b/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch deleted file mode 100644 index d98b3821..00000000 --- a/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Fri, 17 Oct 2014 17:13:41 +0800 -Subject: Revert "Missing initialization for the catalog module" - -This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. -As this break xmlcatalog command -https://bugzilla.redhat.com/show_bug.cgi?id=1153753 - -diff --git a/parser.c b/parser.c -index 1d93967..67c9dfd 100644 ---- a/parser.c -+++ b/parser.c -@@ -14830,9 +14830,6 @@ xmlInitParser(void) { - #ifdef LIBXML_XPATH_ENABLED - xmlXPathInit(); - #endif --#ifdef LIBXML_CATALOG_ENABLED -- xmlInitializeCatalog(); --#endif - xmlParserInitialized = 1; - #ifdef LIBXML_THREAD_ENABLED - } --- -cgit v0.10.1 - |