From 353d2f0877d6ed3ea2363f537ee269260d074fda Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 20 Sep 2022 01:03:49 +0100
Subject: [PATCH] Sync gpg-agent changes with origin/master.

---
 .bash_profile | 3 +++
 .ssh/config   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.bash_profile b/.bash_profile
index 3609b12..f1cb60d 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -15,6 +15,9 @@ hash lesspipe >/dev/null 2>&1 && eval "$(SHELL=/bin/sh lesspipe)"
 # Platform specific set up.
 PLATFORM="$(uname -s)"
 if [[ "$PLATFORM" = "Linux" ]]; then
+  # This is a hack to work around a problem with elogind/pam not creating
+  # a gnupg directory under /run/user/0 for the gpg-agent socket.
+  (( $(id -u) == 0 )) && [[ -e "$HOME/.gnupg/S.gpg-agent" ]] && mkdir -m 700 /run/user/0/gnupg && ln -sf "$HOME/.gnupg/S.gpg-agent" /run/user/0/gnupg
   export GPG_TTY="$(tty)" && gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1
   export I_WANT_A_BROKEN_PS=1
   export LYNX_CFG="$HOME/.lynx.cfg"
diff --git a/.ssh/config b/.ssh/config
index 302770a..929e9fd 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -45,7 +45,7 @@ Host phil lil tommy-wifi
 
 Host full-* build-* clone-*
   ForwardAgent			yes
-  RemoteForward			/run/user/0/gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
+  RemoteForward			/root/.gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
   User				root
 
 # GitHub.