← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libxml2/utopic

« back to all changes in this revision

Viewing changes to debian/patches/0024-Missing-initialization-for-the-catalog-module.patch

  • Committer: Package Import Robot
  • Author(s): Aron Xu, Christian Svensson, Daniel Schepler, Helmut Grohne, Adam Conrad, Matthias Klose, Aron Xu
  • Date: 2014-07-09 05:40:15 UTC
  • mto: This revision was merged to the branch mainline in revision 75.
  • Revision ID: package-import@ubuntu.com-20140709054015-rdnfjxrf3zvmw6l7
http://bugs.debian.org/742350
http://bugs.debian.org/738080
http://bugs.debian.org/753005
http://bugs.debian.org/747309
[ Christian Svensson ]
* Do not build-depend on readline (Closes: #742350)

[ Daniel Schepler ]
* Patch to bootstrap without python (Closes: #738080)

[ Helmut Grohne ]
* Drop unneeded B-D on perl and binutils (Closes: #753005)

[ Adam Conrad ]
* Actually run dh_autoreconf, which the old/new mixed rules file misses.

[ Matthias Klose ]
* Add patch to fix python multiarch issue
* Allow the package to cross-build by tweaking B-Ds on python
* Set PYTHON_LIBS for cross builds

[ Aron Xu ]
* Use correct $CC
* Configure udeb without python
* New round of cherry-picking upstream fixes
  - Includes fixes for CVE-2014-0191 (Closes: #747309).
* Call prename with -vf
* Require python-all-dev (>= 2.7.5-5~)
* Bump std-ver: 3.9.4 -> 3.9.5, no change

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0024-Missing-initialization-for-the-catalog-module.patch
 
1
From: Daniel Veillard <veillard@redhat.com>
 
2
Date: Sun, 26 Jan 2014 15:02:25 +0100
 
3
Subject: Missing initialization for the catalog module
 
4
 
 
5
---
 
6
 parser.c |    3 +++
 
7
 1 file changed, 3 insertions(+)
 
8
 
 
9
diff --git a/parser.c b/parser.c
 
10
index ad400f4..7381a78 100644
 
11
--- a/parser.c
 
12
+++ b/parser.c
 
13
@@ -14720,6 +14720,9 @@ xmlInitParser(void) {
 
14
 #ifdef LIBXML_XPATH_ENABLED
 
15
        xmlXPathInit();
 
16
 #endif
 
17
+#ifdef LIBXML_CATALOG_ENABLED
 
18
+        xmlInitializeCatalog();
 
19
+#endif
 
20
        xmlParserInitialized = 1;
 
21
 #ifdef LIBXML_THREAD_ENABLED
 
22
     }