From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 6 May 2016 00:18:38 +0000 (-0400)
Subject: changelog for smcv's security fixes
X-Git-Tag: 3.20160506~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7ff6221ac9ef5164c9b5ab6cd7d16af91ef0871b

changelog for smcv's security fixes

[smcv: omit a change that was already in 3.20160514]
---

diff --git a/debian/changelog b/debian/changelog
index ea77c6e3d..d5f2eca25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,17 @@
 ikiwiki (3.20160122) UNRELEASED; 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)
+  * 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
+    - img: restrict to JPEG, PNG and GIF images by default, again mitigating
+      CVE-2016-3714 and similar vulnerabilities
+    - img: check that the magic number matches what we would expect from
+      the extension before giving common formats to ImageMagick
   * d/control: use https for Homepage
   * d/control: add Vcs-Browser