X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ad04dac19b1fbba33cbb7dadb17ae0ef0423b2e1..9e03c002028b8187780835bdc58794a47e2dbdba:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c7d193825..99081bcb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,26 @@
-ikiwiki (3.20161220) UNRELEASED; urgency=medium
+ikiwiki (3.20161229.1) unstable; 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:46:24 +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.
-    (OVE-20161226-0001)
-  * Security: try revert operations 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. The incomplete fix released in
-    3.20161219 was not effective for git versions prior to 2.8.0rc0.
-    (CVE-2016-10026 represents the original vulnerability)
-    (OVE-20161226-0002 represents the incomplete fix released in 3.20161219)
+    (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
@@ -21,7 +30,7 @@ ikiwiki (3.20161220) UNRELEASED; urgency=medium
   * git: do not fail to commit changes with a recent git version
     and an anonymous committer
 
- -- Simon McVittie <smcv@debian.org>  Wed, 21 Dec 2016 13:03:07 +0000
+ -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 17:36:15 +0000
 
 ikiwiki (3.20161219) unstable; urgency=medium