summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
...
| * status: On crippled filesystems, was displaying M for all annexed files that ↵Gravatar Joey Hess2015-12-19
| | | | | | | | were present. Probably caused by a change to what git status displays in this situation. Fixed by treating files git thinks are modified the same as typechanged files.
| * prep releaseGravatar Joey Hess2015-12-18
| |
* | Merge branch 'master' into smudgeGravatar Joey Hess2015-12-16
|\|
| * improve temp dir securityGravatar Joey Hess2015-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugs.debian.org/807341 * Fix insecure temporary permissions when git-annex repair is used in in a corrupted git repository. Other calls to withTmpDir didn't leak any potentially private data, but repair clones the git repository to a temp directory which is made using the user's umask. Thus, it might expose a git repo that is otherwise locked down. * Fix potential denial of service attack when creating temp dirs. Since withTmpDir used easily predictable temporary directory names, an attacker could create foo.0, foo.1, etc and as long as it managed to keep ahead of it, could prevent it from ever returning. I'd rate this as a low utility DOS attack. Most attackers in a position to do this could just fill up the disk /tmp is on to prevent anything from writing temp files. And few parts of git-annex use withTmpDir anyway, so DOS potential is quite low. Examined all callers of withTmpDir and satisfied myself that switching to mkdtmp and so getting a mode 700 temp dir wouldn't break any of them. Note that withTmpDirIn continues to not force temp dir to 700. But it's only used for temp directories inside .git/annex/wherever/ so that is not a problem. Also re-audited all other uses of temp files and dirs in git-annex.
* | Use git-annex init --version=6 to get v6 for nowGravatar Joey Hess2015-12-15
| | | | | | | | | | Not ready to make it default because of the direct mode upgrade needing to all happen at once.
* | clarifyGravatar Joey Hess2015-12-15
| |
* | add: In v6 mode, acts on modified files.Gravatar Joey Hess2015-12-15
| | | | | | | | | | Same as was done in direct mode, except in v6 mode add always adds files locked, so
* | Merge branch 'master' into smudgeGravatar Joey Hess2015-12-15
|\|
| * Debian: Build depend on concurrent-output.Gravatar Joey Hess2015-12-12
| | | | | | | | In unstable now.
* | Merge branch 'master' into smudgeGravatar Joey Hess2015-12-11
|\|
| * fsck: Failed to honor annex.diskreserve when checking a remote.Gravatar Joey Hess2015-12-11
| |
| * webdav: When testing the WebDAV server, send a file with content. The empty ↵Gravatar Joey Hess2015-12-11
| | | | | | | | file it was sending tickled bugs in some php WebDAV server.
* | v6 git-annex unlockGravatar Joey Hess2015-12-10
| | | | | | | | | | | | | | | | | | | | | | Note that the implementation uses replaceFile, so that the actual replacement of the work tree file is atomic. This seems a good property to have! It would be possible for unlock in v6 mode to be run on files that do not have their content present. However, that would be a behavior change from before, and I don't see any immediate need to support it, so I didn't implement it.
* | Merge branch 'master' into smudgeGravatar Joey Hess2015-12-10
|\|
| * Add S3 features to git-annex version output.Gravatar Joey Hess2015-12-10
| |
* | make clear when code is using deprecated direct mode filesGravatar Joey Hess2015-12-09
| |
* | Merge branch 'master' into smudgeGravatar Joey Hess2015-12-09
|\|
| * prep release5.20151208Gravatar Joey Hess2015-12-08
| |
* | wordingGravatar Joey Hess2015-12-07
| |
* | Merge branch 'master' into smudgeGravatar Joey Hess2015-12-07
|\|
| * fix temp filenameGravatar Joey Hess2015-12-06
| | | | | | | | | | | | | | Was not putting it inside the temp dir, but next to it! This was just wrong, and it led to a longer filename that desired being used, leading to some bug reports.
* | init: Configure .git/info/attributes to use git-annex as a smudge filter.Gravatar Joey Hess2015-12-04
| | | | | | | | | | | | | | | | Note that this changes the default behavior of git add in a newly initialized repository; it will add files to the annex. Don't like that this could break workflows, but it's necessary in order for any pointer files in the repo to be handled by git-annex.
* | add v6; keep v5 working for now and manual upgradeGravatar Joey Hess2015-12-04
|/ | | | | | | | | | | | Since all places where a repo is used in direct mode need to have git-annex upgraded before the repo can safely be converted to v6, the upgrade needs to be manual for now. I suppose that at some point I'll want to drop all the direct mode support code. At that point, will stop supporting v5, and will need to auto-upgrade any remaining v5 repos. If possible, I'd like to carry the direct mode support for say, a year or so, to give people plenty of time to upgrade and avoid disruption.
* dropunused: Make more robust when trying to drop an object that has already ↵Gravatar Joey Hess2015-12-03
| | | | | | | been dropped. Before it crashed trying to lock the not-present content and prevented dropping anything else. Instead, succeed.
* webapp: Fix bugs that could result in a relative path such as "." being ↵Gravatar Joey Hess2015-12-02
| | | | | | | | written to ~/.config/git-annex/autostart and ignore any such relative paths in the file This was a reversion caused by the relative path changes in 5.20150113.
* addurl, importfeed: Changed to honor annex.largefiles settings, when the ↵Gravatar Joey Hess2015-12-02
| | | | | | | | | content of the url is downloaded. (Not when using --fast or --relaxed.) importfeed just calls addurl functions, so inherits this from it. Note that addurl still generates a temp file, and uses that key to download the file. It just adds it to the work tree at the end when the file is small.
* import: Changed to honor annex.largefiles settings.Gravatar Joey Hess2015-12-02
|
* tahoe: Include tahoe capabilities in whereis display.Gravatar Joey Hess2015-11-30
|
* annex object file mode for core.sharedRepositoryGravatar Joey Hess2015-11-18
| | | | | | When core.sharedRepository is set, annex object files are not made mode 444, since that prevents a user other than the file owner from locking them. Instead, a mode such as 664 is used in this case.
* map: Improve display of git remotes with non-ssh urls, including http and ↵Gravatar Joey Hess2015-11-18
| | | | gcrypt.
* Display progress meter in -J mode when downloading from the web.Gravatar Joey Hess2015-11-16
| | | | | Including in addurl, and get --from web, but also in S3 and External special remotes when a web url is known for content in those remotes.
* Display progress meter in -J mode when copying from a local git repo, to a ↵Gravatar Joey Hess2015-11-16
| | | | | | | | | | | | local git repo, and from a remote git repo. Had everything available, just didn't combine the progress meter with the other places progress is sent to update it. (And to a remote repo already did show progress.) Most special remotes should already display progress meters with -J, same as without it. One exception to this is the web, since it relies on wget/curl progress display without -J. Still todo..
* wordingGravatar Joey Hess2015-11-16
|
* BF: standalone debian package -- dh_makeshlibs --noscriptsGravatar Yaroslav Halchenko2015-11-16
| | | | | To avoid creation of unnecessary trigger calling out to ldconfig via activate-noawait which is not present on older releases (e.g. squeeze)
* Build with -j1 again to get reproducible build.Gravatar Joey Hess2015-11-16
| | | | | | | This was in the cabal file earlier, and was removed because it broke the android cross build. Moving to the git-annex target of the Makefile will make it be used for Debian packages etc but not android cross builds or make fast or when users build with cabal.
* typo5.20151116Gravatar Joey Hess2015-11-16
|
* prep releaseGravatar Joey Hess2015-11-16
|
* wordingGravatar Joey Hess2015-11-16
|
* init: Automatically enable annex.pidlock when necessary.Gravatar Joey Hess2015-11-13
|
* pid locking configuration and abstraction layer for git-annexGravatar Joey Hess2015-11-12
| | | | (not actually used anywhere yet)
* assistant: Pass ssh-options through 3 more git pull/push calls that were ↵Gravatar Joey Hess2015-11-10
| | | | | | | missed before. It was used for regular pull, but not for regular push, tagged push, or the fallback fetching.
* display a message in the unlikely scenario of fsking a dead repositoryGravatar Joey Hess2015-11-10
|
* fsck: When fscking a dead repo, avoid incorrect "fixing location log" message.Gravatar Joey Hess2015-11-10
| | | | | keyLocations doesn't return locations in dead repos, but if we're fscking a dead repo, we want to look at what locations are actually logged for it.
* Make git-annex-standalone.deb include the git-annex html documentation, ↵Gravatar Joey Hess2015-11-10
| | | | | | | desktop file, and base completion file, same as the regular git-annex.deb. It already had a doc-base file relating to the html documentation, and there's no reason not to include the other stuff.
* Make the git-annex-standalone.deb prevent runshell from installing wrappers ↵Gravatar Joey Hess2015-11-10
| | | | into $HOME/.ssh
* runshell: Avoid failing when $HOME/.ssh does not exist and cannot be created.Gravatar Joey Hess2015-11-10
|
* quvi may output utf-8 encoded data when the conifigured locale doesn't ↵Gravatar Joey Hess2015-11-09
| | | | support that; avoid crashing on such invalid encoding.
* add: Fix error recovery rollback to not move the injested file content out ↵Gravatar Joey Hess2015-11-06
| | | | | | of the annex back to the file, because other files may point to that same content. Instead, copy the injected file content out to recover. That was not a data loss, but it came close!
* fix replaceFile makeAnnexLink raceGravatar Joey Hess2015-11-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | replaceFile created a temp file, which was guaranteed to not overlap with another temp file. However, makeAnnexLink then deleted that file, in preparation for making the symlink in its place. This caused a race, since some other replaceFile could create a temp file, using the same name! I was able to reproduce the race easily running git-annex add -J10 in a directory with 100 files (all with different contents). Some files would get ingested into the annex, but their annex links would fail to be added. There could be other situations where this same problem could occur. Perhaps when the assistant is adding a file, if the user manually also ran git-annex add. Perhaps in cases not involving adding a file. The new replaceFile makes a temprary directory, which is guaranteed to be unique, and doesn't make a temp file in there. makeAnnexLink can thus create the symlink without problem and the race is avoided. Audited all calls to replaceFile to make sure that the old behavior of providing an empty temp file was not relied on. The general problem of asking for a temp file and deleting it as part of the process of using it could reach beyond replaceFile. Did some quick audits and didn't find other cases of it. Probably only symlink creation stuff would tend to make that mistake, mostly.
* Concurrent progress bars are now displayed when using -J with a command that ↵Gravatar Joey Hess2015-11-06
| | | | moves file contents around.