X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0fe2ff857923c3d49cab2a19454a81cba2e6689a..d092b0b77701a4c5cd9c8464b774a6a1da1f02cd:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index d6c7311e5..7eb10caf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,38 @@
-ikiwiki (3.20160906) UNRELEASED; urgency=medium
+ikiwiki (3.20161229.1) UNRELEASED; urgency=medium
+
+  * git: Attribute reverts to the user doing the revert, not the wiki
+    itself.
+  * git: Do not disable the commit hook while preparing a revert.
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 20:35:51 +0000
+
+ikiwiki (3.20161229) unstable; urgency=medium
+
+  * Security: force CGI::FormBuilder->field to scalar context where
+    necessary, avoiding unintended function argument injection
+    analogous to CVE-2014-1572. In ikiwiki this could be used to
+    forge commit metadata, but thankfully nothing more serious.
+    (CVE-2016-9646)
+  * Security: try revert operations in a temporary working tree before
+    approving them. Previously, automatic rename detection could result in
+    a revert writing outside the wiki srcdir or altering a file that the
+    reverting user should not be able to alter, an authorization bypass.
+    (CVE-2016-10026 represents the original vulnerability.)
+    The incomplete fix released in 3.20161219 was not effective for git
+    versions prior to 2.8.0rc0.
+    (CVE-2016-9645 represents that incomplete solution.)
+  * Add CVE references for CVE-2016-10026
+  * Add automated test for using the CGI with git, including
+    CVE-2016-10026
+    - Build-depend on libipc-run-perl for better build-time test coverage
+  * Add missing ikiwiki.setup for the manual test for CVE-2016-10026
+  * git: don't issue a warning if the rcsinfo CGI parameter is undefined
+  * git: do not fail to commit changes with a recent git version
+    and an anonymous committer
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 17:36:15 +0000
+
+ikiwiki (3.20161219) unstable; urgency=medium
 
   [ Joey Hess ]
   * inline: Prevent creating a file named ".mdwn" when the
@@ -8,13 +42,13 @@ ikiwiki (3.20160906) UNRELEASED; urgency=medium
   * Security: tell `git revert` not to follow renames. If it does, then
     renaming a file can result in a revert writing outside the wiki srcdir
     or altering a file that the reverting user should not be able to alter,
-    an authorization bypass. Thanks, intrigeri
+    an authorization bypass. Thanks, intrigeri. (CVE-2016-10026)
   * cgitemplate: remove some dead code. Thanks, blipvert
   * Restrict CSS matches against header class to not break
     Pandoc tables with header rows. Thanks, karsk
   * Make pagestats output more deterministic. Thanks, intrigeri
 
- -- Joey Hess <id@joeyh.name>  Wed, 21 Sep 2016 13:48:32 -0400
+ -- Simon McVittie <smcv@debian.org>  Mon, 19 Dec 2016 20:34:23 +0000
 
 ikiwiki (3.20160905) unstable; urgency=medium