# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1492658391 14400
# Node ID 37e57701e936a2a7cb7653e80cd331a959faf255
# Parent  cd5b3906e68714de089de1c5b62177eeae73611f
switch to gpgme

diff --git a/.mutt/gpg2.rc b/.mutt/gpg2.rc
deleted file mode 100644
--- a/.mutt/gpg2.rc
+++ /dev/null
@@ -1,50 +0,0 @@
-# vim: ft=muttrc
-
-set pgp_use_gpg_agent=yes
-
-# decode application/pgp
-set pgp_decode_command="gpg2 --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-
-# verify a pgp/mime signature
-set pgp_verify_command="gpg2 --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
-
-# decrypt a pgp/mime attachment
-set pgp_decrypt_command="gpg2 --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-
-# create a pgp/mime signed attachment
-set pgp_sign_command="gpg2 --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
-
-# create a application/pgp signed (old-style) message
-set pgp_clearsign_command="gpg2 --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
-
-# create a pgp/mime encrypted attachment
-set pgp_encrypt_only_command="pgpewrap gpg2 --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-
-# create a pgp/mime encrypted and signed attachment
-set pgp_encrypt_sign_command="pgpewrap gpg2 %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-
-# import a key into the public key ring
-set pgp_import_command="gpg2 --no-verbose --import %f"
-
-# export a key from the public key ring
-set pgp_export_command="gpg2 --no-verbose --export --armor %r"
-
-# verify a key
-set pgp_verify_key_command="gpg2 --verbose --batch --fingerprint --check-sigs %r"
-
-# read in the public key ring
-set pgp_list_pubring_command="gpg2 --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r"
-
-# read in the secret key ring
-set pgp_list_secring_command="gpg2 --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r"
-
-# fetch keys
-set pgp_getkeys_command="gpg2 --recv-keys %r"
-
-# pattern for good signature
-# This version uses --status-fd messages
-set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
-
-# pattern to verify a decryption occurred
-set pgp_decryption_okay="^\\[GNUPG:\\] DECRYPTION_OKAY"
-
diff --git a/.muttrc b/.muttrc
--- a/.muttrc
+++ b/.muttrc
@@ -5,7 +5,6 @@ source ~/.mutt/roomag/config
 
 macro index,pager <f2> '<sync-mailbox><imap-logout-all><enter-command>source ~/.mutt/roomag/config<enter><change-folder>!<enter>' 'switch roomag'
 
-source ~/.mutt/gpg2.rc
 source `F=$HOME/.mutt/local; if [ ! -s "$F" ]; then F=/dev/null;fi;echo "$F"`
 
 unset imap_passive
@@ -23,6 +22,8 @@ set ssl_use_sslv3         = no
 set ssl_use_tlsv1         = no
 set ssl_use_tlsv1_1       = no
 
+set crypt_use_gpgme       = yes
+
 set smtp_authenticators = "gssapi:login:plain"
 
 # Behavior
diff --git a/bin/setup-neomutt b/bin/setup-neomutt
--- a/bin/setup-neomutt
+++ b/bin/setup-neomutt
@@ -24,12 +24,12 @@ case "${OSTYPE:-}" in
 esac
 
 ./prepare -q \
- --with-homespool=/var/spool/mail \
+ --with-mailpath=/var/spool/mail \
  --with-ssl${OPENSSL_PREFIX:+=$OPENSSL_PREFIX} \
  --with-sasl \
  --with-tokyocabinet \
+ --enable-gpgme \
  --enable-imap --enable-smtp \
- --with-regex
 
 make -s -j3
 
@@ -52,14 +52,7 @@ neomutt build.
 
 =head2 Debian
 
-autoconf libncursesw5-dev libssl-dev libsasl2-dev libtokyocabinet-dev links
-gnupg2 urlscan
-
-=head2 Cygwin
-
-autoconf libncursesw-devel openssl-devel libsasl2-devel libgdbm4-devel links
-
-gpg2 isn't available in cygwin, but there is a windows build.  using it with
-cygwin paths requires a wrapper though.
+  apt install autoconf links gnupg2 gpgsm urlscan libncursesw5-dev \
+    libssl-dev libsasl2-dev libtokyocabinet-dev libgpgme11-dev
 
 =cut