--- /dev/null
+Index: debian-mutt/init.h
+===================================================================
+--- debian-mutt.orig/init.h 2007-03-21 21:58:13.000000000 +0100
++++ debian-mutt/init.h 2007-03-21 22:10:38.000000000 +0100
+@@ -289,6 +289,9 @@ struct option_t MuttVars[] = {
+ ** .pp
+ ** When this variable is set, mutt will include Delivered-To headers when
+ ** bouncing messages. Postfix users may wish to unset this variable.
++ ** .pp
++ ** \fBNote:\fP On Debian systems, this option is unset by default in
++ ** /etc/Muttrc.
+ */
+ { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
+ /*
+@@ -798,6 +801,9 @@ struct option_t MuttVars[] = {
+ ** Specifies the hostname to use after the ``@'' in local e-mail
+ ** addresses. This overrides the compile time definition obtained from
+ ** /etc/resolv.conf.
++ ** .pp
++ ** \fBNote:\fP On Debian systems, the default for this variable is obtained
++ ** from /etc/mailname when Mutt starts.
+ */
+ { "ignore_linear_white_space", DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
+ /*
+@@ -1301,6 +1307,9 @@ struct option_t MuttVars[] = {
+ ** system. It is used with various sets of parameters to gather the
+ ** list of known remailers, and to finally send a message through the
+ ** mixmaster chain.
++ ** .pp
++ ** \fBNote:\fP On Debian systems, this option is set by default to
++ ** ``mixmaster-filter'' in /etc/Muttrc.
+ */
+ #endif
+
+@@ -2626,6 +2635,9 @@ struct option_t MuttVars[] = {
+ ** .pp
+ ** You may optionally use the reverse- prefix to specify reverse sorting
+ ** order (example: set sort=reverse-date-sent).
++ ** .pp
++ ** \fBNote:\fP On Debian systems, this option is set by default to
++ ** ``threads'' in /etc/Muttrc.
+ */
+ { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS },
+ /*
+@@ -3022,6 +3034,9 @@ struct option_t MuttVars[] = {
+ ** is set to deliver directly via SMTP (see ``$$smtp_url''), this
+ ** option does nothing: mutt will never write out the BCC header
+ ** in this case.
++ ** .pp
++ ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by
++ ** default. The above warning applies to exim3 users, see /etc/Muttrc.
+ */
+ {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"},
+ /*
$(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \
doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
- 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c)
+ - 2007-03-20 myon: conflict in mx.c resolved (BUFFY_SIZE is gone)
== END PATCH
-Index: mutt/compress.c
+Index: debian-mutt/compress.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mutt/compress.c 2007-03-13 20:59:30.000000000 +0100
++++ debian-mutt/compress.c 2007-03-21 21:28:21.000000000 +0100
@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+}
+
+#endif /* USE_COMPRESSED */
-Index: mutt/compress.h
+Index: debian-mutt/compress.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mutt/compress.h 2007-03-13 20:59:30.000000000 +0100
++++ debian-mutt/compress.h 2007-03-21 21:28:21.000000000 +0100
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+int mutt_test_compress_command (const char *);
+int mutt_check_mailbox_compressed (CONTEXT *);
+void mutt_fast_close_compressed (CONTEXT *);
-Index: mutt/configure.in
+Index: debian-mutt/configure.ac
===================================================================
---- mutt.orig/configure.in 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/configure.in 2007-03-13 20:59:30.000000000 +0100
-@@ -807,6 +807,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
+--- debian-mutt.orig/configure.ac 2007-03-21 21:25:18.000000000 +0100
++++ debian-mutt/configure.ac 2007-03-21 21:28:21.000000000 +0100
+@@ -803,6 +803,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
fi])
AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
[if test $withval != yes; then
AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
-Index: mutt/curs_main.c
+Index: debian-mutt/curs_main.c
===================================================================
---- mutt.orig/curs_main.c 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/curs_main.c 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/curs_main.c 2007-03-20 22:52:50.000000000 +0100
++++ debian-mutt/curs_main.c 2007-03-21 21:28:21.000000000 +0100
@@ -1090,6 +1090,11 @@ int mutt_index_menu (void)
{
int check;
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
-Index: mutt/doc/manual.xml.head
+Index: debian-mutt/doc/manual.xml.head
===================================================================
---- mutt.orig/doc/manual.xml.head 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/doc/manual.xml.head 2007-03-13 20:59:30.000000000 +0100
-@@ -4843,6 +4843,205 @@ becomes an issue as mutt will silently f
+--- debian-mutt.orig/doc/manual.xml.head 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/doc/manual.xml.head 2007-03-21 21:28:21.000000000 +0100
+@@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f
</chapter>
<chapter id="mimesupport">
<title>Mutt's MIME Support</title>
-Index: mutt/doc/muttrc.man.head
+Index: debian-mutt/doc/muttrc.man.head
===================================================================
---- mutt.orig/doc/muttrc.man.head 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/doc/muttrc.man.head 2007-03-13 20:59:30.000000000 +0100
-@@ -316,6 +316,24 @@ specify the ID of the public key to be u
+--- debian-mutt.orig/doc/muttrc.man.head 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/doc/muttrc.man.head 2007-03-21 21:28:21.000000000 +0100
+@@ -345,6 +345,24 @@ specify the ID of the public key to be u
to a certain recipient. The meaning of "key ID" is to be taken
broadly: This can be a different e-mail address, a numerical key ID,
or even just an arbitrary search string.
.TP
\fBpush\fP \fIstring\fP
This command adds the named \fIstring\fP to the keyboard buffer.
-Index: mutt/hook.c
+Index: debian-mutt/hook.c
===================================================================
---- mutt.orig/hook.c 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/hook.c 2007-03-13 21:00:40.000000000 +0100
+--- debian-mutt.orig/hook.c 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/hook.c 2007-03-21 21:28:21.000000000 +0100
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK))
&& (!WithCrypto || !(data & M_CRYPTHOOK))
)
-Index: mutt/init.h
+Index: debian-mutt/init.h
===================================================================
---- mutt.orig/init.h 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/init.h 2007-03-13 20:59:30.000000000 +0100
-@@ -3167,6 +3167,11 @@ struct command_t Commands[] = {
+--- debian-mutt.orig/init.h 2007-03-21 21:26:23.000000000 +0100
++++ debian-mutt/init.h 2007-03-21 21:28:21.000000000 +0100
+@@ -3115,6 +3115,11 @@ struct command_t Commands[] = {
{ "fcc-hook", mutt_parse_hook, M_FCCHOOK },
{ "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK },
{ "folder-hook", mutt_parse_hook, M_FOLDERHOOK },
{ "group", parse_group, 0 },
{ "ungroup", parse_ungroup, 0 },
{ "hdr_order", parse_list, UL &HeaderOrderList },
-Index: mutt/main.c
+Index: debian-mutt/main.c
===================================================================
---- mutt.orig/main.c 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/main.c 2007-03-13 20:59:30.000000000 +0100
-@@ -404,6 +404,12 @@ static void show_version (void)
+--- debian-mutt.orig/main.c 2007-03-20 22:52:50.000000000 +0100
++++ debian-mutt/main.c 2007-03-21 21:28:21.000000000 +0100
+@@ -400,6 +400,12 @@ static void show_version (void)
#else
"-LOCALES_HACK "
#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
-Index: mutt/Makefile.am
+Index: debian-mutt/Makefile.am
===================================================================
---- mutt.orig/Makefile.am 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/Makefile.am 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/Makefile.am 2007-03-21 21:25:18.000000000 +0100
++++ debian-mutt/Makefile.am 2007-03-21 21:28:21.000000000 +0100
@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
mutt_SOURCES = $(BUILT_SOURCES) \
attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
-Index: mutt/mbox.c
+Index: debian-mutt/mbox.c
===================================================================
---- mutt.orig/mbox.c 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mbox.c 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/mbox.c 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/mbox.c 2007-03-21 21:28:21.000000000 +0100
@@ -29,6 +29,10 @@
#include "copy.h"
#include "mutt_curses.h"
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
return 0;
-Index: mutt/mutt.h
+Index: debian-mutt/mutt.h
===================================================================
---- mutt.orig/mutt.h 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mutt.h 2007-03-13 20:59:30.000000000 +0100
-@@ -159,6 +159,11 @@ typedef enum
+--- debian-mutt.orig/mutt.h 2007-03-20 22:52:50.000000000 +0100
++++ debian-mutt/mutt.h 2007-03-21 21:28:21.000000000 +0100
+@@ -160,6 +160,11 @@ typedef enum
#define M_ACCOUNTHOOK (1<<9)
#define M_REPLYHOOK (1<<10)
#define M_SEND2HOOK (1<<11)
/* tree characters for linearize_tree and print_enriched_string */
#define M_TREE_LLCORNER 1
-@@ -882,6 +887,11 @@ typedef struct
+@@ -886,6 +891,11 @@ typedef struct
void *data; /* driver specific data */
#endif /* USE_IMAP */
short magic; /* mailbox type */
unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
-Index: mutt/mx.c
+Index: debian-mutt/mx.c
===================================================================
---- mutt.orig/mx.c 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mx.c 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/mx.c 2007-03-21 21:25:18.000000000 +0100
++++ debian-mutt/mx.c 2007-03-21 21:29:55.000000000 +0100
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
#ifdef USE_IMAP
#include "imap.h"
#endif
-@@ -454,6 +458,10 @@ int mx_get_magic (const char *path)
+@@ -450,6 +454,10 @@ int mx_get_magic (const char *path)
return (-1);
}
return (magic);
}
-@@ -494,6 +502,13 @@ static int mx_open_mailbox_append (CONTE
+@@ -489,6 +497,13 @@ static int mx_open_mailbox_append (CONTE
+ {
struct stat sb;
- mode_t omask;
+#ifdef USE_COMPRESSED
+ /* special case for appending to compressed folders -
ctx->append = 1;
#ifdef USE_IMAP
-@@ -664,7 +679,12 @@ CONTEXT *mx_open_mailbox (const char *pa
+@@ -652,7 +667,12 @@ CONTEXT *mx_open_mailbox (const char *pa
}
ctx->magic = mx_get_magic (path);
if(ctx->magic == 0)
mutt_error (_("%s is not a mailbox."), path);
-@@ -770,6 +790,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
+@@ -758,6 +778,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
mutt_free_header (&ctx->hdrs[i]);
FREE (&ctx->hdrs);
FREE (&ctx->v2r);
FREE (&ctx->path);
FREE (&ctx->pattern);
if (ctx->limit_pattern)
-@@ -827,6 +851,12 @@ static int sync_mailbox (CONTEXT *ctx, i
+@@ -810,6 +834,12 @@ static int sync_mailbox (CONTEXT *ctx, i
+
if (tmp && tmp->new == 0)
mutt_update_mailbox (tmp);
- #endif
+
+#ifdef USE_COMPRESSED
+ if (rc == 0 && ctx->compressinfo)
return rc;
}
-@@ -1028,6 +1058,11 @@ int mx_close_mailbox (CONTEXT *ctx, int
+@@ -1011,6 +1041,11 @@ int mx_close_mailbox (CONTEXT *ctx, int
!mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
mx_unlink_empty (ctx->path);
mx_fastclose_mailbox (ctx);
return 0;
-@@ -1342,6 +1377,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
+@@ -1320,6 +1355,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
{
int rc;
if (ctx)
{
if (ctx->locked) lock = 0;
-Index: mutt/mx.h
+Index: debian-mutt/mx.h
===================================================================
---- mutt.orig/mx.h 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mx.h 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/mx.h 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/mx.h 2007-03-21 21:28:21.000000000 +0100
@@ -40,6 +40,9 @@ enum
#ifdef USE_POP
, M_POP
};
WHERE short DefaultMagic INITVAL (M_MBOX);
-Index: mutt/PATCHES
+Index: debian-mutt/PATCHES
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mutt/PATCHES 2007-03-13 20:59:30.000000000 +0100
++++ debian-mutt/PATCHES 2007-03-21 21:28:21.000000000 +0100
@@ -0,0 +1 @@
+patch-1.5.14.rr.compressed.1
-Index: mutt/po/de.po
+Index: debian-mutt/po/de.po
===================================================================
---- mutt.orig/po/de.po 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/po/de.po 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/po/de.po 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/po/de.po 2007-03-21 21:28:21.000000000 +0100
@@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl
msgid "Failed to figure out sender"
msgstr "Kann Absender nicht ermitteln"
#. this means ctx->changed or ctx->deleted was set, but no
#. * messages were found to be changed or deleted. This should
#. * never happen, is we presume it is a bug in mutt.
-Index: mutt/po/POTFILES.in
+Index: debian-mutt/po/POTFILES.in
===================================================================
---- mutt.orig/po/POTFILES.in 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/po/POTFILES.in 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/po/POTFILES.in 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/po/POTFILES.in 2007-03-21 21:28:21.000000000 +0100
@@ -8,6 +8,7 @@ charset.c
color.c
commands.c
crypt-gpgme.c
crypt.c
cryptglue.c
-Index: mutt/status.c
+Index: debian-mutt/status.c
===================================================================
---- mutt.orig/status.c 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/status.c 2007-03-13 20:59:30.000000000 +0100
+--- debian-mutt.orig/status.c 2007-03-20 22:31:20.000000000 +0100
++++ debian-mutt/status.c 2007-03-21 21:28:21.000000000 +0100
@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf
case 'f':
-Index: mutt/contrib/gpg.rc
+Index: debian-mutt/contrib/gpg.rc
===================================================================
---- mutt.orig/contrib/gpg.rc 2007-03-01 23:29:39.667501960 +0100
-+++ mutt/contrib/gpg.rc 2007-03-01 23:31:40.669106920 +0100
-@@ -31,44 +31,44 @@
- # breaking PGP/MIME.
-
- # decode application/pgp
--set pgp_decode_command="/usr/bin/gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-+set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-
- # verify a pgp/mime signature
--set pgp_verify_command="/usr/bin/gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
-+set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
-
- # decrypt a pgp/mime attachment
--set pgp_decrypt_command="/usr/bin/gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-+set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-
- # create a pgp/mime signed attachment
- # set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
--set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
-+set pgp_sign_command="gpg --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="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
--set pgp_clearsign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
-+set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
+--- debian-mutt.orig/contrib/gpg.rc 2007-03-20 22:20:31.000000000 +0100
++++ debian-mutt/contrib/gpg.rc 2007-03-20 22:25:55.000000000 +0100
+@@ -49,11 +49,11 @@ set pgp_clearsign_command="gpg --no-verb
# create a pgp/mime encrypted attachment
--# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-+# set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+ # set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg --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 gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-+# set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+ # set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+-set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap gpg %?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="/usr/bin/gpg --no-verbose --import %f"
-+set pgp_import_command="gpg --no-verbose --import %f"
-
- # export a key from the public key ring
--set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r"
-+set pgp_export_command="gpg --no-verbose --export --armor %r"
-
- # verify a key
--set pgp_verify_key_command="/usr/bin/gpg --verbose --batch --fingerprint --check-sigs %r"
-+set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
-
- # read in the public key ring
--set pgp_list_pubring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-keys %r"
-+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r"
-
- # read in the secret key ring
--set pgp_list_secring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r"
-+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r"
-
- # fetch keys
- # set pgp_getkeys_command="pkspxycwrap %r"
+ set pgp_import_command="gpg --no-verbose --import %f"
projects / software / mutt-debian.git / commitdiff