From 4ee905d7f17f9451f00d763fabf05483a5e874f2 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Sat, 6 Feb 2016 17:04:14 +0100
Subject: [PATCH] Update to 2.9.3

---
 .gitignore                         |  1 +
 libxml2-2.9.2-catalog-revert.patch | 31 ------------------------------
 mingw-libxml2.spec                 | 15 ++++++++-------
 sources                            |  2 +-
 4 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 libxml2-2.9.2-catalog-revert.patch

diff --git a/.gitignore b/.gitignore
index 7ec75b0..9af8829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ libxml2-2.7.6.tar.gz
 /libxml2-2.9.0.tar.gz
 /libxml2-2.9.1.tar.gz
 /libxml2-2.9.2.tar.gz
+/libxml2-2.9.3.tar.gz
diff --git a/libxml2-2.9.2-catalog-revert.patch b/libxml2-2.9.2-catalog-revert.patch
deleted file mode 100644
index b3de004..0000000
--- a/libxml2-2.9.2-catalog-revert.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
diff --git a/mingw-libxml2.spec b/mingw-libxml2.spec
index f39496b..fe2cb99 100644
--- a/mingw-libxml2.spec
+++ b/mingw-libxml2.spec
@@ -1,8 +1,8 @@
 %{?mingw_package_header}
 
 Name:           mingw-libxml2
-Version:        2.9.2
-Release:        3%{?dist}
+Version:        2.9.3
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -10,10 +10,6 @@ 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
 
@@ -76,7 +72,6 @@ Static version of the MinGW Windows XML processing library.
 
 %prep
 %setup -q -n libxml2-%{version}
-%patch0 -p1
 %patch1001 -p0
 
 
@@ -151,6 +146,12 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Sat Feb  6 2016 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.9.3-1
+- Update to 2.9.3
+- Fixes various CVE's:
+  RHBZ #1213960, #1262853, #1262854, #1274225, #1274226, #1276299
+  RHBZ #1276300, #1277149, #1277150, #1281952, #1281953
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index d562ac4..8ad103b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e6a9aca9d155737868b3dc5fd82f788  libxml2-2.9.2.tar.gz
+daece17e045f1c107610e137ab50c179  libxml2-2.9.3.tar.gz