| 1 |
commit: 8f9a717dded65af4d3c914cd9abe4d70084e4c42 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jan 5 15:44:18 2018 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 16:35:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9a717d |
| 7 |
|
| 8 |
mail-client/neomutt: remove unused patches. |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/6761 |
| 11 |
|
| 12 |
.../0001-Rename-mutt-to-neomutt-20170714.patch | 436 --------------------- |
| 13 |
.../0001-Rename-mutt-to-neomutt-20170912.patch | 293 -------------- |
| 14 |
2 files changed, 729 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index bb01dbf9801..00000000000 |
| 19 |
--- a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,436 +0,0 @@ |
| 22 |
-From bb4a3d41530619970d5c3c30be7e9424dd169de5 Mon Sep 17 00:00:00 2001 |
| 23 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
| 24 |
-Date: Tue, 8 Aug 2017 13:36:20 +0200 |
| 25 |
-Subject: [PATCH] Rename mutt to neomutt |
| 26 |
- |
| 27 |
---- |
| 28 |
- Makefile.am | 30 ++++++++++++++++-------------- |
| 29 |
- configure.ac | 8 ++++---- |
| 30 |
- contrib/gpg.rc | 8 ++++---- |
| 31 |
- contrib/pgp2.rc | 4 ++-- |
| 32 |
- contrib/pgp5.rc | 8 ++++---- |
| 33 |
- contrib/pgp6.rc | 4 ++-- |
| 34 |
- doc/Makefile.am | 24 +++++++++++------------- |
| 35 |
- doc/PGP-Notes.txt | 8 ++++---- |
| 36 |
- doc/mutt.man | 2 +- |
| 37 |
- doc/pgpewrap.1 | 12 ++++++------ |
| 38 |
- doc/pgpring.1 | 10 +++++----- |
| 39 |
- hcache/hcachever.sh | 2 +- |
| 40 |
- 12 files changed, 60 insertions(+), 60 deletions(-) |
| 41 |
- |
| 42 |
-diff --git a/Makefile.am b/Makefile.am |
| 43 |
-index 5b6494e8..d34d3e4c 100644 |
| 44 |
---- a/Makefile.am |
| 45 |
-+++ b/Makefile.am |
| 46 |
-@@ -3,7 +3,7 @@ |
| 47 |
- include $(top_srcdir)/flymake.am |
| 48 |
- |
| 49 |
- AUTOMAKE_OPTIONS = 1.6 foreign |
| 50 |
--EXTRA_PROGRAMS = mutt_md5 pgpewrap pgpring |
| 51 |
-+EXTRA_PROGRAMS = neomutt_md5 neomutt_pgpewrap neomutt_pgpring |
| 52 |
- |
| 53 |
- # Test the .tar file by building everything |
| 54 |
- AM_DISTCHECK_CONFIGURE_FLAGS = \ |
| 55 |
-@@ -42,9 +42,9 @@ distdir = neo$(PACKAGE)-$(VERSION) |
| 56 |
- |
| 57 |
- BUILT_SOURCES = conststrings.c git_ver.h keymap_alldefs.h keymap_defs.h |
| 58 |
- |
| 59 |
--bin_PROGRAMS = mutt $(PGPAUX_TARGET) |
| 60 |
-+bin_PROGRAMS = neomutt $(PGPAUX_TARGET) |
| 61 |
- |
| 62 |
--mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \ |
| 63 |
-+neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \ |
| 64 |
- base64.c bcache.c body.h browser.c buffer.c buffy.c charset.c color.c \ |
| 65 |
- commands.c complete.c compose.c compress.c content.h context.h copy.c \ |
| 66 |
- curs_lib.c curs_main.c date.c edit.c editmsg.c enter.c enter_state.h \ |
| 67 |
-@@ -59,15 +59,15 @@ mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \ |
| 68 |
- smtp.c sort.c state.h status.c system.c thread.c thread.h url.c \ |
| 69 |
- version.c where.h |
| 70 |
- |
| 71 |
--nodist_mutt_SOURCES = $(BUILT_SOURCES) |
| 72 |
-+nodist_neomutt_SOURCES = $(BUILT_SOURCES) |
| 73 |
- |
| 74 |
- LIBIMAP = -Limap -limap |
| 75 |
- LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a |
| 76 |
- |
| 77 |
--mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \ |
| 78 |
-+neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \ |
| 79 |
- $(LIBIMAP) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS) |
| 80 |
- |
| 81 |
--mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \ |
| 82 |
-+neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \ |
| 83 |
- $(HCACHE_DEPS) $(NCRYPT_DEPS) $(INTLDEPS) |
| 84 |
- |
| 85 |
- DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 86 |
-@@ -75,7 +75,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 87 |
- |
| 88 |
- AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS) |
| 89 |
- |
| 90 |
--EXTRA_mutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \ |
| 91 |
-+EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \ |
| 92 |
- mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \ |
| 93 |
- remailer.c remailer.h resize.c sha1.c url.h utf8.c wcwidth.c |
| 94 |
- |
| 95 |
-@@ -95,13 +95,15 @@ EXTRA_DIST = account.h ascii.h attach.h bcache.h browser.h buffer.h buffy.h \ |
| 96 |
- |
| 97 |
- EXTRA_SCRIPTS = |
| 98 |
- |
| 99 |
--pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c |
| 100 |
--pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) |
| 101 |
--pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) |
| 102 |
-+neomutt_pgpewrap_SOURCES = pgpewrap.c |
| 103 |
- |
| 104 |
--mutt_md5_SOURCES = md5.c |
| 105 |
--mutt_md5_CFLAGS = -DMD5UTIL |
| 106 |
--mutt_md5_LDADD = |
| 107 |
-+neomutt_pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c |
| 108 |
-+neomutt_pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) |
| 109 |
-+neomutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) |
| 110 |
-+ |
| 111 |
-+neomutt_md5_SOURCES = md5.c |
| 112 |
-+neomutt_md5_CFLAGS = -DMD5UTIL |
| 113 |
-+neomutt_md5_LDADD = |
| 114 |
- |
| 115 |
- txt2c_SOURCES = txt2c.c |
| 116 |
- txt2c_LDADD = |
| 117 |
-@@ -141,7 +143,7 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH $(sr |
| 118 |
- $(srcdir)/OPS.MIX $(srcdir)/OPS.PGP $(srcdir)/OPS.SMIME $(srcdir)/OPS.CRYPT \ |
| 119 |
- > $@ |
| 120 |
- |
| 121 |
--git_ver.h: $(mutt_SOURCES) $(SUBDIRS) |
| 122 |
-+git_ver.h: $(neomutt_SOURCES) $(SUBDIRS) |
| 123 |
- version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \ |
| 124 |
- echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \ |
| 125 |
- cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \ |
| 126 |
-diff --git a/configure.ac b/configure.ac |
| 127 |
-index bc88adc7..17796620 100644 |
| 128 |
---- a/configure.ac |
| 129 |
-+++ b/configure.ac |
| 130 |
-@@ -4,7 +4,7 @@ dnl autoreconf -i |
| 131 |
- CFLAGS=$CFLAGS |
| 132 |
- LDFLAGS=$LDFLAGS |
| 133 |
- |
| 134 |
--AC_INIT([NeoMutt], [20170714], [neomutt-devel@×××××××.org], [mutt], [https://www.neomutt.org]) |
| 135 |
-+AC_INIT([NeoMutt], [20170714], [neomutt-devel@×××××××.org], [neomutt], [https://www.neomutt.org]) |
| 136 |
- AC_CONFIG_SRCDIR(mutt.h) |
| 137 |
- AC_CONFIG_AUX_DIR([.build-aux]) |
| 138 |
- AM_INIT_AUTOMAKE |
| 139 |
-@@ -192,7 +192,7 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [ |
| 140 |
- dnl --enable-pgp |
| 141 |
- AS_IF([test x$use_pgp != "xno"], [ |
| 142 |
- AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP, 1, [Define if you want classic PGP Support.]) |
| 143 |
-- PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" |
| 144 |
-+ PGPAUX_TARGET="neomutt_pgpring\$(EXEEXT) neomutt_pgpewrap\$(EXEEXT)" |
| 145 |
- build_ncrypt_pgp="yes" |
| 146 |
- ]) |
| 147 |
- |
| 148 |
-@@ -449,7 +449,7 @@ AC_SUBST([datarootdir]) |
| 149 |
- AC_MSG_CHECKING(where to put the documentation) |
| 150 |
- AC_ARG_WITH(docdir, AS_HELP_STRING([--with-docdir=PATH],[Specify where to put the documentation]), |
| 151 |
- [mutt_cv_docdir=$withval], |
| 152 |
-- [mutt_cv_docdir='${datarootdir}/doc/mutt']) |
| 153 |
-+ [mutt_cv_docdir='${datarootdir}/doc/neomutt']) |
| 154 |
- AC_MSG_RESULT($mutt_cv_docdir) |
| 155 |
- if test -z "$docdir" -o -n "$with_docdir"; then |
| 156 |
- docdir=$mutt_cv_docdir |
| 157 |
-@@ -825,7 +825,7 @@ AM_CONDITIONAL(BUILD_HC_QDBM, test "x$build_hc_qdbm" = "xyes") |
| 158 |
- AM_CONDITIONAL(BUILD_HC_TC, test "x$build_hc_tc" = "xyes") |
| 159 |
- dnl -- end cache -- |
| 160 |
- |
| 161 |
--MUTT_MD5="mutt_md5$EXEEXT" |
| 162 |
-+MUTT_MD5="neomutt_md5$EXEEXT" |
| 163 |
- |
| 164 |
- AC_SUBST(MUTT_MD5) |
| 165 |
- AC_SUBST(MUTT_LIB_OBJECTS) |
| 166 |
-diff --git a/contrib/gpg.rc b/contrib/gpg.rc |
| 167 |
-index 3392038b..86dc23c7 100644 |
| 168 |
---- a/contrib/gpg.rc |
| 169 |
-+++ b/contrib/gpg.rc |
| 170 |
-@@ -46,12 +46,12 @@ set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphra |
| 171 |
- set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" |
| 172 |
- |
| 173 |
- # create a pgp/mime encrypted attachment |
| 174 |
--# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" |
| 175 |
--set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" |
| 176 |
-+# set pgp_encrypt_only_command="neomutt_pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" |
| 177 |
-+set pgp_encrypt_only_command="neomutt_pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" |
| 178 |
- |
| 179 |
- # create a pgp/mime encrypted and signed attachment |
| 180 |
--# 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" |
| 181 |
--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" |
| 182 |
-+# set pgp_encrypt_sign_command="neomutt_pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" |
| 183 |
-+set pgp_encrypt_sign_command="neomutt_pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" |
| 184 |
- |
| 185 |
- # import a key into the public key ring |
| 186 |
- set pgp_import_command="gpg --no-verbose --import %f" |
| 187 |
-diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc |
| 188 |
-index bd01e2d2..08b592dd 100644 |
| 189 |
---- a/contrib/pgp2.rc |
| 190 |
-+++ b/contrib/pgp2.rc |
| 191 |
-@@ -37,10 +37,10 @@ set pgp_export_command="pgp -kxaf +language=mutt %r" |
| 192 |
- set pgp_verify_key_command="pgp -kcc +language=mutt %r" |
| 193 |
- |
| 194 |
- # read in the public key ring |
| 195 |
--set pgp_list_pubring_command="pgpring -2 %r" |
| 196 |
-+set pgp_list_pubring_command="neomutt_pgpring -2 %r" |
| 197 |
- |
| 198 |
- # read in the secret key ring |
| 199 |
--set pgp_list_secring_command="pgpring -s -2 %r" |
| 200 |
-+set pgp_list_secring_command="neomutt_pgpring -s -2 %r" |
| 201 |
- |
| 202 |
- # pattern for good signature |
| 203 |
- set pgp_good_sign="Good signature" |
| 204 |
-diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc |
| 205 |
-index 4440d6b7..aea3ae54 100644 |
| 206 |
---- a/contrib/pgp5.rc |
| 207 |
-+++ b/contrib/pgp5.rc |
| 208 |
-@@ -19,10 +19,10 @@ set pgp_decrypt_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpv +languag |
| 209 |
- set pgp_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgps +language=mutt +verbose=0 +batchmode -abft %?a? -u %a?" |
| 210 |
- |
| 211 |
- # create a pgp/mime encrypted attachment |
| 212 |
--set pgp_encrypt_only_command="pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f" |
| 213 |
-+set pgp_encrypt_only_command="neomutt_pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f" |
| 214 |
- |
| 215 |
- # create a pgp/mime encrypted and signed attachment |
| 216 |
--set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r" |
| 217 |
-+set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | neomutt_pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r" |
| 218 |
- |
| 219 |
- # import a key into the public key ring |
| 220 |
- set pgp_import_command="pgpk -a +language=mutt --OutputInformationFD=1 %f" |
| 221 |
-@@ -34,9 +34,9 @@ set pgp_export_command="pgpk -xa +language=mutt --OutputInformationFD=1 %r" |
| 222 |
- set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r" |
| 223 |
- |
| 224 |
- # read in the public key ring |
| 225 |
--set pgp_list_pubring_command="pgpring -5 %r" |
| 226 |
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r" |
| 227 |
- |
| 228 |
- # read in the secret key ring |
| 229 |
--set pgp_list_secring_command="pgpring -5 -s %r" |
| 230 |
-+set pgp_list_secring_command="neomutt_pgpring -5 -s %r" |
| 231 |
- |
| 232 |
- |
| 233 |
-diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc |
| 234 |
-index a8708042..6b1ef985 100644 |
| 235 |
---- a/contrib/pgp6.rc |
| 236 |
-+++ b/contrib/pgp6.rc |
| 237 |
-@@ -31,10 +31,10 @@ set pgp_export_command="pgp6 +compatible -kxaf %r" |
| 238 |
- set pgp_verify_key_command="pgp6 +compatible -kcc %r" |
| 239 |
- |
| 240 |
- # read in the public key ring |
| 241 |
--set pgp_list_pubring_command="pgpring -5 %r" |
| 242 |
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r" |
| 243 |
- |
| 244 |
- # read in the secret key ring |
| 245 |
--set pgp_list_secring_command="pgpring -s -5 %r" |
| 246 |
-+set pgp_list_secring_command="neomutt_pgpring -s -5 %r" |
| 247 |
- |
| 248 |
- # create a clearsigned message |
| 249 |
- set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible +verbose=0 +batchmode +clearsig -afst %?a? -u %a?" |
| 250 |
-diff --git a/doc/Makefile.am b/doc/Makefile.am |
| 251 |
-index 6a6c711b..770dc16c 100644 |
| 252 |
---- a/doc/Makefile.am |
| 253 |
-+++ b/doc/Makefile.am |
| 254 |
-@@ -33,20 +33,18 @@ topsrcdir_DOCFILES = ChangeLog.md CODE_OF_CONDUCT.md COPYRIGHT INSTALL \ |
| 255 |
- |
| 256 |
- all: makedoc-all |
| 257 |
- |
| 258 |
--makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt mutt.1 \ |
| 259 |
-- Muttrc muttrc.man neomutt-syntax.vim |
| 260 |
-+makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt neomutt.1 \ |
| 261 |
-+ Muttrc neomuttrc.man neomutt-syntax.vim |
| 262 |
- |
| 263 |
- install-data-local: makedoc-all |
| 264 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/man1 |
| 265 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/man5 |
| 266 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir) |
| 267 |
-- $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 |
| 268 |
-- $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 |
| 269 |
-+ $(INSTALL) -m 644 neomutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1 |
| 270 |
-+ $(INSTALL) -m 644 neomuttrc.man $(DESTDIR)$(mandir)/man5/neomuttrc.5 |
| 271 |
- $(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1 |
| 272 |
-- $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1 |
| 273 |
-- $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1 |
| 274 |
-- $(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox.5 |
| 275 |
-- $(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf.5 |
| 276 |
-+ $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpewrap.1 |
| 277 |
-+ $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpring.1 |
| 278 |
- $(MKDIR_P) $(DESTDIR)$(docdir) |
| 279 |
- for f in $(topsrcdir_DOCFILES); do \ |
| 280 |
- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir); \ |
| 281 |
-@@ -69,10 +67,10 @@ install-data-local: makedoc-all |
| 282 |
- -$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir) |
| 283 |
- |
| 284 |
- uninstall-local: |
| 285 |
-- for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \ |
| 286 |
-+ for f in neomutt.1 smime_keys.1 neomutt_pgpewrap.1 neomutt_pgpring.1; do \ |
| 287 |
- rm -f $(DESTDIR)$(mandir)/man1/$$f; \ |
| 288 |
- done |
| 289 |
-- for f in muttrc.5 mbox.5 mmdf.5; do \ |
| 290 |
-+ for f in neomuttrc.5; do \ |
| 291 |
- rm -f $(DESTDIR)$(mandir)/man5/$$f; \ |
| 292 |
- done |
| 293 |
- for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); do \ |
| 294 |
-@@ -120,11 +118,11 @@ sortcheck: manual.xml |
| 295 |
- rm -rf vars.tmp.1 vars.tmp.2 |
| 296 |
- |
| 297 |
- clean-local: |
| 298 |
-- rm -f *.html mutt.1 muttrc.man |
| 299 |
-+ rm -f *.html neomutt.1 neomuttrc.man |
| 300 |
- |
| 301 |
- DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc |
| 302 |
- |
| 303 |
--muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail |
| 304 |
-+neomuttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail |
| 305 |
- $(MAKEDOC_CPP) $(top_srcdir)/init.h | \ |
| 306 |
- ./makedoc$(EXEEXT) -m | \ |
| 307 |
- cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail > $@ |
| 308 |
-@@ -133,7 +131,7 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \ |
| 309 |
- -e 's,@bindir\@,$(bindir),g' \ |
| 310 |
- -e 's,@docdir\@,$(docdir),g' |
| 311 |
- |
| 312 |
--mutt.1: $(srcdir)/mutt.man |
| 313 |
-+neomutt.1: $(srcdir)/mutt.man |
| 314 |
- $(EDIT) $(srcdir)/mutt.man > $@ |
| 315 |
- |
| 316 |
- manual.xml: makedoc$(EXEEXT) ../config.h $(top_srcdir)/init.h \ |
| 317 |
-diff --git a/doc/PGP-Notes.txt b/doc/PGP-Notes.txt |
| 318 |
-index 2215c410..a358f818 100644 |
| 319 |
---- a/doc/PGP-Notes.txt |
| 320 |
-+++ b/doc/PGP-Notes.txt |
| 321 |
-@@ -157,7 +157,7 @@ or exim. |
| 322 |
- Auxiliary Programs |
| 323 |
- ------------------ |
| 324 |
- |
| 325 |
--Mutt needs two auxiliary programs for its PGP support: pgpewrap and |
| 326 |
-+Mutt needs two auxiliary programs for its PGP support: neomutt_pgpewrap and |
| 327 |
- pgpring. |
| 328 |
- |
| 329 |
- |
| 330 |
-@@ -186,17 +186,17 @@ Command line options: |
| 331 |
- |
| 332 |
- |
| 333 |
- |
| 334 |
--2. pgpewrap |
| 335 |
-+2. neomutt_pgpewrap |
| 336 |
- |
| 337 |
- This is a little C program which does some command line munging: The |
| 338 |
--first argument is a command to be executed. When pgpewrap |
| 339 |
-+first argument is a command to be executed. When neomutt_pgpewrap |
| 340 |
- encounters a "--" (dash-dash) argument, it will interpret the next |
| 341 |
- argument as a prefix which is put in front of all following |
| 342 |
- arguments. |
| 343 |
- |
| 344 |
- Example: |
| 345 |
- |
| 346 |
-- pgpewrap pgpe file -- -r a b c |
| 347 |
-+ neomutt_pgpewrap pgpe file -- -r a b c |
| 348 |
- |
| 349 |
- will execute: |
| 350 |
- |
| 351 |
-diff --git a/doc/mutt.man b/doc/mutt.man |
| 352 |
-index 8edee96e..9bc49a90 100644 |
| 353 |
---- a/doc/mutt.man |
| 354 |
-+++ b/doc/mutt.man |
| 355 |
-@@ -171,7 +171,7 @@ If this variable is set, mailcap are always used without prompting first. |
| 356 |
- .IP "PGPPATH" |
| 357 |
- Directory in which the user's PGP public keyring can be found. When used with |
| 358 |
- the original PGP program, mutt and |
| 359 |
--.B pgpring (1) |
| 360 |
-+.B neomutt_pgpring (1) |
| 361 |
- rely on this being set. |
| 362 |
- .IP "TMPDIR" |
| 363 |
- Directory in which temporary files are created. |
| 364 |
-diff --git a/doc/pgpewrap.1 b/doc/pgpewrap.1 |
| 365 |
-index 20327349..9ad7bff7 100644 |
| 366 |
---- a/doc/pgpewrap.1 |
| 367 |
-+++ b/doc/pgpewrap.1 |
| 368 |
-@@ -1,6 +1,6 @@ |
| 369 |
- .\" -*-nroff-*- |
| 370 |
- .\" |
| 371 |
--.\" pgpewrap, a command line munging tool |
| 372 |
-+.\" neomutt_pgpewrap, a command line munging tool |
| 373 |
- .\" Manpage Copyright (c) 2013 Honza Horak |
| 374 |
- .\" |
| 375 |
- .\" This program is free software; you can redistribute it and/or modify |
| 376 |
-@@ -17,25 +17,25 @@ |
| 377 |
- .\" along with this program; if not, write to the Free Software |
| 378 |
- .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 379 |
- .\" |
| 380 |
--.TH pgpewrap 1 "May 2013" Unix "User Manuals" |
| 381 |
-+.TH neomutt_pgpewrap 1 "May 2013" Unix "User Manuals" |
| 382 |
- .SH NAME |
| 383 |
--pgpewrap \- Mutt command line munging tool |
| 384 |
-+neomutt_pgpewrap \- Mutt command line munging tool |
| 385 |
- |
| 386 |
- .SH SYNTAX |
| 387 |
- .PP |
| 388 |
--\fBpgpewrap\fP [ \fBflags\fP ] \-\- \fBprefix\fP [ \fBrecipients\fP ] |
| 389 |
-+\fBneomutt_pgpewrap\fP [ \fBflags\fP ] \-\- \fBprefix\fP [ \fBrecipients\fP ] |
| 390 |
- |
| 391 |
- .SH DESCRIPTION |
| 392 |
- .PP |
| 393 |
- This is a little C program which does some command line munging: The |
| 394 |
--first argument is a command to be executed. When \fBpgpewrap\fP |
| 395 |
-+first argument is a command to be executed. When \fBneomutt_pgpewrap\fP |
| 396 |
- encounters a "\-\-" (dash\-dash) argument, it will interpret the next |
| 397 |
- argument as a prefix which is put in front of all following |
| 398 |
- arguments. |
| 399 |
- |
| 400 |
- .SH EXAMPLE |
| 401 |
- |
| 402 |
-- pgpewrap pgpe file \-\- \-r a b c |
| 403 |
-+ neomutt_pgpewrap pgpe file \-\- \-r a b c |
| 404 |
- |
| 405 |
- will execute: |
| 406 |
- |
| 407 |
-diff --git a/doc/pgpring.1 b/doc/pgpring.1 |
| 408 |
-index 0009ad92..d23ebf55 100644 |
| 409 |
---- a/doc/pgpring.1 |
| 410 |
-+++ b/doc/pgpring.1 |
| 411 |
-@@ -1,6 +1,6 @@ |
| 412 |
- .\" -*-nroff-*- |
| 413 |
- .\" |
| 414 |
--.\" pgpring, a key ring dumper |
| 415 |
-+.\" neomutt_pgpring, a key ring dumper |
| 416 |
- .\" Manpage Copyright (c) 2004-2013 Matthew Wilcox, Honza Horak |
| 417 |
- .\" |
| 418 |
- .\" This program is free software; you can redistribute it and/or modify |
| 419 |
-@@ -17,18 +17,18 @@ |
| 420 |
- .\" along with this program; if not, write to the Free Software |
| 421 |
- .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 422 |
- .\" |
| 423 |
--.TH pgpring 1 "May 2013" Unix "User Manuals" |
| 424 |
-+.TH neomutt_pgpring 1 "May 2013" Unix "User Manuals" |
| 425 |
- .SH NAME |
| 426 |
--pgpring \- Mutt key ring dumper |
| 427 |
-+neomutt_pgpring \- Mutt key ring dumper |
| 428 |
- |
| 429 |
- .SH SYNTAX |
| 430 |
- .PP |
| 431 |
--\fBpgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ] |
| 432 |
-+\fBneomutt_pgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ] |
| 433 |
- [ \fB\-s\fP ] [ \fB\-S\fP ] [ \fB\-f\fP ] |
| 434 |
- |
| 435 |
- .SH DESCRIPTION |
| 436 |
- .PP |
| 437 |
--pgpring is a key ring dumper. It extracts information from PGP's |
| 438 |
-+neomutt_pgpring is a key ring dumper. It extracts information from PGP's |
| 439 |
- binary key ring and emits it in an (almost) readable output format |
| 440 |
- understood by mutt's key selection routines. This output format |
| 441 |
- mimics the one used by the GNU Privacy Guard (GPG). |
| 442 |
-diff --git a/hcache/hcachever.sh b/hcache/hcachever.sh |
| 443 |
-index 733e6ca1..c35425d1 100755 |
| 444 |
---- a/hcache/hcachever.sh |
| 445 |
-+++ b/hcache/hcachever.sh |
| 446 |
-@@ -77,7 +77,7 @@ do |
| 447 |
- done |
| 448 |
- echo " */" >> $TMPD |
| 449 |
- |
| 450 |
--MD5TEXT=`echo "$TEXT" | ../mutt_md5` |
| 451 |
-+MD5TEXT=`echo "$TEXT" | ../neomutt_md5` |
| 452 |
- echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD |
| 453 |
- |
| 454 |
- # TODO: validate we have all structs |
| 455 |
--- |
| 456 |
-2.13.5 |
| 457 |
- |
| 458 |
|
| 459 |
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch |
| 460 |
deleted file mode 100644 |
| 461 |
index a8a0c8ad272..00000000000 |
| 462 |
--- a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch |
| 463 |
+++ /dev/null |
| 464 |
@@ -1,293 +0,0 @@ |
| 465 |
-From 457e54623ce8c5ef40647ebbc4a304417e353230 Mon Sep 17 00:00:00 2001 |
| 466 |
-From: Nicolas Bock <nicolasbock@×××××.com> |
| 467 |
-Date: Mon, 2 Oct 2017 14:04:34 -0600 |
| 468 |
-Subject: [PATCH] Rename mutt to neomutt |
| 469 |
- |
| 470 |
---- |
| 471 |
- Makefile.am | 28 +++++++++++++++------------- |
| 472 |
- configure.ac | 8 ++++---- |
| 473 |
- contrib/{smime_keys => neomutt_smime_keys} | 0 |
| 474 |
- contrib/pgp2.rc | 4 ++-- |
| 475 |
- contrib/pgp5.rc | 4 ++-- |
| 476 |
- contrib/pgp6.rc | 4 ++-- |
| 477 |
- contrib/smime.rc | 2 +- |
| 478 |
- doc/Makefile.am | 30 +++++++++++++++--------------- |
| 479 |
- lib/Makefile.am | 4 ++-- |
| 480 |
- 9 files changed, 43 insertions(+), 41 deletions(-) |
| 481 |
- rename contrib/{smime_keys => neomutt_smime_keys} (100%) |
| 482 |
- |
| 483 |
-diff --git a/Makefile.am b/Makefile.am |
| 484 |
-index 97218b8f..859b2bcd 100644 |
| 485 |
---- a/Makefile.am |
| 486 |
-+++ b/Makefile.am |
| 487 |
-@@ -3,7 +3,7 @@ |
| 488 |
- include $(top_srcdir)/flymake.am |
| 489 |
- |
| 490 |
- AUTOMAKE_OPTIONS = 1.6 foreign |
| 491 |
--EXTRA_PROGRAMS = pgpewrap pgpring |
| 492 |
-+EXTRA_PROGRAMS = neomutt_pgpewrap neomutt_pgpring |
| 493 |
- |
| 494 |
- # Test the .tar file by building everything |
| 495 |
- AM_DISTCHECK_CONFIGURE_FLAGS = \ |
| 496 |
-@@ -42,9 +42,9 @@ distdir = neo$(PACKAGE)-$(VERSION) |
| 497 |
- |
| 498 |
- BUILT_SOURCES = conststrings.c git_ver.h |
| 499 |
- |
| 500 |
--bin_PROGRAMS = mutt $(PGPAUX_TARGET) |
| 501 |
-+bin_PROGRAMS = neomutt $(PGPAUX_TARGET) |
| 502 |
- |
| 503 |
--mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \ |
| 504 |
-+neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \ |
| 505 |
- bcache.c body.c body.h browser.c buffy.c charset.c color.c \ |
| 506 |
- commands.c complete.c compose.c compress.c content.h context.h copy.c \ |
| 507 |
- curs_lib.c curs_main.c edit.c editmsg.c enter.c enter_state.h \ |
| 508 |
-@@ -59,18 +59,18 @@ mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \ |
| 509 |
- smtp.c sort.c state.c state.h status.c system.c thread.c thread.h url.c \ |
| 510 |
- version.c where.h |
| 511 |
- |
| 512 |
--nodist_mutt_SOURCES = $(BUILT_SOURCES) |
| 513 |
-+nodist_neomutt_SOURCES = $(BUILT_SOURCES) |
| 514 |
- |
| 515 |
- LIBIMAP = -Limap -limap |
| 516 |
- LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a |
| 517 |
- |
| 518 |
--LIBMUTT = -Llib -lmutt |
| 519 |
--LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libmutt.a |
| 520 |
-+LIBMUTT = -Llib -lneomutt |
| 521 |
-+LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libneomutt.a |
| 522 |
- |
| 523 |
--mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \ |
| 524 |
-+neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \ |
| 525 |
- $(LIBIMAP) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS) |
| 526 |
- |
| 527 |
--mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \ |
| 528 |
-+neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \ |
| 529 |
- $(LIBMUTTDEPS) $(HCACHE_DEPS) $(NCRYPT_DEPS) $(INTLDEPS) |
| 530 |
- |
| 531 |
- DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 532 |
-@@ -78,7 +78,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 533 |
- |
| 534 |
- AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS) |
| 535 |
- |
| 536 |
--EXTRA_mutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \ |
| 537 |
-+EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \ |
| 538 |
- mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \ |
| 539 |
- remailer.c remailer.h resize.c url.h |
| 540 |
- |
| 541 |
-@@ -94,11 +94,13 @@ EXTRA_DIST = account.h attach.h bcache.h browser.h buffy.h \ |
| 542 |
- rfc1524.h rfc2047.h rfc2231.h rfc3676.h rfc822.h sidebar.h \ |
| 543 |
- sort.h txt2c.c txt2c.sh version.h |
| 544 |
- |
| 545 |
-+neomutt_pgpewrap_SOURCES = pgpewrap.c |
| 546 |
-+ |
| 547 |
- EXTRA_SCRIPTS = |
| 548 |
- |
| 549 |
--pgpring_SOURCES = pgppubring.c |
| 550 |
--pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT) |
| 551 |
--pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS) |
| 552 |
-+neomutt_pgpring_SOURCES = pgppubring.c |
| 553 |
-+neomutt_pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT) |
| 554 |
-+neomutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS) |
| 555 |
- |
| 556 |
- txt2c_SOURCES = txt2c.c |
| 557 |
- txt2c_LDADD = |
| 558 |
-@@ -130,7 +132,7 @@ LDADD = $(LIBOBJS) $(INTLLIBS) |
| 559 |
- dist-hook: |
| 560 |
- echo $(VERSION) > $(distdir)/.tarball-version |
| 561 |
- |
| 562 |
--git_ver.h: $(mutt_SOURCES) $(SUBDIRS) |
| 563 |
-+git_ver.h: $(neomutt_SOURCES) $(SUBDIRS) |
| 564 |
- version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \ |
| 565 |
- echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \ |
| 566 |
- cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \ |
| 567 |
-diff --git a/configure.ac b/configure.ac |
| 568 |
-index 1e888e86..7898fa1b 100644 |
| 569 |
---- a/configure.ac |
| 570 |
-+++ b/configure.ac |
| 571 |
-@@ -4,7 +4,7 @@ dnl autoreconf -i |
| 572 |
- CFLAGS=$CFLAGS |
| 573 |
- LDFLAGS=$LDFLAGS |
| 574 |
- |
| 575 |
--AC_INIT([NeoMutt], [20170912], [neomutt-devel@×××××××.org], [mutt], [https://www.neomutt.org]) |
| 576 |
-+AC_INIT([NeoMutt], [20170912], [neomutt-devel@×××××××.org], [neomutt], [https://www.neomutt.org]) |
| 577 |
- AC_CONFIG_SRCDIR(mutt.h) |
| 578 |
- AC_CONFIG_AUX_DIR([.build-aux]) |
| 579 |
- AM_INIT_AUTOMAKE |
| 580 |
-@@ -186,7 +186,7 @@ AC_ARG_WITH(mailpath, |
| 581 |
- AC_ARG_WITH(docdir, |
| 582 |
- AS_HELP_STRING([--with-docdir=PATH],[Specify where to put the documentation]), |
| 583 |
- [mutt_cv_docdir=$withval], |
| 584 |
-- [mutt_cv_docdir='${datarootdir}/doc/mutt']) |
| 585 |
-+ [mutt_cv_docdir='${datarootdir}/doc/neomutt']) |
| 586 |
- |
| 587 |
- AC_ARG_WITH(domain, |
| 588 |
- AS_HELP_STRING([--with-domain=DOMAIN],[Specify your DNS domain name]), |
| 589 |
-@@ -213,14 +213,14 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [ |
| 590 |
- dnl --enable-pgp |
| 591 |
- AS_IF([test x$use_pgp != "xno"], [ |
| 592 |
- AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP, 1, [Define if you want classic PGP Support.]) |
| 593 |
-- PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" |
| 594 |
-+ PGPAUX_TARGET="neomutt_pgpring\$(EXEEXT) neomutt_pgpewrap\$(EXEEXT)" |
| 595 |
- build_ncrypt_pgp="yes" |
| 596 |
- ]) |
| 597 |
- |
| 598 |
- dnl --enable-smime |
| 599 |
- AS_IF([test x$use_smime != "xno"], [ |
| 600 |
- AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME, 1, [Define if you want classic S/MIME support.]) |
| 601 |
-- SMIMEAUX_TARGET='$(top_srcdir)/contrib/smime_keys' |
| 602 |
-+ SMIMEAUX_TARGET='$(top_srcdir)/contrib/neomutt_smime_keys' |
| 603 |
- build_ncrypt_smime="yes" |
| 604 |
- ]) |
| 605 |
- |
| 606 |
-diff --git a/contrib/smime_keys b/contrib/neomutt_smime_keys |
| 607 |
-similarity index 100% |
| 608 |
-rename from contrib/smime_keys |
| 609 |
-rename to contrib/neomutt_smime_keys |
| 610 |
-diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc |
| 611 |
-index bd01e2d2..08b592dd 100644 |
| 612 |
---- a/contrib/pgp2.rc |
| 613 |
-+++ b/contrib/pgp2.rc |
| 614 |
-@@ -37,10 +37,10 @@ set pgp_export_command="pgp -kxaf +language=mutt %r" |
| 615 |
- set pgp_verify_key_command="pgp -kcc +language=mutt %r" |
| 616 |
- |
| 617 |
- # read in the public key ring |
| 618 |
--set pgp_list_pubring_command="pgpring -2 %r" |
| 619 |
-+set pgp_list_pubring_command="neomutt_pgpring -2 %r" |
| 620 |
- |
| 621 |
- # read in the secret key ring |
| 622 |
--set pgp_list_secring_command="pgpring -s -2 %r" |
| 623 |
-+set pgp_list_secring_command="neomutt_pgpring -s -2 %r" |
| 624 |
- |
| 625 |
- # pattern for good signature |
| 626 |
- set pgp_good_sign="Good signature" |
| 627 |
-diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc |
| 628 |
-index 4440d6b7..cdd85217 100644 |
| 629 |
---- a/contrib/pgp5.rc |
| 630 |
-+++ b/contrib/pgp5.rc |
| 631 |
-@@ -34,9 +34,9 @@ set pgp_export_command="pgpk -xa +language=mutt --OutputInformationFD=1 %r" |
| 632 |
- set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r" |
| 633 |
- |
| 634 |
- # read in the public key ring |
| 635 |
--set pgp_list_pubring_command="pgpring -5 %r" |
| 636 |
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r" |
| 637 |
- |
| 638 |
- # read in the secret key ring |
| 639 |
--set pgp_list_secring_command="pgpring -5 -s %r" |
| 640 |
-+set pgp_list_secring_command="neomutt_pgpring -5 -s %r" |
| 641 |
- |
| 642 |
- |
| 643 |
-diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc |
| 644 |
-index a8708042..6b1ef985 100644 |
| 645 |
---- a/contrib/pgp6.rc |
| 646 |
-+++ b/contrib/pgp6.rc |
| 647 |
-@@ -31,10 +31,10 @@ set pgp_export_command="pgp6 +compatible -kxaf %r" |
| 648 |
- set pgp_verify_key_command="pgp6 +compatible -kcc %r" |
| 649 |
- |
| 650 |
- # read in the public key ring |
| 651 |
--set pgp_list_pubring_command="pgpring -5 %r" |
| 652 |
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r" |
| 653 |
- |
| 654 |
- # read in the secret key ring |
| 655 |
--set pgp_list_secring_command="pgpring -s -5 %r" |
| 656 |
-+set pgp_list_secring_command="neomutt_pgpring -s -5 %r" |
| 657 |
- |
| 658 |
- # create a clearsigned message |
| 659 |
- set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible +verbose=0 +batchmode +clearsig -afst %?a? -u %a?" |
| 660 |
-diff --git a/contrib/smime.rc b/contrib/smime.rc |
| 661 |
-index 532ac9ec..aa9897fb 100644 |
| 662 |
---- a/contrib/smime.rc |
| 663 |
-+++ b/contrib/smime.rc |
| 664 |
-@@ -52,7 +52,7 @@ set smime_get_signer_cert_command="openssl smime -verify -in %f -noverify -signe |
| 665 |
- set smime_get_cert_email_command="openssl x509 -in %f -noout -email" |
| 666 |
- |
| 667 |
- # Add a certificate to the database using smime_keys. |
| 668 |
--set smime_import_cert_command="smime_keys add_cert %f" |
| 669 |
-+set smime_import_cert_command="neomutt_smime_keys add_cert %f" |
| 670 |
- |
| 671 |
- |
| 672 |
- |
| 673 |
-diff --git a/doc/Makefile.am b/doc/Makefile.am |
| 674 |
-index 9bfe7ea6..dffbe5f6 100644 |
| 675 |
---- a/doc/Makefile.am |
| 676 |
-+++ b/doc/Makefile.am |
| 677 |
-@@ -40,11 +40,11 @@ install-data-local: makedoc-all |
| 678 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/man1 |
| 679 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/man5 |
| 680 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir) |
| 681 |
-- $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 |
| 682 |
-- $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 |
| 683 |
-+ $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1 |
| 684 |
-+ $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/neomuttrc.5 |
| 685 |
- $(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1 |
| 686 |
-- $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1 |
| 687 |
-- $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1 |
| 688 |
-+ $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpewrap.1 |
| 689 |
-+ $(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpring.1 |
| 690 |
- $(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox.5 |
| 691 |
- $(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf.5 |
| 692 |
- $(MKDIR_P) $(DESTDIR)$(docdir) |
| 693 |
-@@ -58,28 +58,28 @@ install-data-local: makedoc-all |
| 694 |
- -for f in $(HTML_DOCFILES); do \ |
| 695 |
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir); \ |
| 696 |
- done |
| 697 |
-- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist |
| 698 |
-- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ]; then \ |
| 699 |
-- mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir); \ |
| 700 |
-- elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ]; then \ |
| 701 |
-- mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir); \ |
| 702 |
-- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ]; then \ |
| 703 |
-- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir); \ |
| 704 |
-+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/neoMuttrc.dist |
| 705 |
-+ -if [ -f $(DESTDIR)$(pkgdatadir)/neoMuttrc ]; then \ |
| 706 |
-+ mv $(DESTDIR)$(pkgdatadir)/neoMuttrc* $(DESTDIR)$(sysconfdir); \ |
| 707 |
-+ elif [ -f $(DESTDIR)$(pkgdatadir)/../neoMuttrc ]; then \ |
| 708 |
-+ mv $(DESTDIR)$(pkgdatadir)/../neoMuttrc* $(DESTDIR)$(sysconfdir); \ |
| 709 |
-+ elif [ ! -f $(DESTDIR)$(sysconfdir)/neoMuttrc ]; then \ |
| 710 |
-+ $(INSTALL) -m 644 neoMuttrc $(DESTDIR)$(sysconfdir); \ |
| 711 |
- fi |
| 712 |
- -$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir) |
| 713 |
- |
| 714 |
- uninstall-local: |
| 715 |
-- for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \ |
| 716 |
-+ for f in neomutt.1 smime_keys.1 neomutt_pgpewrap.1 neomutt_pgpring.1; do \ |
| 717 |
- rm -f $(DESTDIR)$(mandir)/man1/$$f; \ |
| 718 |
- done |
| 719 |
-- for f in muttrc.5 mbox.5 mmdf.5; do \ |
| 720 |
-+ for f in neomuttrc.5 mbox.5 mmdf.5; do \ |
| 721 |
- rm -f $(DESTDIR)$(mandir)/man5/$$f; \ |
| 722 |
- done |
| 723 |
- for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); do \ |
| 724 |
- rm -f $(DESTDIR)$(docdir)/$$f; \ |
| 725 |
- done |
| 726 |
- -rm -f $(DESTDIR)$(docdir)/manual.txt |
| 727 |
-- for i in Muttrc; do \ |
| 728 |
-+ for i in neoMuttrc; do \ |
| 729 |
- if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i; then \ |
| 730 |
- rm $(DESTDIR)$(sysconfdir)/$$i; \ |
| 731 |
- fi; \ |
| 732 |
-@@ -122,7 +122,7 @@ sortcheck: manual.xml |
| 733 |
- clean-local: |
| 734 |
- rm -f *.html mutt.1 muttrc.man |
| 735 |
- |
| 736 |
--DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc |
| 737 |
-+DISTCLEANFILES = manual.txt manual.html manual.xml neoMuttrc |
| 738 |
- |
| 739 |
- muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail |
| 740 |
- $(MAKEDOC_CPP) $(top_srcdir)/init.h | \ |
| 741 |
-diff --git a/lib/Makefile.am b/lib/Makefile.am |
| 742 |
-index ac7658a9..222cbc68 100644 |
| 743 |
---- a/lib/Makefile.am |
| 744 |
-+++ b/lib/Makefile.am |
| 745 |
-@@ -7,7 +7,7 @@ EXTRA_DIST = lib.h base64.h buffer.h date.h debug.h exit.h file.h hash.h mapping |
| 746 |
- |
| 747 |
- AM_CPPFLAGS = -I$(top_srcdir) |
| 748 |
- |
| 749 |
--noinst_LIBRARIES = libmutt.a |
| 750 |
-+noinst_LIBRARIES = libneomutt.a |
| 751 |
- |
| 752 |
--libmutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c |
| 753 |
-+libneomutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c |
| 754 |
- |
| 755 |
--- |
| 756 |
-2.13.6 |
| 757 |
- |
Archives