mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removed bundled gpg from the Linux standalone build and OSX dmg

Browse source 
Because gpg now always wants to use gpg-agent, and shipping such a daemon
in those is not a good idea.
This commit is contained in:
Joey Hess 2019-03-18 16:31:07 -04:00
parent c96e623343
commit 258e8f8f29
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Build/BundledPrograms.hs
View file

@ -24,14 +24,6 @@ bundledPrograms = preferredBundledPrograms ++ extraBundledPrograms
-}
extraBundledPrograms :: [FilePath]
extraBundledPrograms = catMaybes
-- The system gpg is probably better, because it may better
-- integrate with the system gpg-agent, etc.
-- On Windows, gpg is bundled with git for windows.
#ifndef mingw32_HOST_OS
[ BuildInfo.gpg
#else
[
#endif
#ifndef darwin_HOST_OS
#ifndef mingw32_HOST_OS
-- OS X has ssh installed by default.