Fix XSS in openid selector. Thanks, Raghav Bisht.

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9cec632606359a435c7445c677e1d7cc31473bdd..2692de13a2460ae2d8167c71297093bc2ba1d472 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-ikiwiki (3.20141016.1) UNRELEASED; urgency=medium
+ikiwiki (3.20141016.2) UNRELEASED; urgency=high
+
+  [ Joey Hess ]
+  * Fix XSS in openid selector. Thanks, Raghav Bisht.
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 29 Mar 2015 22:28:15 +0100
+
+ikiwiki (3.20141016.1) unstable; urgency=medium
+
+  * Backport selected commits for Debian 8:
 
   [ Joey Hess ]
   * Add missing build-depends on libcgi-formbuilder-perl, needed for
-    t/relativity.t
+    t/relativity.t if libipc-run-perl is also installed
+    (buildds are unaffected by this)
   * Set Debian package maintainer to Simon McVittie as I'm retiring from
     Debian.
 
@@ -13,8 +23,9 @@ ikiwiki (3.20141016.1) UNRELEASED; urgency=medium
   [ Simon McVittie ]
   * Work around imagemagick Debian bug #771047 by using a non-blank SVG
     for the regression test, to avoid FTBFS in current unstable
+    if inkscape is installed (buildds are unaffected by this)
 
- -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
+ -- Simon McVittie <smcv@debian.org>  Wed, 07 Jan 2015 11:08:35 +0000
 
 ikiwiki (3.20141016) unstable; urgency=medium