Add patch to fix python multiarch issue

32 files changed, 66 insertions, 30 deletions

diff --git a/debian/patches/0002-fix-python-multiarch-includes.patch b/debian/patches/0002-fix-python-multiarch-includes.patch
new file mode 100644
index 0000000..ff7c4fa
--- /dev/null
+++ b/debian/patches/0002-fix-python-multiarch-includes.patch
@@ -0,0 +1,35 @@
+From: Matthias Klose <doko@ubuntu.com>
+Date: Wed, 9 Jul 2014 05:30:24 +0800
+Subject: fix python multiarch includes
+
+---
+ python/Makefile.am |    2 +-
+ python/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 34aed96..8445ea5 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -19,7 +19,7 @@ if WITH_PYTHON
+ AM_CPPFLAGS = \
+ 	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/include	\
+-	-I$(PYTHON_INCLUDES)
++	$(PYTHON_INCLUDES)
+ 
+ python_LTLIBRARIES = libxml2mod.la
+ 
+diff --git a/python/Makefile.in b/python/Makefile.in
+index efdea43..23e7fa2 100644
+--- a/python/Makefile.in
++++ b/python/Makefile.in
+@@ -430,7 +430,7 @@ EXTRA_DIST = \
+ @WITH_PYTHON_TRUE@AM_CPPFLAGS = \
+ @WITH_PYTHON_TRUE@	-I$(top_builddir)/include \
+ @WITH_PYTHON_TRUE@	-I$(top_srcdir)/include	\
+-@WITH_PYTHON_TRUE@	-I$(PYTHON_INCLUDES)
++@WITH_PYTHON_TRUE@	$(PYTHON_INCLUDES)
+ 
+ @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
+ @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
diff --git a/debian/patches/0002-Fix-an-error-in-xmlCleanupParser.patch b/debian/patches/0003-Fix-an-error-in-xmlCleanupParser.patch
index 03bf447..03bf447 100644
--- a/debian/patches/0002-Fix-an-error-in-xmlCleanupParser.patch
+++ b/debian/patches/0003-Fix-an-error-in-xmlCleanupParser.patch
diff --git a/debian/patches/0003-Fix-missing-break-on-last-function-for-attributes.patch b/debian/patches/0004-Fix-missing-break-on-last-function-for-attributes.patch
index cff8b72..cff8b72 100644
--- a/debian/patches/0003-Fix-missing-break-on-last-function-for-attributes.patch
+++ b/debian/patches/0004-Fix-missing-break-on-last-function-for-attributes.patch
diff --git a/debian/patches/0004-xmllint-memory-should-fail-on-empty-files.patch b/debian/patches/0005-xmllint-memory-should-fail-on-empty-files.patch
index e1a2197..e1a2197 100644
--- a/debian/patches/0004-xmllint-memory-should-fail-on-empty-files.patch
+++ b/debian/patches/0005-xmllint-memory-should-fail-on-empty-files.patch
diff --git a/debian/patches/0005-properly-quote-the-namespace-uris-written-out-during.patch b/debian/patches/0006-properly-quote-the-namespace-uris-written-out-during.patch
index 6f4c4c8..6f4c4c8 100644
--- a/debian/patches/0005-properly-quote-the-namespace-uris-written-out-during.patch
+++ b/debian/patches/0006-properly-quote-the-namespace-uris-written-out-during.patch
diff --git a/debian/patches/0006-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch b/debian/patches/0007-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch
index 442fd11..442fd11 100644
--- a/debian/patches/0006-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch
+++ b/debian/patches/0007-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch
diff --git a/debian/patches/0007-missing-else-in-xlink.c.patch b/debian/patches/0008-missing-else-in-xlink.c.patch
index 88a4e86..88a4e86 100644
--- a/debian/patches/0007-missing-else-in-xlink.c.patch
+++ b/debian/patches/0008-missing-else-in-xlink.c.patch
diff --git a/debian/patches/0008-Catch-malloc-error-and-exit-accordingly.patch b/debian/patches/0009-Catch-malloc-error-and-exit-accordingly.patch
index 3f93a57..3f93a57 100644
--- a/debian/patches/0008-Catch-malloc-error-and-exit-accordingly.patch
+++ b/debian/patches/0009-Catch-malloc-error-and-exit-accordingly.patch
diff --git a/debian/patches/0009-Fix-handling-of-mmap-errors.patch b/debian/patches/0010-Fix-handling-of-mmap-errors.patch
index 0c55cfe..0c55cfe 100644
--- a/debian/patches/0009-Fix-handling-of-mmap-errors.patch
+++ b/debian/patches/0010-Fix-handling-of-mmap-errors.patch
diff --git a/debian/patches/0010-Avoid-crash-if-allocation-fails.patch b/debian/patches/0011-Avoid-crash-if-allocation-fails.patch
index e4e7206..e4e7206 100644
--- a/debian/patches/0010-Avoid-crash-if-allocation-fails.patch
+++ b/debian/patches/0011-Avoid-crash-if-allocation-fails.patch
diff --git a/debian/patches/0011-Fix-a-possible-NULL-dereference.patch b/debian/patches/0012-Fix-a-possible-NULL-dereference.patch
index 9a7cf6f..9a7cf6f 100644
--- a/debian/patches/0011-Fix-a-possible-NULL-dereference.patch
+++ b/debian/patches/0012-Fix-a-possible-NULL-dereference.patch
diff --git a/debian/patches/0012-Clear-up-a-potential-NULL-dereference.patch b/debian/patches/0013-Clear-up-a-potential-NULL-dereference.patch
index a18dfaf..a18dfaf 100644
--- a/debian/patches/0012-Clear-up-a-potential-NULL-dereference.patch
+++ b/debian/patches/0013-Clear-up-a-potential-NULL-dereference.patch
diff --git a/debian/patches/0013-Fix-XPath-optimization-with-predicates.patch b/debian/patches/0014-Fix-XPath-optimization-with-predicates.patch
index f24424a..f24424a 100644
--- a/debian/patches/0013-Fix-XPath-optimization-with-predicates.patch
+++ b/debian/patches/0014-Fix-XPath-optimization-with-predicates.patch
diff --git a/debian/patches/0014-xmllint-pretty-crashed-without-following-numeric-arg.patch b/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch
index b910c3a..b910c3a 100644
--- a/debian/patches/0014-xmllint-pretty-crashed-without-following-numeric-arg.patch
+++ b/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch
diff --git a/debian/patches/0015-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch b/debian/patches/0016-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch
index fa8a176..fa8a176 100644
--- a/debian/patches/0015-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch
+++ b/debian/patches/0016-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch
diff --git a/debian/patches/0016-Fix-a-potential-NULL-dereference-in-tree-code.patch b/debian/patches/0017-Fix-a-potential-NULL-dereference-in-tree-code.patch
index 2c55813..2c55813 100644
--- a/debian/patches/0016-Fix-a-potential-NULL-dereference-in-tree-code.patch
+++ b/debian/patches/0017-Fix-a-potential-NULL-dereference-in-tree-code.patch
diff --git a/debian/patches/0017-Fix-pointer-dereferenced-before-null-check.patch b/debian/patches/0018-Fix-pointer-dereferenced-before-null-check.patch
index 3ae1c59..3ae1c59 100644
--- a/debian/patches/0017-Fix-pointer-dereferenced-before-null-check.patch
+++ b/debian/patches/0018-Fix-pointer-dereferenced-before-null-check.patch
diff --git a/debian/patches/0018-Fix-a-bug-loading-some-compressed-files.patch b/debian/patches/0019-Fix-a-bug-loading-some-compressed-files.patch
index 48b4fa4..48b4fa4 100644
--- a/debian/patches/0018-Fix-a-bug-loading-some-compressed-files.patch
+++ b/debian/patches/0019-Fix-a-bug-loading-some-compressed-files.patch
diff --git a/debian/patches/0019-Avoid-a-possibility-of-dangling-encoding-handler.patch b/debian/patches/0020-Avoid-a-possibility-of-dangling-encoding-handler.patch
index ab0bde8..ab0bde8 100644
--- a/debian/patches/0019-Avoid-a-possibility-of-dangling-encoding-handler.patch
+++ b/debian/patches/0020-Avoid-a-possibility-of-dangling-encoding-handler.patch
diff --git a/debian/patches/0020-Fix-a-couple-of-missing-NULL-checks.patch b/debian/patches/0021-Fix-a-couple-of-missing-NULL-checks.patch
index 6771dbb..6771dbb 100644
--- a/debian/patches/0020-Fix-a-couple-of-missing-NULL-checks.patch
+++ b/debian/patches/0021-Fix-a-couple-of-missing-NULL-checks.patch
diff --git a/debian/patches/0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch b/debian/patches/0022-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch
index 7820411..7820411 100644
--- a/debian/patches/0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch
+++ b/debian/patches/0022-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch
diff --git a/debian/patches/0022-Handling-of-XPath-function-arguments-in-error-case.patch b/debian/patches/0023-Handling-of-XPath-function-arguments-in-error-case.patch
index cc18db7..cc18db7 100644
--- a/debian/patches/0022-Handling-of-XPath-function-arguments-in-error-case.patch
+++ b/debian/patches/0023-Handling-of-XPath-function-arguments-in-error-case.patch
diff --git a/debian/patches/0023-Missing-initialization-for-the-catalog-module.patch b/debian/patches/0024-Missing-initialization-for-the-catalog-module.patch
index c5a5d16..c5a5d16 100644
--- a/debian/patches/0023-Missing-initialization-for-the-catalog-module.patch
+++ b/debian/patches/0024-Missing-initialization-for-the-catalog-module.patch
diff --git a/debian/patches/0024-Fix-an-fd-leak-in-an-error-case.patch b/debian/patches/0025-Fix-an-fd-leak-in-an-error-case.patch
index edf1752..edf1752 100644
--- a/debian/patches/0024-Fix-an-fd-leak-in-an-error-case.patch
+++ b/debian/patches/0025-Fix-an-fd-leak-in-an-error-case.patch
diff --git a/debian/patches/0025-fixing-a-ptotential-uninitialized-access.patch b/debian/patches/0026-fixing-a-ptotential-uninitialized-access.patch
index 65eae92..65eae92 100644
--- a/debian/patches/0025-fixing-a-ptotential-uninitialized-access.patch
+++ b/debian/patches/0026-fixing-a-ptotential-uninitialized-access.patch
diff --git a/debian/patches/0026-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch b/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch
index 22d206a..22d206a 100644
--- a/debian/patches/0026-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch
+++ b/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch
diff --git a/debian/patches/0027-Avoid-a-possible-NULL-pointer-dereference.patch b/debian/patches/0028-Avoid-a-possible-NULL-pointer-dereference.patch
index 219d13a..219d13a 100644
--- a/debian/patches/0027-Avoid-a-possible-NULL-pointer-dereference.patch
+++ b/debian/patches/0028-Avoid-a-possible-NULL-pointer-dereference.patch
diff --git a/debian/patches/0028-Do-not-fetch-external-parameter-entities.patch b/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch
index 06ec27c..06ec27c 100644
--- a/debian/patches/0028-Do-not-fetch-external-parameter-entities.patch
+++ b/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch
diff --git a/debian/patches/0029-Avoid-Possible-null-pointer-dereference-in-memory-de.patch b/debian/patches/0030-Avoid-Possible-null-pointer-dereference-in-memory-de.patch
index 8a84731..8a84731 100644
--- a/debian/patches/0029-Avoid-Possible-null-pointer-dereference-in-memory-de.patch
+++ b/debian/patches/0030-Avoid-Possible-null-pointer-dereference-in-memory-de.patch
diff --git a/debian/patches/0030-xmllint-was-not-parsing-the-c14n11-flag.patch b/debian/patches/0031-xmllint-was-not-parsing-the-c14n11-flag.patch
index 7b24f6b..7b24f6b 100644
--- a/debian/patches/0030-xmllint-was-not-parsing-the-c14n11-flag.patch
+++ b/debian/patches/0031-xmllint-was-not-parsing-the-c14n11-flag.patch
diff --git a/debian/patches/0031-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch b/debian/patches/0032-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch
index d9fc108..d9fc108 100644
--- a/debian/patches/0031-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch
+++ b/debian/patches/0032-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch
diff --git a/debian/patches/series b/debian/patches/series
index 4ea5bbe..ce6e665 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,31 +1,32 @@
 0001-modify-xml2-config-and-pkgconfig-behaviour.patch
-0002-Fix-an-error-in-xmlCleanupParser.patch
-0003-Fix-missing-break-on-last-function-for-attributes.patch
-0004-xmllint-memory-should-fail-on-empty-files.patch
-0005-properly-quote-the-namespace-uris-written-out-during.patch
-0006-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch
-0007-missing-else-in-xlink.c.patch
-0008-Catch-malloc-error-and-exit-accordingly.patch
-0009-Fix-handling-of-mmap-errors.patch
-0010-Avoid-crash-if-allocation-fails.patch
-0011-Fix-a-possible-NULL-dereference.patch
-0012-Clear-up-a-potential-NULL-dereference.patch
-0013-Fix-XPath-optimization-with-predicates.patch
-0014-xmllint-pretty-crashed-without-following-numeric-arg.patch
-0015-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch
-0016-Fix-a-potential-NULL-dereference-in-tree-code.patch
-0017-Fix-pointer-dereferenced-before-null-check.patch
-0018-Fix-a-bug-loading-some-compressed-files.patch
-0019-Avoid-a-possibility-of-dangling-encoding-handler.patch
-0020-Fix-a-couple-of-missing-NULL-checks.patch
-0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch
-0022-Handling-of-XPath-function-arguments-in-error-case.patch
-0023-Missing-initialization-for-the-catalog-module.patch
-0024-Fix-an-fd-leak-in-an-error-case.patch
-0025-fixing-a-ptotential-uninitialized-access.patch
-0026-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch
-0027-Avoid-a-possible-NULL-pointer-dereference.patch
-0028-Do-not-fetch-external-parameter-entities.patch
-0029-Avoid-Possible-null-pointer-dereference-in-memory-de.patch
-0030-xmllint-was-not-parsing-the-c14n11-flag.patch
-0031-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch
+0002-fix-python-multiarch-includes.patch
+0003-Fix-an-error-in-xmlCleanupParser.patch
+0004-Fix-missing-break-on-last-function-for-attributes.patch
+0005-xmllint-memory-should-fail-on-empty-files.patch
+0006-properly-quote-the-namespace-uris-written-out-during.patch
+0007-Fix-a-parsing-bug-on-non-ascii-element-and-CR-LF-usa.patch
+0008-missing-else-in-xlink.c.patch
+0009-Catch-malloc-error-and-exit-accordingly.patch
+0010-Fix-handling-of-mmap-errors.patch
+0011-Avoid-crash-if-allocation-fails.patch
+0012-Fix-a-possible-NULL-dereference.patch
+0013-Clear-up-a-potential-NULL-dereference.patch
+0014-Fix-XPath-optimization-with-predicates.patch
+0015-xmllint-pretty-crashed-without-following-numeric-arg.patch
+0016-Fix-potential-NULL-pointer-dereferences-in-regexp-co.patch
+0017-Fix-a-potential-NULL-dereference-in-tree-code.patch
+0018-Fix-pointer-dereferenced-before-null-check.patch
+0019-Fix-a-bug-loading-some-compressed-files.patch
+0020-Avoid-a-possibility-of-dangling-encoding-handler.patch
+0021-Fix-a-couple-of-missing-NULL-checks.patch
+0022-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch
+0023-Handling-of-XPath-function-arguments-in-error-case.patch
+0024-Missing-initialization-for-the-catalog-module.patch
+0025-Fix-an-fd-leak-in-an-error-case.patch
+0026-fixing-a-ptotential-uninitialized-access.patch
+0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch
+0028-Avoid-a-possible-NULL-pointer-dereference.patch
+0029-Do-not-fetch-external-parameter-entities.patch
+0030-Avoid-Possible-null-pointer-dereference-in-memory-de.patch
+0031-xmllint-was-not-parsing-the-c14n11-flag.patch
+0032-Fix-regressions-introduced-by-CVE-2014-0191-patch.patch