git: Do not disable commit hook for temporary working tree

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

diff --git a/debian/changelog b/debian/changelog
index 6a3cb77c61fcea0f5fa65e2a7ba6a3b58065f935..22b79af0f3e1f7b87ea65e7e9af676da72bbfaba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,16 @@
-ikiwiki (3.20120629.3) UNRELEASED; urgency=medium
+ikiwiki (3.20120629.2+deb7u1) wheezy-security; urgency=medium

 
   * HTML-escape error messages, in one case avoiding potential cross-site
     scripting (CVE-2016-4561, OVE-20160505-0012)
 
   * HTML-escape error messages, in one case avoiding potential cross-site
     scripting (CVE-2016-4561, OVE-20160505-0012)

-  * Update img plugin to version 3.20160506 to mitigate ImageMagick
+  * Update img plugin to version 3.20160509 to mitigate ImageMagick

     vulnerabilities, including remote code execution (CVE-2016-3714):
     - Never convert SVG images to PNG; simply pass them through to the
       browser. This prevents exploitation of any ImageMagick SVG coder
       vulnerabilities. (joeyh)
     - Do not resize image formats other than JPEG, PNG, GIF unless
       specifically configured to do so. This prevents exploitation
     vulnerabilities, including remote code execution (CVE-2016-3714):
     - Never convert SVG images to PNG; simply pass them through to the
       browser. This prevents exploitation of any ImageMagick SVG coder
       vulnerabilities. (joeyh)
     - Do not resize image formats other than JPEG, PNG, GIF unless
       specifically configured to do so. This prevents exploitation

-      of any vulnerabilities in less common coders, such as MVG. (smcv)
+      of any vulnerabilities in less common coders, such as MVG.
+      (schmonz, smcv)

     - Do not resize JPEG, PNG, GIF, PDF images if their extensions do
       not match their "magic numbers", because wiki admins might try to
       restrict attachments by extension, but ImageMagick can base its
     - Do not resize JPEG, PNG, GIF, PDF images if their extensions do
       not match their "magic numbers", because wiki admins might try to
       restrict attachments by extension, but ImageMagick can base its


@@ -27,8 +28,9 @@ ikiwiki (3.20120629.3) UNRELEASED; urgency=medium
     - Handle filenames containing a colon correctly (smcv)
   * Add t/img.t regression test also taken from version 3.20160506
     (chrysn, joeyh, schmonz, smcv)
     - Handle filenames containing a colon correctly (smcv)
   * Add t/img.t regression test also taken from version 3.20160506
     (chrysn, joeyh, schmonz, smcv)

+  * debian/tests: add metadata to run the img test as an autopkgtest

 
 

- -- Simon McVittie <smcv@debian.org>  Sun, 08 May 2016 15:33:51 +0100
+ -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 22:38:35 +0100

 
 ikiwiki (3.20120629.2) wheezy; urgency=medium
 
 
 ikiwiki (3.20120629.2) wheezy; urgency=medium