gcrypt, bup: Fix bug that prevented using these special remotes with encryption=pubkey.

I think both of these are all that's affected, but I went ahead and fixed
all the remotes that set their config to M.empty to instead store the
actual config. Who knows what will expect it to be actually present in
future, the Remote instance of getGpgEncParams came to..

Remote/Directory.hs

@@ -56,7 +56,7 @@ gen r u c gc = do
 			whereisKey = Nothing,
 			remoteFsck = Nothing,
 			repairRepo = Nothing,
-			config = M.empty,
+			config = c,
 			repo = r,
 			gitconfig = gc,
 			localpath = Just dir,

Remote/Git.hs

@@ -120,7 +120,7 @@ gen r u c gc
 			, repairRepo = if Git.repoIsUrl r
 				then Nothing
 				else Just $ repairRemote r
-			, config = M.empty
+			, config = c
 			, localpath = localpathCalc r
 			, repo = r
 			, gitconfig = gc

Remote/Hook.hs

@@ -54,7 +54,7 @@ gen r u c gc = do
 			whereisKey = Nothing,
 			remoteFsck = Nothing,
 			repairRepo = Nothing,
-			config = M.empty,
+			config = c,
 			localpath = Nothing,
 			repo = r,
 			gitconfig = gc,

Remote/Rsync.hs

@@ -81,7 +81,7 @@ gen r u c gc = do
 			, whereisKey = Nothing
 			, remoteFsck = Nothing
 			, repairRepo = Nothing
-			, config = M.empty
+			, config = c
 			, repo = r
 			, gitconfig = gc
 			, localpath = if islocal

Remote/Web.hs

@@ -58,7 +58,7 @@ gen r _ _ gc =
 		whereisKey = Just getUrls,
 		remoteFsck = Nothing,
 		repairRepo = Nothing,
-		config = M.empty,
+		config = c,
 		gitconfig = gc,
 		localpath = Nothing,
 		repo = r,

debian/changelog

@@ -4,6 +4,8 @@ git-annex (4.20131102) UNRELEASED; urgency=low
     the pairing process separately.
   * sync: Work even when the local git repository is new and empty,
     with no master branch.
+  * gcrypt, bup: Fix bug that prevented using these special remotes
+    with encryption=pubkey.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 02 Nov 2013 14:54:36 -0400