From: Joey Hess <joey@kitenet.net>
Date: Fri, 3 Jun 2011 16:39:09 +0000 (-0400)
Subject: merged po4a robustness workaround
X-Git-Tag: 3.20110431~17
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3b8fc54717a2c094129278d82f79d36d286718b3?hp=50d2704db6fec29756e930d82aecca67802a063e

merged po4a robustness workaround
---

diff --git a/debian/changelog b/debian/changelog
index fd23ccd8c..feb4cff81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
   * Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
   * po: support language codes in the form of 'es_AR', and 'arn'. (intrigeri)
     Closes: #627844
+  * po: Make po4a warn, not error on a malformed document. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 May 2011 13:02:19 -0400
 
diff --git a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
index 20584e4f4..eba59a682 100644
--- a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
+++ b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
@@ -14,3 +14,9 @@ given ikiwiki site build (DoS) when both the html and po plugins are
 enabled: inserting a html tag without closing it is enough.
 
 --[[intrigeri]]
+
+> Hmm, so this happened while I was away at the beach and I have a big
+> backlog of stuff, only saw it now. I've merged the match for master and
+> will be releasing that soon. I will cherry-pick the fix into at least
+> my debian-stable branch too. I don't know if this is worth doing a whole
+> security advisory for. --[[Joey]]