+2 -2

.gitignore

reviewed

··· 39 39 /patchlist.c 40 40 /conststrings.c 41 41 /pgpewrap 42 42 - /pgpring 42 42 + /mutt_pgpring 43 43 /reldate.h 44 44 /smime_keys 45 45 /txt2c ··· 55 55 /doc/mutt.1 56 56 /doc/muttrc.man 57 57 /doc/pgpewrap.1 58 58 - /doc/pgpring.1 58 58 + /doc/mutt_pgpring.1 59 59 /doc/*.html 60 60 /doc/stamp-* 61 61 /doc/smime_keys.1

+4 -4

Makefile.am

reviewed

··· 3 3 include $(top_srcdir)/flymake.am 4 4 5 5 AUTOMAKE_OPTIONS = 1.6 foreign 6 6 - EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap mutt_md5 6 6 + EXTRA_PROGRAMS = mutt_dotlock mutt_pgpring pgpewrap mutt_md5 7 7 8 8 if BUILD_DOC 9 9 DOC_SUBDIR = doc ··· 85 85 mutt_dotlock_LDADD = $(LIBOBJS) 86 86 mutt_dotlock_DEPENDENCIES = $(LIBOBJS) 87 87 88 88 - pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c 89 89 - pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) 90 90 - pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) 88 88 + mutt_pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c 89 89 + mutt_pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) 90 90 + mutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) 91 91 92 92 mutt_md5_SOURCES = md5.c 93 93 mutt_md5_CFLAGS = -DMD5UTIL

+1 -1

configure.ac

reviewed

··· 159 159 160 160 if test x$have_pgp != xno ; then 161 161 AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, [Define if you want classic PGP support.]) 162 162 - PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" 162 162 + PGPAUX_TARGET="mutt_pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" 163 163 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" 164 164 fi 165 165

+2 -2

contrib/pgp2.rc

reviewed

··· 42 42 set pgp_verify_key_command="pgp -kcc +language=mutt %r" 43 43 44 44 # read in the public key ring 45 45 - set pgp_list_pubring_command="pgpring -2 %r" 45 45 + set pgp_list_pubring_command="mutt_pgpring -2 %r" 46 46 47 47 # read in the secret key ring 48 48 - set pgp_list_secring_command="pgpring -s -2 %r" 48 48 + set pgp_list_secring_command="mutt_pgpring -s -2 %r" 49 49 50 50 # pattern for good signature 51 51 set pgp_good_sign="Good signature"

+2 -2

contrib/pgp5.rc

reviewed

··· 39 39 set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r" 40 40 41 41 # read in the public key ring 42 42 - set pgp_list_pubring_command="pgpring -5 %r" 42 42 + set pgp_list_pubring_command="mutt_pgpring -5 %r" 43 43 44 44 # read in the secret key ring 45 45 - set pgp_list_secring_command="pgpring -5 -s %r" 45 45 + set pgp_list_secring_command="mutt_pgpring -5 -s %r" 46 46 47 47

+2 -2

contrib/pgp6.rc

reviewed

··· 36 36 set pgp_verify_key_command="pgp6 +compatible -kcc %r" 37 37 38 38 # read in the public key ring 39 39 - set pgp_list_pubring_command="pgpring -5 %r" 39 39 + set pgp_list_pubring_command="mutt_pgpring -5 %r" 40 40 41 41 # read in the secret key ring 42 42 - set pgp_list_secring_command="pgpring -s -5 %r" 42 42 + set pgp_list_secring_command="mutt_pgpring -s -5 %r" 43 43 44 44 # create a clearsigned message 45 45 set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible +verbose=0 +batchmode +clearsig -afst %?a? -u %a?"

+5 -5

doc/Makefile.am

reviewed

··· 50 50 51 51 all: makedoc-all 52 52 53 53 - makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt pgpewrap.1 pgpring.1 53 53 + makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt pgpewrap.1 mutt_pgpring.1 54 54 55 55 install-data-local: makedoc-all instdoc 56 56 $(MKDIR_P) $(DESTDIR)$(mandir)/man1 ··· 59 59 ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 60 60 ./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1 61 61 ./instdoc pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1 62 62 - ./instdoc pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1 62 62 + ./instdoc mutt_pgpring.1 $(DESTDIR)$(mandir)/man1/mutt_pgpring.1 63 63 test x$(DOTLOCK_TARGET) = x || ./instdoc $(srcdir)/dotlock.man \ 64 64 $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 65 65 ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 ··· 86 86 fi 87 87 88 88 uninstall-local: 89 89 - for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \ 89 89 + for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 mutt_pgpring.1; do \ 90 90 rm -f $(DESTDIR)$(mandir)/man1/$$f ; \ 91 91 done 92 92 for f in muttrc.5 mbox.5 mmdf.5 ; do \ ··· 158 158 rm -rf vars.tmp.1 vars.tmp.2 159 159 160 160 clean-local: 161 161 - rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1 161 161 + rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 smime_keys.1 muttrc.man pgpewrap.1 mutt_pgpring.1 162 162 rm -f *.aux *.log *.tex *.out 163 163 164 164 DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \ ··· 185 185 pgpewrap.1: $(srcdir)/pgpewrap.man 186 186 $(EDIT) $(srcdir)/pgpewrap.man > $@ 187 187 188 188 - pgpring.1: $(srcdir)/pgpring.man 188 188 + mutt_pgpring.1: $(srcdir)/pgpring.man 189 189 $(EDIT) $(srcdir)/pgpring.man > $@ 190 190 191 191 smime_keys.1: $(srcdir)/smime_keys.man

+4 -4

doc/PGP-Notes.txt

reviewed

··· 134 134 To use this, copy either language.txt or language50.txt (depending 135 135 on what PGP version you are using) to your $PGPPATH. Make sure the 136 136 PGP command formats pass "+language=pgp" to all the PGP binaries 137 137 - (but not to pgpring!). 137 137 + (but not to mutt_pgpring!). 138 138 139 139 For PGP 2.6, a German version called "muttde" is available 140 140 as well. ··· 160 160 ------------------ 161 161 162 162 Mutt needs two auxiliary programs for its PGP support: pgpewrap and 163 163 - pgpring. 163 163 + mutt_pgpring. 164 164 165 165 166 166 - 1. pgpring 166 166 + 1. mutt_pgpring 167 167 168 168 - pgpring is a key ring dumper. It extracts information from PGP's 168 168 + mutt_pgpring is a key ring dumper. It extracts information from PGP's 169 169 binary key ring and emits it in an (almost) readable output format 170 170 understood by mutt's key selection routines. This output format 171 171 mimics the one used by the GNU Privacy Guard (GPG).

+1 -1

doc/mutt.man

reviewed

··· 165 165 .IP "PGPPATH" 166 166 Directory in which the user's PGP public keyring can be found. When used with 167 167 the original PGP program, mutt and 168 168 - .B pgpring (1) 168 168 + .B mutt_pgpring (1) 169 169 rely on this being set. 170 170 .IP "TMPDIR" 171 171 Directory in which temporary files are created.

+5 -5

doc/pgpring.man

reviewed

··· 1 1 .\" -*-nroff-*- 2 2 .\" 3 3 - .\" pgpring, a key ring dumper 3 3 + .\" mutt_pgpring, a key ring dumper 4 4 .\" Manpage Copyright (c) 2004-2013 Matthew Wilcox, Honza Horak 5 5 .\" 6 6 .\" This program is free software; you can redistribute it and/or modify ··· 17 17 .\" along with this program; if not, write to the Free Software 18 18 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 19 19 .\" 20 20 - .TH pgpring 1 "May 2013" Unix "User Manuals" 20 20 + .TH mutt_pgpring 1 "May 2013" Unix "User Manuals" 21 21 .SH NAME 22 22 - pgpring \- Mutt key ring dumper 22 22 + mutt_pgpring \- Mutt key ring dumper 23 23 24 24 .SH SYNTAX 25 25 .PP 26 26 - \fBpgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ] 26 26 + \fBmutt_pgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ] 27 27 [ \fB\-s\fP ] [ \fB\-S\fP ] [ \fB\-f\fP ] 28 28 29 29 .SH DESCRIPTION 30 30 .PP 31 31 - pgpring is a key ring dumper. It extracts information from PGP's 31 31 + mutt_pgpring is a key ring dumper. It extracts information from PGP's 32 32 binary key ring and emits it in an (almost) readable output format 33 33 understood by mutt's key selection routines. This output format 34 34 mimics the one used by the GNU Privacy Guard (GPG).

+2 -2

init.h

reviewed

··· 2157 2157 ** gpg --list-keys --with-colons --with-fingerprint 2158 2158 ** .te 2159 2159 ** .pp 2160 2160 - ** This format is also generated by the \fCpgpring\fP utility which comes 2160 2160 + ** This format is also generated by the \fCmutt_pgpring\fP utility which comes 2161 2161 ** with mutt. 2162 2162 ** .pp 2163 2163 ** Note: gpg's \fCfixed-list-mode\fP option should not be used. It ··· 2177 2177 ** gpg --list-keys --with-colons --with-fingerprint 2178 2178 ** .te 2179 2179 ** .pp 2180 2180 - ** This format is also generated by the \fCpgpring\fP utility which comes 2180 2180 + ** This format is also generated by the \fCmutt_pgpring\fP utility which comes 2181 2181 ** with mutt. 2182 2182 ** .pp 2183 2183 ** Note: gpg's \fCfixed-list-mode\fP option should not be used. It