Reference CVE-2016-4561 in 3.20160506 changelog

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

diff --git a/debian/changelog b/debian/changelog
index 02894877df30737281e6adc8ef0ff8cddd2f9665..c4d4eab46693a6487be3803e43cf898c945976c3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
-ikiwiki (3.20160122) UNRELEASED; urgency=medium
+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
@@ -30,7 +28,10 @@ ikiwiki (3.20160122) UNRELEASED; urgency=medium
   [ Amitai Schlair ]
   * mdwn: Process .md like .mdwn, but disallow web creation.
 
- -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 22:34:04 +0000
+  [ Florian Wagner ]
+  * git: Correctly handle filenames starting with a dash in add/rm/mv.
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:54:26 +0100
 
 ikiwiki (3.20160121) unstable; urgency=medium