diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +git-annex (5.20140926) unstable; urgency=high + + * Depend on new enough git for --no-gpg-sign to work. Closes: #762446 + * Work around failure to build on mips by using cabal, not Setup, + to build in debian/rules. + + -- Joey Hess Fri, 26 Sep 2014 15:09:02 -0400 + git-annex (5.20140919) unstable; urgency=high * Security fix for S3 and glacier when using embedcreds=yes with diff --git a/debian/cabal-wrapper b/debian/cabal-wrapper new file mode 100644 --- /dev/null +++ b/debian/cabal-wrapper @@ -0,0 +1,16 @@ +#!/bin/sh +# It would be more usual to use: +# export CABAL=./Setup +# But Setup currently has a very bad dependency resolver, and very bad +# debugging output, and tends to eat all memory and die on small buildds. +# +# This should be revisited once Debian has a newer ghc than 7.6.3, +# and hopefully gets the improved dependency resolver from cabal. +set -e + +# Avoid cabal writing to HOME, and avoid local cabal settings +# influencing the build. +HOME=$(mktemp -d) +export HOME + +cabal "$@" diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-annex (5.20140926) unstable; urgency=high + + * Depend on new enough git for --no-gpg-sign to work. Closes: #762446 + * Work around failure to build on mips by using cabal, not Setup, + to build in debian/rules. + + -- Joey Hess Fri, 26 Sep 2014 15:09:02 -0400 + git-annex (5.20140919) unstable; urgency=high * Security fix for S3 and glacier when using embedcreds=yes with diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Build-Depends: debhelper (>= 9), ghc (>= 7.4), + cabal-install, libghc-mtl-dev (>= 2.1.1), libghc-missingh-dev, libghc-data-default-dev, @@ -67,7 +68,7 @@ lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], ikiwiki, perlmagick, - git (>= 1:1.8.4), + git (>= 1:2.0), rsync, wget, curl, diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f -# Avoid using cabal, as it writes to $HOME -export CABAL=./Setup +export CABAL=debian/cabal-wrapper # Do use the changelog's version number, rather than making one up. export RELEASE_BUILD=1 diff --git a/doc/bugs/sync_does_not_preserve_timestamps.mdwn b/doc/bugs/sync_does_not_preserve_timestamps.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/sync_does_not_preserve_timestamps.mdwn @@ -0,0 +1,16 @@ +### Please describe the problem. +I see that files are synced between my computers with git-annex but the timestamps do not match. The one that receives files always puts the current time of file creation on the file. + +### What steps will reproduce the problem? +Install git-annex on two computers. Connect with XMPP. Then add cloud storage with shared encryption for transferring files. Since you want also backup, choose "full backup" as the type of cloud storage. + + +### What version of git-annex are you using? On what operating system? +Downloaded binary package dated 13/09/2014 amd64 Ubuntu 14.04. + + +### Please provide any additional information below. + +Files are in sync. For example, I move a file from a directory to my synced annex directory. It contains timestamp of 01/01/2010 for example. Once the file gets transferred to the remote computer, it gets current time, for example 20/09/2014 rather than keeping 01/01/2010. + +All computers are linux based, ext4 filesystems. File transfers are done through shared encryption rsync remote. diff --git a/doc/forum/.mdwn b/doc/forum/.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/.mdwn @@ -0,0 +1,3 @@ +http://stackoverflow.com/questions/26041704/removing-repository-in-git-annex + +Does anyone know a solution for this? diff --git a/doc/forum/Direct_Mode_-_Restore_file_from_Full_Backup_Repository__63__.mdwn b/doc/forum/Direct_Mode_-_Restore_file_from_Full_Backup_Repository__63__.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/Direct_Mode_-_Restore_file_from_Full_Backup_Repository__63__.mdwn @@ -0,0 +1,14 @@ +Hi, I'm using the webapp and created a repository on my local computer. Then I created another remote repository (encrypted remote with gcrypt), this remote repository is selected as type "full backup". + +I've added some files to the local repository, then changed some of them and watched the sync happen. Then I deleted some files, and these also get synced to the remote. + +Now, how can I recover those files from the foreign repo, using the webapp or the command line? I could not find any solution. + +I tried: +git log --diff-filter=D --summary +and then +git checkout 488408bfcd58eced685d9e3ca5daf55250850f5d -- . +to recover the file listed in this remote but got the following response: +fatal: This operation must be run in a work tree + +What do I miss and how does the "Restore" part work when using "full backup" remote repository? diff --git a/doc/forum/XMPP_problem_behind_router.mdwn b/doc/forum/XMPP_problem_behind_router.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/XMPP_problem_behind_router.mdwn @@ -0,0 +1,3 @@ +I'm trying to configure a jabber account for use with git-annex, but it seems that something's wrong as soon as I try to go through my router (wired or wireless). Compared to directly connecting to my modem, wireshark shows a lot of TCP retransmissions, eventually resulting in "Unable to connect to the Jabber server. Maybe you entered the wrong password? (Error message: host gmail.com:5222 failed: connect: timeout (Connection timed out))" in the webapp. + +I've tried to configure the account both in the webapp and manually in the .git/annex/creds/xmpp file, but it doesn't seem to make a difference. It's able to connect if I directly connect it to my modem, so I'm fairly sure it's not a problem at my computer or with the credentials. It doesn't appear to be a problem at the firewall on the router, but I could certainly be missing something. Are there some other tests I could try to narrow down the problem? diff --git a/doc/install/OSX/comment_9_f11f726d1fee3c4c91f3c984e792037d._comment b/doc/install/OSX/comment_9_f11f726d1fee3c4c91f3c984e792037d._comment new file mode 100644 --- /dev/null +++ b/doc/install/OSX/comment_9_f11f726d1fee3c4c91f3c984e792037d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc" + nickname="Matthias" + subject="Why different versions?" + date="2014-09-23T10:59:32Z" + content=""" +Why are there different versions for 10.7, 10.8, 10.9 anyway? Is it not possible to produce an executable compatible with all these? I mean, it's the same architecture and executable format, not? I guess there has to be a reason, explanations are welcome :-) +"""]] diff --git a/doc/news/version_5.20140717.mdwn b/doc/news/version_5.20140717.mdwn deleted file mode 100644 --- a/doc/news/version_5.20140717.mdwn +++ /dev/null @@ -1,28 +0,0 @@ -git-annex 5.20140717 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Fix minor FD leak in journal code. Closes: #[754608](http://bugs.debian.org/754608) - * direct: Fix handling of case where a work tree subdirectory cannot - be written to due to permissions. - * migrate: Avoid re-checksumming when migrating from hashE to hash backend. - * uninit: Avoid failing final removal in some direct mode repositories - due to file modes. - * S3: Deal with AWS ACL configurations that do not allow creating or - checking the location of a bucket, but only reading and writing content to - it. - * resolvemerge: New plumbing command that runs the automatic merge conflict - resolver. - * Deal with change in git 2.0 that made indirect mode merge conflict - resolution leave behind old files. - * sync: Fix git sync with local git remotes even when they don't have an - annex.uuid set. (The assistant already did so.) - * Set gcrypt-publish-participants when setting up a gcrypt repository, - to avoid unncessary passphrase prompts. - This is a security/usability tradeoff. To avoid exposing the gpg key - ids who can decrypt the repository, users can unset - gcrypt-publish-participants. - * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet - exist, since it is not automatically created for Gnome 3 users. - * Windows: Move .vbs files out of git\bin, to avoid that being in the - PATH, which caused some weird breakage. (Thanks, divB) - * Windows: Fix locking issue that prevented the webapp starting - (since 5.20140707)."""]] diff --git a/doc/news/version_5.20140926.mdwn b/doc/news/version_5.20140926.mdwn new file mode 100644 --- /dev/null +++ b/doc/news/version_5.20140926.mdwn @@ -0,0 +1,5 @@ +git-annex 5.20140926 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Depend on new enough git for --no-gpg-sign to work. Closes: #[762446](http://bugs.debian.org/762446) + * Work around failure to build on mips by using cabal, not Setup, + to build in debian/rules."""]] diff --git a/doc/thanks.mdwn b/doc/thanks.mdwn --- a/doc/thanks.mdwn +++ b/doc/thanks.mdwn @@ -6,6 +6,14 @@ (If I got your name wrong, or you don't want it publically posted here, email .) +## 2014-2015 + +NSF logo + +git-annex development is partially supported by the +[NSF](https://www.nsf.gov/) as a part of the +[DataGit project](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1429999). + ## 2013-2014 Continued git-annex development was [crowd funded](https://campaign.joeyh.name/) diff --git a/doc/todo/webapp_nudge_when_less_than_numcopies_clones.mdwn b/doc/todo/webapp_nudge_when_less_than_numcopies_clones.mdwn new file mode 100644 --- /dev/null +++ b/doc/todo/webapp_nudge_when_less_than_numcopies_clones.mdwn @@ -0,0 +1,7 @@ +Currently, nothing stops a user from setting up ~/annex, adding some special remote, and never once ending up with a clone of their repository, so there is really no backup of the repository as a whole, despite the special remotes. + +Potentially adding to the confusion, they might have remotes in repository groups "full backup" or "backup", and so think everything is backed up. + +Webapp could count the number of known remote uuids that are not special remotes, and require there to be at least numcopies of them (excluding the current repo I suppose), and pop up a nudge with a button that presents the various available ways to make a non-special remote. + +Working out if a remote uuid is a special remote is probably the hard bit. A special remote will be listed in uuid.log, with a type other than gcrypt or git. Any other uuid, that is not dead, can count as 1 clone. This does not handle git remotes that are not using git-annex (eg github), so it could also look through the git remote list and count any that don't have an annex-uuid. diff --git a/git-annex.cabal b/git-annex.cabal --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140919 +Version: 5.20140926 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess