Merge branch 'master' into debian-jessie-backports

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

diff --git a/debian/changelog b/debian/changelog
index dc405232d28932194ebfc4ada1c2979f9a81358f..29189e25ba75d794ec764363f24ea668154af8a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+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~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports
 ikiwiki (3.20160506~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports


@@ -9,10 +29,8 @@ ikiwiki (3.20160506~bpo8+1) jessie-backports; urgency=medium
 ikiwiki (3.20160506) unstable; urgency=medium
 
   [ Simon McVittie ]
 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
   * 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
   * 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