From: Simon McVittie <smcv@debian.org>
Date: Fri, 6 May 2016 07:56:29 +0000 (+0100)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20160506_bpo8+1~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fb2e00014da40d677f79b6b07e05ae821e7e10e5?hp=--cc

Merge branch 'master' into debian-jessie-backports
---

fb2e00014da40d677f79b6b07e05ae821e7e10e5
diff --cc debian/changelog
index 02cb5c67a,96fef00cd..0eea2dbca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,40 +1,46 @@@
+ 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)
+   * 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
+ 
+   [ Joey Hess ]
+   * img: Add back support for SVG images, bypassing ImageMagick and
+     simply passing the SVG through to the browser, which is supported by all
+     commonly used browsers these days.
+     SVG scaling by img directives has subtly changed; where before
+     size=wxh would preserve aspect ratio, this cannot be done when passing
+     them through and so specifying both a width and height can change
+     the SVG's aspect ratio.
+   * loginselector: When only openid and emailauth are enabled, but
+     passwordauth is not, avoid showing a "Other" box which opens an
+     empty form.
+ 
+   [ Amitai Schlair ]
+   * mdwn: Process .md like .mdwn, but disallow web creation.
+ 
+   [ 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~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 10:18:07 +0000
 +
  ikiwiki (3.20160121) unstable; urgency=medium
  
    [ Amitai Schlair ]