From fe9882f872b7e7f55d4c3c75d9177b9d194e88af Mon Sep 17 00:00:00 2001
From: Oliver Schmidhauser <oli@glow.li>
Date: Mon, 30 Jul 2018 03:08:10 +0200
Subject: [PATCH] mutt: Use official gpg.rc (#2690)

---
 packages/mutt/build.sh |  3 ++-
 packages/mutt/gpg.rc   | 12 ------------
 packages/mutt/gpg2.rc  | 12 ------------
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 packages/mutt/gpg.rc
 delete mode 100644 packages/mutt/gpg2.rc

diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index 0872806d1..a32288018 100644
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
 TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
 TERMUX_PKG_VERSION=1.10.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=734a3883158ec3d180cf6538d8bd7f685ce641d2cdef657aa0038f76e79a54a0
 TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support"
@@ -39,7 +40,7 @@ termux_step_post_configure () {
 termux_step_post_make_install () {
 	cp $TERMUX_PKG_SRCDIR/doc/mutt.man $TERMUX_PREFIX/share/man/man1/mutt.1.man
 	mkdir -p $TERMUX_PREFIX/share/examples/mutt/
-	cp $TERMUX_PKG_BUILDER_DIR/gpg{,2}.rc $TERMUX_PREFIX/share/examples/mutt/
+	cp $TERMUX_PKG_SRCDIR/contrib/gpg.rc $TERMUX_PREFIX/share/examples/mutt/gpg.rc
 	mv $TERMUX_PREFIX/etc/mime.types.dist $TERMUX_PREFIX/etc/mime.types
 	mv $TERMUX_PREFIX/etc/Muttrc.dist $TERMUX_PREFIX/etc/Muttrc
 }
diff --git a/packages/mutt/gpg.rc b/packages/mutt/gpg.rc
deleted file mode 100644
index ad7fbe5b7..000000000
--- a/packages/mutt/gpg.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --batch --output - %f"
-set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
-set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f"
-set pgp_sign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to $pgp_sign_as -- -r %r -- %f"
-set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to $pgp_sign_as -- -r %r -- %f"
-set pgp_import_command="gpg --no-verbose --import -v %f"
-set pgp_export_command="gpg --no-verbose --export --armor %r"
-set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r"
-set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
diff --git a/packages/mutt/gpg2.rc b/packages/mutt/gpg2.rc
deleted file mode 100644
index 13525cad4..000000000
--- a/packages/mutt/gpg2.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-set pgp_decode_command="gpg2 %?p?--passphrase-fd 0 --pinentry-mode=loopback?  --no-verbose --batch --output - %f"
-set pgp_verify_command="gpg2 --no-verbose --batch --output - --verify %s %f"
-set pgp_decrypt_command="gpg2 %?p?--passphrase-fd 0 --pinentry-mode=loopback? --no-verbose --batch --output - %f"
-set pgp_sign_command="gpg2 --no-verbose --batch --output - %?p?--passphrase-fd 0 --pinentry-mode=loopback? --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command="gpg2 --no-verbose --batch --output - %?p?--passphrase-fd 0 --pinentry-mode=loopback? --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command="pgpewrap gpg2 --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_sign_command="pgpewrap gpg2 %?p?--passphrase-fd 0 --pinentry-mode=loopback? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-set pgp_import_command="gpg2 --no-verbose --import -v %f"
-set pgp_export_command="gpg2 --no-verbose --export --armor %r"
-set pgp_verify_key_command="gpg2 --no-verbose --batch --fingerprint --check-sigs %r"
-set pgp_list_pubring_command="gpg2 --no-verbose --batch --quiet --with-colons --with-fingerprint --list-keys %r"
-set pgp_list_secring_command="gpg2 --no-verbose --batch --with-colons --with-fingerprint --list-secret-keys %r"