X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9fe33a4c946313f5929e9b52809c7aae35502785..ec371adab1109b338a3de473298b41140ec5017e:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 96fef00cd..e721f167f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,35 @@
+ikiwiki (3.20160510) UNRELEASED; urgency=medium
+
+  * wrappers: allocate new environment dynamically, so we won't overrun
+    the array if third-party plugins add multiple environment variables.
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 11 May 2016 09:15:51 +0100
+
+ikiwiki (3.20160509) unstable; urgency=high
+
+  [ Amitai Schlair ]
+  * img: ignore the case of the extension when detecting image format,
+    fixing the regression that *.JPG etc. would not be displayed
+    since 3.20160506
+
+  [ Simon McVittie ]
+  * img: parse img_allowed_formats case-insensitively, as was done in
+    3.20141016.3
+  * inline: restore backwards compat for show=-1 syntax, which
+    worked before 3.20160121
+  * Remove a spurious changelog entry from 3.20160506 (the relevant
+    change was already in 3.20150614)
+  * Add CVE-2016-4561 reference to 3.20160506 changelog
+  * Set high urgency to get the CVE-2016-4561 fix and CVE-2016-3714
+    mitigation into testing
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 21:57:09 +0100
+
 ikiwiki (3.20160506) unstable; urgency=medium
 
   [ Simon McVittie ]
-  * img: stop ImageMagick trying to be clever if filenames contain a colon,
-    avoiding mis-processing
   * HTML-escape error messages, in one case avoiding potential cross-site
-    scripting (OVE-20160505-0012)
+    scripting (CVE-2016-4561, OVE-20160505-0012)
   * Mitigate ImageMagick vulnerabilities such as CVE-2016-3714:
     - img: force common Web formats to be interpreted according to extension,
       so that "allowed_attachments: '*.jpg'" does what one might expect