From b5d21e884c6cbc6df3fcd5c27b352fb17bc5fb16 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 28 Feb 2017 13:28:34 -0400 Subject: [PATCH] release prep --- CHANGELOG | 12 ++++++------ NEWS | 12 ++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c7b3b97230..8a0adff794 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -git-annex (6.20170215) UNRELEASED; urgency=medium +git-annex (6.20170228) UNRELEASED; urgency=medium * Cryptographically secure hashes can be forced to be used in a repository, by setting annex.securehashesonly. @@ -38,8 +38,6 @@ git-annex (6.20170215) UNRELEASED; urgency=medium * config group groupwanted numcopies schedule wanted required: Avoid displaying extraneous messages about repository auto-init, git-annex branch merging, etc, when being used to get information. - * git-annex.cabal: Make crypto-api a dependency even when built w/o - webapp and test suite. * adjust: Fix behavior when used in a repository that contains submodules. * Run wget with -nv instead of -q, so it will display HTTP errors. @@ -49,13 +47,15 @@ git-annex (6.20170215) UNRELEASED; urgency=medium to wget, since curl is able to display only errors to stderr, unlike wget. * status: Pass --ignore-submodules=when option on to git status. - * Removed support for building with the old cryptohash library. - Building with that library made git-annex not support SHA3; it's time - for that to always be supported in case SHA2 dominoes. * config --set: As well as setting value in git-annex branch, set local gitconfig. This is needed especially for annex.securehashesonly, which is read only from local gitconfig and not the git-annex branch. + * Removed support for building with the old cryptohash library. + Building with that library made git-annex not support SHA3; it's time + for that to always be supported in case SHA2 dominoes. + * git-annex.cabal: Make crypto-api a dependency even when built w/o + webapp and test suite. -- Joey Hess Tue, 14 Feb 2017 15:54:25 -0400 diff --git a/NEWS b/NEWS index 5af1aa12c5..a80cbf0136 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +git-annex (6.20170228) UNRELEASED; urgency=medium + + This version of git-annex has mitigations for SHA1 hash collision + problems. + + A new annex.securehashesonly configuration, when used in combination with + signed git commits, avoids potential hash collision problems in git-annex + repositories. For details, see this web page: + + + -- Joey Hess Tue, 28 Feb 2017 13:28:50 -0400 + git-annex (6.20170101) unstable; urgency=medium XMPP support has been removed from the assistant in this release.