From 6e3a17f7dd458e591a7a4d1fa5328ea15a677b45 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Wed, 23 May 2012 22:21:18 +0200
Subject: [PATCH] Update to 2.8.0

---
 .gitignore                            |  1 +
 libxml2-2.7.7-xpath-double-free.patch | 22 ----------------------
 libxml2-gnome-bug-561340-fix.patch    | 11 -----------
 mingw-libxml2.spec                    | 21 ++++++---------------
 sources                               |  2 +-
 5 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 libxml2-2.7.7-xpath-double-free.patch
 delete mode 100644 libxml2-gnome-bug-561340-fix.patch

diff --git a/.gitignore b/.gitignore
index a9e0040..7f698ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libxml2-2.7.6.tar.gz
 /libxml2-2.7.8.tar.gz
+/libxml2-2.8.0.tar.gz
diff --git a/libxml2-2.7.7-xpath-double-free.patch b/libxml2-2.7.7-xpath-double-free.patch
deleted file mode 100644
index c5dbbee..0000000
--- a/libxml2-2.7.7-xpath-double-free.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/xpath.c	
-+++ a/xpath.c	
-@@ -11763,11 +11763,16 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 
- 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
- 	        xmlXPathObjectPtr tmp;
--		/* pop the result */
-+		/* pop the result if any */
- 		tmp = valuePop(ctxt);
--		xmlXPathReleaseObject(xpctxt, tmp);
--		/* then pop off contextObj, which will be freed later */
--		valuePop(ctxt);
-+                if (tmp != contextObj) {
-+                    /*
-+                     * Free up the result
-+                     * then pop off contextObj, which will be freed later
-+                     */
-+                    xmlXPathReleaseObject(xpctxt, tmp);
-+                    valuePop(ctxt);
-+                }
- 		goto evaluation_error;
- 	    }
diff --git a/libxml2-gnome-bug-561340-fix.patch b/libxml2-gnome-bug-561340-fix.patch
deleted file mode 100644
index 30aa5c4..0000000
--- a/libxml2-gnome-bug-561340-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libxml/xmlexports.h.orig	2010-10-12 08:25:32.000000000 +0200
-+++ include/libxml/xmlexports.h	2012-01-06 20:12:26.553304833 +0100
-@@ -115,7 +115,7 @@
-    */
-   #if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
-     #define XMLPUBFUN __declspec(dllexport)
--    #define XMLPUBVAR __declspec(dllexport)
-+    #define XMLPUBVAR __declspec(dllexport) extern
-   #else
-     #define XMLPUBFUN
-     #if !defined(LIBXML_STATIC)
diff --git a/mingw-libxml2.spec b/mingw-libxml2.spec
index c4be53b..8301cc0 100644
--- a/mingw-libxml2.spec
+++ b/mingw-libxml2.spec
@@ -1,11 +1,8 @@
-%?mingw_package_header
-
-%global mingw_build_win32 1
-%global mingw_build_win64 1
+%{?mingw_package_header}
 
 Name:           mingw-libxml2
-Version:        2.7.8
-Release:        7%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -13,16 +10,9 @@ Group:          Development/Libraries
 URL:            http://xmlsoft.org/
 Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
 
-# Not required for MinGW.
-#Patch0:         libxml2-multilib.patch
-Patch2:         libxml2-2.7.7-xpath-double-free.patch
-
 # MinGW-specific patches.
 Patch1001:      mingw32-libxml2-static-build-compile-fix.patch
 
-# Patch is needed to get DTD validation working (GNOME BZ #663588)
-Patch1002:      libxml2-gnome-bug-561340-fix.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -83,9 +73,7 @@ Static version of the MinGW Windows XML processing library.
 %prep
 %setup -q -n libxml2-%{version}
 
-%patch2 -p1 -b .CVE-2010-4494
 %patch1001 -p0
-%patch1002 -p0
 
 
 %build
@@ -160,6 +148,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Wed May 23 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.8.0-1
+- Update to 2.8.0
+
 * Sat Mar 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.7.8-7
 - Added win64 support
 
diff --git a/sources b/sources
index 4e904ff..caedfc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8127a65e8c3b08856093099b52599c86  libxml2-2.7.8.tar.gz
+c62106f02ee00b6437f0fb9d370c1093  libxml2-2.8.0.tar.gz