Bug#689911: unblock: libxml2/2.8.0+dfsg1-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libxml2/2.8.0+dfsg1-6
This version fixes RC bug #676210 by cherry picking an upstream post
release commit.
diff -Nru libxml2-2.8.0+dfsg1/debian/changelog
libxml2-2.8.0+dfsg1/debian/changelog
--- libxml2-2.8.0+dfsg1/debian/changelog 2012-07-22 20:48:05.000000000 +0800
+++ libxml2-2.8.0+dfsg1/debian/changelog 2012-10-07 14:20:32.000000000 +0800
@@ -1,3 +1,14 @@
+libxml2 (2.8.0+dfsg1-6) unstable; urgency=low
+
+ [ Daniel Veillard ]
+ * Fix a failure to report xmlreader parsing failures
+ Closes: #676210.
+
+ [ Aron Xu ]
+ * Add gbp.conf for wheezy branch.
+
+ -- Aron Xu <aron@debian.org> Sun, 07 Oct 2012 14:18:59 +0800
+
libxml2 (2.8.0+dfsg1-5) unstable; urgency=low
[ Daniel Veillard ]
diff -Nru libxml2-2.8.0+dfsg1/debian/gbp.conf
libxml2-2.8.0+dfsg1/debian/gbp.conf
--- libxml2-2.8.0+dfsg1/debian/gbp.conf 1970-01-01 08:00:00.000000000 +0800
+++ libxml2-2.8.0+dfsg1/debian/gbp.conf 2012-10-07 14:17:51.000000000 +0800
@@ -0,0 +1,4 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = wheezy
+upstream-tag = %(version)s
diff -Nru libxml2-2.8.0+dfsg1/debian/patches/0005-Fix-a-failure-to-report-xmlreader-parsing-failures.patch
libxml2-2.8.0+dfsg1/debian/patches/0005-Fix-a-failure-to-report-xmlreader-parsing-failures.patch
--- libxml2-2.8.0+dfsg1/debian/patches/0005-Fix-a-failure-to-report-xmlreader-parsing-failures.patch 1970-01-01
08:00:00.000000000 +0800
+++ libxml2-2.8.0+dfsg1/debian/patches/0005-Fix-a-failure-to-report-xmlreader-parsing-failures.patch 2012-10-07
14:16:14.000000000 +0800
@@ -0,0 +1,29 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Wed, 18 Jul 2012 17:39:56 +0800
+Subject: Fix a failure to report xmlreader parsing failures
+
+Related to https://bugzilla.gnome.org/show_bug.cgi?id=654567
+the problem is that the provided patch failed to raise an error
+on xmlTextReaderRead() return when an actual parsing error occured
+---
+ xmlreader.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xmlreader.c b/xmlreader.c
+index 77ac71b..10417ee 100644
+--- a/xmlreader.c
++++ b/xmlreader.c
+@@ -907,8 +907,11 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) {
+ }
+ }
+ reader->state = oldstate;
+- if (reader->ctxt->wellFormed == 0)
++ if (reader->ctxt->wellFormed == 0) {
+ reader->mode = XML_TEXTREADER_MODE_EOF;
++ return(-1);
++ }
++
+ return(0);
+ }
+
+--
diff -Nru libxml2-2.8.0+dfsg1/debian/patches/series
libxml2-2.8.0+dfsg1/debian/patches/series
--- libxml2-2.8.0+dfsg1/debian/patches/series 2012-07-22
20:48:05.000000000 +0800
+++ libxml2-2.8.0+dfsg1/debian/patches/series 2012-10-07
14:16:14.000000000 +0800
@@ -2,3 +2,4 @@
0002-modify-xml2-config-and-pkgconfig-behaviour.patch
0003-Fix-parser-local-buffers-size-problems.patch
0004-Fix-entities-local-buffers-size-problems.patch
+0005-Fix-a-failure-to-report-xmlreader-parsing-failures.patch
--
Regards,
Aron Xu
Reply to: