From 17508223ede62da1ea19cf22bfdcd4825b609296 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Wed, 6 Nov 2019 15:20:05 +1300
Subject: [PATCH 1/5] move keyserver options to dirmngr

---
 .gnupg/dirmngr.conf | 3 ++-
 .gnupg/gpg.conf     | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.gnupg/dirmngr.conf b/.gnupg/dirmngr.conf
index 9044412..7ab9b3b 100644
--- a/.gnupg/dirmngr.conf
+++ b/.gnupg/dirmngr.conf
@@ -1,3 +1,4 @@
-use-tor
+keyserver hkp://keys.gnupg.net auto-key-retrieve include-revoked include-subkeys no-honor-keyserver-url honor-pka-record
+no-use-tor
 #debug-level guru
 #log-file /tmp/dirmngr.log
diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf
index e052e66..c765147 100644
--- a/.gnupg/gpg.conf
+++ b/.gnupg/gpg.conf
@@ -19,13 +19,6 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB
 #personal-cipher-preferences AES256 AES192 AES TWOFISH BLOWFISH
 #personal-compress-preferences ZIP ZLIB BZIP2 Uncompressed
 cert-digest-algo SHA512
-keyserver hkp://jirk5u4osbsr34t5.onion
-keyserver-options auto-key-retrieve
-keyserver-options include-revoked
-keyserver-options include-subkeys
-keyserver-options no-honor-keyserver-url
-keyserver-options honor-pka-record
-#keyserver-options no-try-dns-srv
 verify-options show-policy-url
 verify-options show-notations
 #verify-options show-photos
-- 
2.39.2


From 33683a12623c6c0f0beb625086e3df89f9ddd478 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Fri, 8 Dec 2023 13:58:45 +0100
Subject: [PATCH 2/5] allow presetting of passphrases

---
 .gnupg/gpg-agent.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index f5aaa18..9f2f908 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -2,5 +2,6 @@ default-cache-ttl 3600
 max-cache-ttl 86400
 enable-ssh-support
 no-allow-external-cache
+allow-preset-passphrase
 #debug-level guru
 #log-file /tmp/gpg-agent.log
-- 
2.39.2


From 5f5f6d81c65f00045d1afa970cc7afb367166d5d Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Fri, 8 Dec 2023 13:58:56 +0100
Subject: [PATCH 3/5] openpgp keyserver

---
 .gnupg/gpg.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf
index c765147..4d924f2 100644
--- a/.gnupg/gpg.conf
+++ b/.gnupg/gpg.conf
@@ -2,6 +2,7 @@ charset utf-8
 no-greeting
 default-key 2ccb26bc5c49bc221f20794255c9882d999bbcc4
 encrypt-to 2ccb26bc5c49bc221f20794255c9882d999bbcc4
+keyserver keys.openpgp.net
 escape-from-lines
 with-fingerprint
 keyid-format long
-- 
2.39.2


From c44eafa8c08fa2673c0dce6d53eedc6567d1ba72 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Fri, 8 Dec 2023 13:59:03 +0100
Subject: [PATCH 4/5] update ssh keys

---
 .gnupg/sshcontrol | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gnupg/sshcontrol b/.gnupg/sshcontrol
index 3dae303..64a7062 100644
--- a/.gnupg/sshcontrol
+++ b/.gnupg/sshcontrol
@@ -9,12 +9,13 @@
 # caching TTL in seconds, and another optional field for arbitrary
 # flags.   Prepend the keygrip with an '!' mark to disable it.
 #
-# fishbowl:
-# Ed25519 key added on: 2017-06-20 17:23:54
-# MD5 Fingerprint:  4e:6f:af:e4:ae:c3:1b:53:0e:78:0e:19:fd:55:94:c2
-!89D3357AF1FE5202344C1D1A0BD6F5EE698AED7D 0 confirm
-
 # albatross:
 # Ed25519 key added on: 2017-06-20 17:34:32
 # MD5 Fingerprint:  7f:1c:81:2b:31:98:0b:3a:d9:11:7f:c4:c4:1a:81:cb
 !E8B417C7F8CA25C53D754EBBABA9C47A0D2AABC3 0 confirm
+
+# lotus:
+# Ed25519 key added on: 2019-11-18 16:18:47
+# Fingerprints:  MD5:e1:b5:b2:77:44:1e:5c:54:4d:34:57:55:18:5d:10:89
+#                SHA256:DOAbOjz1XYXwQAXObroQN1AIN2EU6BppeMonQN4TB6E
+!EDA63E6D83CDECABA2B41BA215AC150EC8B0ECE3 0 confirm
-- 
2.39.2


From 0dd7539a900524d757aa9da09b06c26df8689500 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Fri, 8 Dec 2023 14:00:00 +0100
Subject: [PATCH 5/5] use openpgp keyserver

---
 .gnupg/dirmngr.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gnupg/dirmngr.conf b/.gnupg/dirmngr.conf
index 7ab9b3b..f45cbd1 100644
--- a/.gnupg/dirmngr.conf
+++ b/.gnupg/dirmngr.conf
@@ -1,4 +1,3 @@
-keyserver hkp://keys.gnupg.net auto-key-retrieve include-revoked include-subkeys no-honor-keyserver-url honor-pka-record
-no-use-tor
+keyserver hkps://keys.openpgp.org
 #debug-level guru
 #log-file /tmp/dirmngr.log
-- 
2.39.2