diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-10 13:32:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-10 13:32:11 -0400 |
| commit | 4272eb7fe8628913e33e44dbce2cf7e52e1975cf (patch) | |
| tree | daa7a494744bee481a9ee814591a1fce25f56288 | |
| parent | c342a5e82272117fd1fcefad474026d9a5ea6c7e (diff) | |
| parent | e5b6f5b5f69ed5a76802e664c74870bc99f065e8 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | Build/BundledPrograms.hs | 5 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/assistant/release_notes.mdwn | 8 | ||||
| -rw-r--r-- | doc/devblog/day_149__signal.mdwn | 2 |
5 files changed, 19 insertions, 1 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index d1f8cfd4a..dd78994b0 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -45,7 +45,12 @@ bundledPrograms = catMaybes #endif , SysConfig.gpg , ifset SysConfig.curl "curl" +#ifndef darwin_HOST_OS + -- wget on OSX has been problimatic, looking for certs in the wrong + -- places. Don't ship it, use curl or the OSX's own wget if it has + -- one. , ifset SysConfig.wget "wget" +#endif , ifset SysConfig.bup "bup" , SysConfig.lsof , SysConfig.gcrypt @@ -140,7 +140,7 @@ OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle osxapp: Build/Standalone Build/OSXMkLibs $(MAKE) git-annex - rm -rf "$(OSXAPP_DEST)" + rm -rf "$(OSXAPP_DEST)" "$(OSXAPP_BASE)" install -d tmp/build-dmg cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)" diff --git a/debian/changelog b/debian/changelog index 996f0ef04..f5cfb995e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ git-annex (5.20140406) UNRELEASED; urgency=medium * importfeed: Filename template can now contain an itempubdate variable. Needs feed 0.3.9.2. + * Remove wget from OSX dmg, due to issues with cert paths that broke + git-annex automatic upgrading. Instead, curl is used, unless the + OSX system has wget installed, which will then be used. -- Joey Hess <joeyh@debian.org> Mon, 07 Apr 2014 16:22:02 -0400 diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn index 13b7c62ab..7f13ce9e1 100644 --- a/doc/assistant/release_notes.mdwn +++ b/doc/assistant/release_notes.mdwn @@ -1,3 +1,11 @@ +## version 5.20140406 + +Automatic upgrading was broken on OSX for previous versions. This has been +fixed, but you'll need to manually upgrade to this version to get it going +again. (Note that the fix is currently only available in the daily builds, +not a released version.) Workaround: Remove the wget bundled inside the +git-annex dmg. + ## version 5.20140221 The Windows port of the assistant and webapp is now considered to be beta diff --git a/doc/devblog/day_149__signal.mdwn b/doc/devblog/day_149__signal.mdwn index 6a085b1e0..7327c679c 100644 --- a/doc/devblog/day_149__signal.mdwn +++ b/doc/devblog/day_149__signal.mdwn @@ -1,3 +1,5 @@ +[[!meta title="day 150 signal"]] + The git-remote-daemon now robustly handles loss of signal, with reconnection backoffs. And it detects if the remote ssh server has a too old version of git-annex-shell and the webapp will display a warning |