Update to 2.9.2

.gitignore

@@ -3,3 +3,4 @@ libxml2-2.7.6.tar.gz
 /libxml2-2.8.0.tar.gz
 /libxml2-2.9.0.tar.gz
 /libxml2-2.9.1.tar.gz
+/libxml2-2.9.2.tar.gz

libxml2-2.9.2-catalog-revert.patch

@@ -0,0 +1,31 @@
+From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@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 | 3 ---
+ 1 file changed, 3 deletions(-)
+
+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
+     }
+-- 
+1.9.3
+

mingw-libxml2.spec

@@ -1,8 +1,8 @@
 %{?mingw_package_header}
 
 Name:           mingw-libxml2
-Version:        2.9.1
-Release:        4%{?dist}
+Version:        2.9.2
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -10,6 +10,10 @@ Group:          Development/Libraries
 URL:            http://xmlsoft.org/
 Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
 
+# Avoid corrupting the xml catalogs
+# https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+Patch0:         libxml2-2.9.2-catalog-revert.patch
+
 # MinGW-specific patches.
 Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
 
@@ -72,7 +76,7 @@ Static version of the MinGW Windows XML processing library.
 
 %prep
 %setup -q -n libxml2-%{version}
-
+%patch0 -p1
 %patch1001 -p0
 
 
@@ -119,6 +123,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_bindir}/xmlcatalog.exe
 %{mingw32_bindir}/xmllint.exe
 %{mingw32_libdir}/libxml2.dll.a
+%{mingw32_libdir}/cmake/libxml2/
 %{mingw32_libdir}/pkgconfig/libxml-2.0.pc
 %{mingw32_libdir}/xml2Conf.sh
 %{mingw32_includedir}/libxml2
@@ -135,6 +140,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw64_bindir}/xmlcatalog.exe
 %{mingw64_bindir}/xmllint.exe
 %{mingw64_libdir}/libxml2.dll.a
+%{mingw64_libdir}/cmake/libxml2/
 %{mingw64_libdir}/pkgconfig/libxml-2.0.pc
 %{mingw64_libdir}/xml2Conf.sh
 %{mingw64_includedir}/libxml2
@@ -145,6 +151,11 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Tue Dec 23 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.9.2-1
+- Update to 2.9.2
+- Avoid corrupting the xml catalogs
+- Fix CVE-2014-0191 (RHBZ #1107557)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

sources

@@ -1 +1 @@
-9c0cfef285d5c4a5c80d00904ddab380  libxml2-2.9.1.tar.gz
+9e6a9aca9d155737868b3dc5fd82f788  libxml2-2.9.2.tar.gz