rpm/mutt
1
0
Fork 1
forked from pool/mutt
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=109
This commit is contained in:
Dr. Werner Fink 2015-09-11 15:37:14 +00:00 committed by Git OBS Bridge
parent 5f3812736e
commit 35fed0c7cd
15 changed files with 2133 additions and 2731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mutt-1.5.23.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37
size 3782032

55
mutt-1.5.21-opennfs.dif → mutt-1.5.24-opennfs.dif
View File

@ -1,6 +1,17 @@
---
Makefile.am | 4 -
Makefile.in | 6 +-
lib.c | 7 ++-
mbox.c | 2
mh.c | 9 +++-
mutt.h | 1
opennfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sendlib.c | 2
8 files changed, 144 insertions(+), 9 deletions(-)
--- Makefile.am
+++ Makefile.am 2009-03-02 23:00:00.000000000 +0000
@@ -27,7 +27,7 @@ mutt_SOURCES = \
+++ Makefile.am 2015-09-11 14:41:16.061518931 +0000
@@ -29,7 +29,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@ -9,18 +20,18 @@
postpone.c query.c recvattach.c recvcmd.c \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \
@@ -83,7 +83,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = @LIBOBJS@
mutt_dotlock_DEPENDENCIES = @LIBOBJS@
@@ -84,7 +84,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = $(LIBOBJS)
mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
-pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c
+pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c opennfs.c md5.c pgppacket.c ascii.c
pgpring_LDADD = @LIBOBJS@ $(INTLLIBS)
pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
pgpring_LDADD = $(LIBOBJS) $(INTLLIBS)
pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
--- Makefile.in
+++ Makefile.in 2009-03-03 16:00:38.000000000 +0000
@@ -77,7 +77,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
+++ Makefile.in 2015-09-11 14:41:53.390018589 +0000
@@ -125,7 +125,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \
@ -29,16 +40,16 @@
postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \
recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \
@@ -105,7 +105,7 @@ pgpewrap_LDADD = $(LDADD)
pgpewrap_DEPENDENCIES = @LIBOBJS@
@@ -155,7 +155,7 @@ pgpewrap_LDADD = $(LDADD)
pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1)
am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \
- pgppacket.$(OBJEXT) ascii.$(OBJEXT)
+ pgppacket.$(OBJEXT) ascii.$(OBJEXT) opennfs.$(OBJEXT)
pgpring_OBJECTS = $(am_pgpring_OBJECTS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -354,7 +354,7 @@ mutt_SOURCES = \
am_txt2c_OBJECTS = txt2c.$(OBJEXT)
txt2c_OBJECTS = $(am_txt2c_OBJECTS)
@@ -474,7 +474,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@ -57,7 +68,7 @@
#include "lib.h"
@@ -632,6 +633,10 @@ int safe_open (const char *path, int fla
@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla
struct stat osb, nsb;
int fd;
@ -68,7 +79,7 @@
if (flags & O_EXCL)
{
char safe_file[_POSIX_PATH_MAX];
@@ -655,7 +660,7 @@ int safe_open (const char *path, int fla
@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla
if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0)
return fd;
@ -78,8 +89,8 @@
if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
compare_stat(&osb, &nsb) == -1)
--- mbox.c
+++ mbox.c 2010-11-04 14:01:04.775926675 +0000
@@ -782,7 +782,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+++ mbox.c 2010-11-04 14:01:05.000000000 +0000
@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
/* Create a temporary file to write the new version of the mailbox in. */
mutt_mktemp (tempfile, sizeof (tempfile));
@ -90,7 +101,7 @@
if (-1 != i)
--- mh.c
+++ mh.c 2009-03-02 23:00:00.000000000 +0000
@@ -277,7 +277,11 @@ static int mh_mkstemp (CONTEXT * dest, F
@@ -332,7 +332,11 @@ static int mh_mkstemp (CONTEXT * dest, F
{
snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d",
dest->path, NONULL (Hostname), (int) getpid (), Counter++);
@ -102,7 +113,7 @@
{
if (errno != EEXIST)
{
@@ -1290,8 +1294,11 @@ int maildir_open_new_message (MESSAGE *
@@ -1345,8 +1349,11 @@ int maildir_open_new_message (MESSAGE *
dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
path));
@ -117,7 +128,7 @@
{
--- mutt.h
+++ mutt.h 2009-03-02 23:00:00.000000000 +0000
@@ -972,4 +972,5 @@ typedef struct
@@ -981,4 +981,5 @@ typedef struct
#include "lib.h"
#include "globals.h"
@ -250,7 +261,7 @@
+}
--- sendlib.c
+++ sendlib.c 2009-03-02 23:00:00.000000000 +0000
@@ -2216,7 +2216,7 @@ send_msg (const char *path, char **args,
@@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args,
if (SendmailWait >= 0 && tempfile && *tempfile)
{
/* *tempfile will be opened as stdout */

3
mutt-1.5.24-patches.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:835e4f8c81ab862ff8aed0b1b0eaaa3660534c3992e7752dcdfe7f02a0859ca0
size 244

66
mutt-1.5.23.dif → mutt-1.5.24.dif
View File

@ -1,6 +1,16 @@
---
configure.ac | 10 ++++-
doc/Makefile.in | 2 -
doc/Muttrc | 102 +++++++++++++++++++++++++++++++++++++++++---------------
doc/Muttrc.head | 2 -
imap/auth.c | 20 ++++++++++
init.h | 3 +
mx.c | 3 +
7 files changed, 112 insertions(+), 30 deletions(-)
--- configure.ac
+++ configure.ac 2007-06-01 10:57:38.000000000 +0000
@@ -235,7 +235,7 @@ main ()
@@ -240,7 +240,7 @@ main ()
mutt_cv_slang=$withval
if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@ -9,7 +19,7 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -660,8 +660,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-
@@ -669,8 +669,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
else
if test "$with_ssl" != "yes"
then
@ -22,7 +32,7 @@
fi
saved_LIBS="$LIBS"
@@ -730,8 +734,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with
@@ -749,8 +753,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
if test "$with_sasl" != "yes"
then
@ -36,8 +46,8 @@
saved_LIBS="$LIBS"
--- doc/Makefile.in
+++ doc/Makefile.in 2010-11-04 13:01:17.839926726 +0000
@@ -575,7 +575,7 @@ uninstall-local:
+++ doc/Makefile.in 2010-11-04 13:01:18.000000000 +0000
@@ -685,7 +685,7 @@ uninstall-local:
check:
manual.txt: manual.html
@ -46,17 +56,6 @@
LC_ALL=C w3m -dump manual.html > $@ || \
LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
--- doc/Muttrc.head
+++ doc/Muttrc.head 2007-06-01 10:51:04.000000000 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message"
# Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+macro generic,index,pager <F1> "<shell-escape> less -iM @docdir@/manual.txt<Enter>" "show Mutt documentation"
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
--- doc/Muttrc
+++ doc/Muttrc 2009-03-03 14:56:33.000000000 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
@ -94,7 +93,7 @@
# Name: check_mbox_size
# Type: boolean
# Default: no
@@ -870,11 +870,11 @@ attachments -I message/external-body
@@ -909,11 +909,11 @@ attachments -I message/external-body
# filtered message is read from the standard output.
#
#
@ -108,7 +107,7 @@
#
#
# Contains the path of the mutt_dotlock(8) binary to be used by
@@ -2288,9 +2288,9 @@ attachments -I message/external-body
@@ -2351,9 +2351,9 @@ attachments -I message/external-body
# directly from the pager, and screen resizes cause lines longer than
# the screen width to be badly formatted in the help menu.
#
@ -121,7 +120,7 @@
# Name: pager_context
# Type: number
# Default: 0
@@ -2318,9 +2318,9 @@ attachments -I message/external-body
@@ -2381,9 +2381,9 @@ attachments -I message/external-body
# pager. The valid sequences are listed in the $index_format
# section.
#
@ -134,7 +133,7 @@
# Name: pager_index_lines
# Type: number
# Default: 0
@@ -2338,9 +2338,9 @@ attachments -I message/external-body
@@ -2401,9 +2401,9 @@ attachments -I message/external-body
# is less than $pager_index_lines, then the index will only use as
# many lines as it needs.
#
@ -147,7 +146,7 @@
# Name: pager_stop
# Type: boolean
# Default: no
@@ -3306,9 +3306,9 @@ attachments -I message/external-body
@@ -3440,9 +3440,9 @@ attachments -I message/external-body
# (possibly undeleted) message whenever a command that modifies the
# current message is executed.
#
@ -160,7 +159,7 @@
# Name: reverse_alias
# Type: boolean
# Default: no
@@ -3440,6 +3440,18 @@ attachments -I message/external-body
@@ -3574,6 +3574,18 @@ attachments -I message/external-body
# Also see the $force_name variable.
#
#
@ -179,7 +178,7 @@
# set score=yes
#
# Name: score
@@ -4011,9 +4023,9 @@ attachments -I message/external-body
@@ -4144,9 +4156,9 @@ attachments -I message/external-body
# Setting this variable overrides the value of the $sendmail
# variable.
#
@ -192,7 +191,7 @@
# Name: sort
# Type: sort order
# Default: date
@@ -4457,9 +4469,9 @@ attachments -I message/external-body
@@ -4630,9 +4642,9 @@ attachments -I message/external-body
# When set, mutt uses the date received rather than the date sent
# to thread messages by subject.
#
@ -205,7 +204,7 @@
# Name: tilde
# Type: boolean
# Default: no
@@ -4770,6 +4782,42 @@ attachments -I message/external-body
@@ -4980,6 +4992,42 @@ attachments -I message/external-body
# in this case.
#
#
@ -248,6 +247,17 @@
# set write_inc=10
#
# Name: write_inc
--- doc/Muttrc.head
+++ doc/Muttrc.head 2007-06-01 10:51:04.000000000 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message"
# Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+macro generic,index,pager <F1> "<shell-escape> less -iM @docdir@/manual.txt<Enter>" "show Mutt documentation"
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
--- imap/auth.c
+++ imap/auth.c 2006-11-09 15:19:56.000000000 +0000
@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
@ -286,7 +296,7 @@
FREE (&methods);
--- init.h
+++ init.h 2009-06-25 15:52:10.000000000 +0000
@@ -2944,6 +2944,9 @@ struct option_t MuttVars[] = {
@@ -3044,6 +3044,9 @@ struct option_t MuttVars[] = {
** the default from the GNUTLS library.
*/
# endif /* USE_SSL_GNUTLS */
@ -297,8 +307,8 @@
/*
** .pp
--- mx.c
+++ mx.c 2011-07-07 11:24:48.680426606 +0000
@@ -1591,6 +1591,9 @@ void mx_update_context (CONTEXT *ctx, in
+++ mx.c 2011-07-07 11:24:49.000000000 +0000
@@ -1537,6 +1537,9 @@ void mx_update_context (CONTEXT *ctx, in
{
h = ctx->hdrs[msgno];

3
mutt-1.5.24.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
size 3897115

46
mutt.changes
View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Fri Sep 11 15:14:48 UTC 2015 - werner@suse.de
- Update to mutt version 1.5.24
+ terminal status-line (TS) support, a.k.a. xterm title. see the
following variables: $ts_enabled, $ts_icon_format, $ts_status_format
! $ssl_use_sslv3 is disabled by default.
! command-line arguments: -H now combines template and command-line
address arguments.
! GnuPG signature name is set to signature.asc
+ New color object "prompt" added.
+ Ability to encrypt postponed messages. See $postpone_encrypt and
$postpone_encrypt_as.
! History ring now has a scratch buffer.
! mail-key is implemented for GPGME. (Requires a recent GPGME).
! Removed GPG_AGENT_INFO check for GnuPG 2.1 compatibility. Please
set pgp_use_gpg_agent if using GnuPG 2.1 or later.
! $smime_encrypt_with now defaults to aes256.
! GnuPG fingerprints are used internally when possible.
"--with-fingerprint" should be added to $pgp_list_pubring_command and
$pgp_list_secring_command to enable this. Please see contrib/gpg.rc.
Fingerprints may also be used at the prompts for key selection.
+ $crypt_opportunistic_encrypt automatically enables/disables encryption
based on message recipients.
! Attachments for signed, unencrypted emails may be deleted.
! Multiple crypt-hooks may be defined for the same regexp.
This means multiple keys may be used for a recipient.
+ $crypt_confirmhook allows the confirmation prompt for crypt-hooks to
be disabled.
+ $ssl_ciphers allows the SSL ciphers to be directly set.
! sime_keys better handles importing certificate chains.
! sime_keys now records certificate purposes (sign/encrypt). Run
"sime_keys refresh" to update smime index files.
+ $maildir_check_cur polls the maildir "cur" directory for new mail.
- Ported patches
patch-1.5.21.vk.pgp_verbose_mime becomes patch-1.5.24.vk.pgp_verbose_mime
patch-1.5.23.rr.compressed.bz2 becomes patch-1.5.24.rr.compressed.bz2
patch-1.5.23.sidebar.20140412.patch becomes patch-1.5.24.sidebar.20140412.patch
mutt-1.5.21-opennfs.dif becomes mutt-1.5.24-opennfs.dif
mutt-1.5.23.dif becomes mutt-1.5.24.dif
- Modfied patches
nion.sidebar-color.diff
widechar.sidebar.dif
- Removed patch
patch-1.5.23.xtitles.patch
-------------------------------------------------------------------
Mon Jan 26 16:22:08 UTC 2015 - werner@suse.de

26
mutt.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package mutt
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,6 +24,7 @@ BuildRequires: cyrus-sasl-devel
BuildRequires: cyrus-sasl-gssapi
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_4
BuildRequires: fdupes
BuildRequires: gdbm-devel
BuildRequires: glibc-i18ndata
BuildRequires: ispell
@ -66,8 +67,8 @@ Requires(postun): shared-mime-info
# NOTE: We don't want this dependency and desktop-data-SuSE is in all
# desktop selections.
#Requires: desktop-data-SuSE
Version: 1.5.23
Release: 33.2
Version: 1.5.24
Release: 0
Summary: Mail Program
License: GPL-2.0+
Group: Productivity/Networking/Email/Clients
@ -88,15 +89,14 @@ Patch1: patch-%version.rr.compressed.bz2
Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.20-sendgroupreplyto.diff
Patch4: %name-1.5.15-wrapcolumn.diff
Patch5: patch-1.5.23.xtitles.patch
# http://lunar-linux.org/mutt-sidebar
Patch6: patch-1.5.23.sidebar.20140412.patch
Patch7: mutt-1.5.21-opennfs.dif
Patch6: patch-1.5.24.sidebar.20140412.patch
Patch7: mutt-1.5.24-opennfs.dif
Patch9: bug-676388-largefile.patch
Patch10: mutt-1.5.21-tinfo.dif
# http://www.wolfermann.org/mutt.html
Patch11: aw.listreply.diff
Patch12: patch-1.5.21.vk.pgp_verbose_mime
Patch12: patch-1.5.24.vk.pgp_verbose_mime
Patch14: nion.sidebar-color.diff
# PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler
Patch15: widechar.sidebar.dif
@ -122,18 +122,17 @@ for p in ../%name-%version-patches/*; do
patch -s -p1 < $p
done
%patch
%patch1 -p1 -b .compressed
%patch1 -p0 -b .compressed
%patch2 -p0 -b .pgpewrap
%patch3 -p1 -b .sendgroupreplyto
%patch4 -p0 -b .wrapcolumn
%patch5 -p1 -b .xtitles
%patch6 -p1 -b .sidebar
%patch6 -p0 -b .sidebar
%patch7 -p0 -b .opennfs
%patch9 -p1 -b .largefile
%patch10 -p0 -b .tinfo
%patch11 -p1 -b .listreply
%patch12 -p1 -b .pgp_verbose_mtime
%patch14 -p1 -b .sidebar.color
%patch12 -p0 -b .pgp_verbose_mtime
%patch14 -p2 -b .sidebar.color
%patch15 -p0 -b .widechar.sidebar
%patch16 -p0 -b .crlf
%patch18 -p1 -b .mailcap
@ -246,8 +245,6 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc
install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap
%suse_update_desktop_file mutt
#%fdupes %{buildroot}
%if 0%{?suse_version} >= 1140
%post
@ -261,7 +258,6 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap
%defattr(-,root,root)
%doc doc/manual*.html doc/manual.txt.gz COPYRIGHT README* NEWS TODO
%doc doc/PGP-Notes.txt doc/applying-patches.txt doc/devel-notes.txt
%doc contrib/
%config(noreplace) %{_sysconfdir}/skel/.muttrc
%{_bindir}/mutt
%{_bindir}/pgpewrap

38
nion.sidebar-color.diff
View File

@ -1,16 +1,17 @@
diff --git a/color.c b/color.c
index bb6cbb4..bbf20a3 100644
--- a/color.c
+++ b/color.c
@@ -95,6 +95,7 @@ static struct mapping_t Fields[] =
diff --git a/mutt-1.5.24/color.c b/mutt-1.5.24/color.c
--- a/mutt-1.5.24/color.c
+++ b/mutt-1.5.24/color.c
@@ -95,6 +95,7 @@ static const struct mapping_t Fields[] =
{ "index", MT_COLOR_INDEX },
{ "sidebar_new", MT_COLOR_NEW },
{ "sidebar_flagged", MT_COLOR_FLAGGED },
+ { "sidebar", MT_COLOR_SIDEBAR },
+ { "sidebar", MT_COLOR_SIDEBAR },
{ "prompt", MT_COLOR_PROMPT },
{ NULL, 0 }
};
@@ -144,6 +145,7 @@ void ci_start_color (void)
@@ -145,6 +146,7 @@ void ci_start_color (void)
/* set some defaults */
ColorDefs[MT_COLOR_STATUS] = A_REVERSE;
@ -18,11 +19,10 @@ index bb6cbb4..bbf20a3 100644
ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;
ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;
ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;
diff --git a/mutt_curses.h b/mutt_curses.h
index 5f61048..cb1acf2 100644
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -125,6 +125,7 @@ enum
diff --git a/mutt-1.5.24/mutt_curses.h b/mutt-1.5.24/mutt_curses.h
--- a/mutt-1.5.24/mutt_curses.h
+++ b/mutt-1.5.24/mutt_curses.h
@@ -119,6 +119,7 @@ enum
MT_COLOR_ATTACHMENT,
MT_COLOR_SEARCH,
MT_COLOR_BOLD,
@ -30,11 +30,10 @@ index 5f61048..cb1acf2 100644
MT_COLOR_UNDERLINE,
MT_COLOR_INDEX,
MT_COLOR_NEW,
diff --git a/sidebar.c b/sidebar.c
index 9e12319..4b37b76 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -250,13 +250,14 @@
diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c
--- a/mutt-1.5.24/sidebar.c
+++ b/mutt-1.5.24/sidebar.c
@@ -250,13 +250,14 @@ int draw_sidebar(int menu) {
}
/* get attributes for divider */
@ -50,7 +49,7 @@ index 9e12319..4b37b76 100644
/* draw the divider */
@@ -266,10 +267,14 @@
@@ -266,10 +267,14 @@ int draw_sidebar(int menu) {
for ( ; lines < SidebarHeight; lines++ ) {
move(lines, SidebarWidth - delim_len);
@ -69,4 +68,3 @@ index 9e12319..4b37b76 100644
}
if ( Incoming == 0 ) return 0;

3
patch-1.5.23.rr.compressed.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f92431ff7e793af274d200324c4526d470e88d68d6cb803aaf387c9292dba62
size 9730

2412
patch-1.5.23.sidebar.20140412.patch
View File

File diff suppressed because it is too large Load Diff

198
patch-1.5.23.xtitles.patch
View File

@ -1,198 +0,0 @@
From: Cristoph Berg <myon@debian.org>
Date: Thu, 27 Feb 2014 12:25:51 +0100
Subject: xtitles
This is the xterm title patch as found on the mutt mailing lists.
* Changes made:
- 2007-01-27 myon: using %P caused a segfault, updated status.c to catch
menu==NULL.
- 2007-02-20 myon: make the note about the xterm_set_titles defaults a
comment.
- 2008-08-02 myon: move set_xterm_* prototypes into the proper header file
(cleaner code, no functional change, evades conflict with sidebar patch)
Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com>
Gbp-Pq: Topic features
---
curs_main.c | 20 ++++++++++++++++++++
globals.h | 2 ++
init.c | 20 ++++++++++++++++++++
init.h | 21 +++++++++++++++++++++
mutt.h | 1 +
mutt_menu.h | 2 ++
pager.c | 7 +++++++
status.c | 2 ++
8 files changed, 75 insertions(+)
diff --git a/curs_main.c b/curs_main.c
index aa4b044..16ddbc9 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -110,6 +110,19 @@ static const char *No_visible = N_("No visible messages.");
extern size_t UngetCount;
+#define ASCII_CTRL_G 0x07
+#define ASCII_CTRL_OPEN_SQUARE_BRAKET 0x1b
+
+void set_xterm_title_bar(char *title)
+{
+ fprintf(stderr ,"%c]2;%s%c", ASCII_CTRL_OPEN_SQUARE_BRAKET, title, ASCII_CTRL_G);
+}
+
+void set_xterm_icon_name(char *name)
+{
+ fprintf(stderr, "%c]1;%s%c", ASCII_CTRL_OPEN_SQUARE_BRAKET, name, ASCII_CTRL_G);
+}
+
void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num)
{
format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX;
@@ -560,6 +573,13 @@ int mutt_index_menu (void)
mutt_paddstr (COLS, buf);
NORMAL_COLOR;
menu->redraw &= ~REDRAW_STATUS;
+ if (option(OPTXTERMSETTITLES))
+ {
+ menu_status_line (buf, sizeof (buf), menu, NONULL (XtermTitle));
+ set_xterm_title_bar(buf);
+ menu_status_line (buf, sizeof (buf), menu, NONULL (XtermIcon));
+ set_xterm_icon_name(buf);
+ }
}
menu->redraw = 0;
diff --git a/globals.h b/globals.h
index 6fefe5b..584cd0c 100644
--- a/globals.h
+++ b/globals.h
@@ -141,6 +141,8 @@ WHERE char *Tempdir;
WHERE char *Tochars;
WHERE char *Username;
WHERE char *Visual;
+WHERE char *XtermTitle;
+WHERE char *XtermIcon;
WHERE char *CurrentFolder;
WHERE char *LastFolder;
diff --git a/init.c b/init.c
index cc3cf4b..81bb9e7 100644
--- a/init.c
+++ b/init.c
@@ -1877,6 +1877,26 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
toggle_option (MuttVars[idx].data);
else
set_option (MuttVars[idx].data);
+
+ /* sanity check for xterm */
+ if ((mutt_strcmp (MuttVars[idx].option, "xterm_set_titles") == 0)
+ && option (OPTXTERMSETTITLES))
+ {
+ char *ep = getenv ("TERM");
+ /* Make sure that the terminal can take the control codes */
+ if (ep == NULL) unset_option (MuttVars[idx].data);
+ else if (mutt_strncasecmp (ep, "xterm", 5) &&
+ mutt_strncasecmp (ep, "color-xterm", 11) &&
+ mutt_strncasecmp (ep, "eterm", 5) &&
+ mutt_strncasecmp (ep, "kterm", 5) &&
+ mutt_strncasecmp (ep, "nxterm", 6) &&
+ mutt_strncasecmp (ep, "putty", 5) &&
+ mutt_strncasecmp (ep, "screen", 6) &&
+ mutt_strncasecmp (ep, "cygwin", 6) &&
+ mutt_strncasecmp (ep, "rxvt", 4) )
+ unset_option (MuttVars[idx]. data);
+
+ }
}
else if (myvar || DTYPE (MuttVars[idx].type) == DT_STR ||
DTYPE (MuttVars[idx].type) == DT_PATH ||
diff --git a/init.h b/init.h
index 80d05ce..cf8e75a 100644
--- a/init.h
+++ b/init.h
@@ -3412,6 +3412,27 @@ struct option_t MuttVars[] = {
** Also see the $$read_inc, $$net_inc and $$time_inc variables and the
** ``$tuning'' section of the manual for performance considerations.
*/
+ {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"},
+ /*
+ ** .pp
+ ** Controls the format of the icon title, as long as xterm_set_titles
+ ** is enabled. This string is identical in formatting to the one used by
+ ** ``$$status_format''.
+ */
+ {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, 0},
+ /* The default must be off to force in the validity checking. */
+ /*
+ ** .pp
+ ** Controls whether mutt sets the xterm title bar and icon name
+ ** (as long as you are in an appropriate terminal).
+ */
+ {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, UL "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"},
+ /*
+ ** .pp
+ ** Controls the format of the title bar of the xterm provided that
+ ** xterm_set_titles has been set. This string is identical in formatting
+ ** to the one used by ``$$status_format''.
+ */
/*--*/
{ NULL, 0, 0, 0, 0 }
};
diff --git a/mutt.h b/mutt.h
index dcd7dc5..1d7e177 100644
--- a/mutt.h
+++ b/mutt.h
@@ -449,6 +449,7 @@ enum
OPTWRAPSEARCH,
OPTWRITEBCC, /* write out a bcc header? */
OPTXMAILER,
+ OPTXTERMSETTITLES,
OPTCRYPTUSEGPGME,
OPTCRYPTUSEPKA,
diff --git a/mutt_menu.h b/mutt_menu.h
index d459bef..82abecd 100644
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -103,6 +103,8 @@ void menu_current_middle (MUTTMENU *);
void menu_current_bottom (MUTTMENU *);
void menu_check_recenter (MUTTMENU *);
void menu_status_line (char *, size_t, MUTTMENU *, const char *);
+void set_xterm_title_bar (char *title);
+void set_xterm_icon_name (char *name);
MUTTMENU *mutt_new_menu (int);
void mutt_menuDestroy (MUTTMENU **);
diff --git a/pager.c b/pager.c
index 486d8c8..23eb8ca 100644
--- a/pager.c
+++ b/pager.c
@@ -1812,6 +1812,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
mutt_paddstr (COLS, bn);
}
NORMAL_COLOR;
+ if (option(OPTXTERMSETTITLES))
+ {
+ menu_status_line (buffer, sizeof (buffer), index, NONULL (XtermTitle));
+ set_xterm_title_bar(buffer);
+ menu_status_line (buffer, sizeof (buffer), index, NONULL (XtermIcon));
+ set_xterm_icon_name(buffer);
+ }
}
if ((redraw & REDRAW_INDEX) && index)
diff --git a/status.c b/status.c
index 1bb9a5a..6051e3a 100644
--- a/status.c
+++ b/status.c
@@ -195,6 +195,8 @@ status_format_str (char *buf, size_t buflen, size_t col, char op, const char *sr
break;
case 'P':
+ if (!menu)
+ break;
if (menu->top + menu->pagelen >= menu->max)
cp = menu->top ? "end" : "all";
else

3
patch-1.5.24.rr.compressed.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b1e63f051e53cb84faa541635df295c0a1e04a1f5a8cf3747f3b1eadb4561a9
size 9696

1937
patch-1.5.24.sidebar.20140412.patch Normal file
View File

File diff suppressed because it is too large Load Diff

41
patch-1.5.21.vk.pgp_verbose_mime → patch-1.5.24.vk.pgp_verbose_mime
View File

@ -1,7 +1,20 @@
diff -rupN a/globals.h b/globals.h
--- a/globals.h 2009-08-26 03:08:52.000000000 +0800
+++ b/globals.h 2012-04-11 12:52:44.826523028 +0800
@@ -227,6 +227,8 @@ WHERE REGEXP PgpGoodSign;
---
PATCHES | 1 +
globals.h | 2 ++
init.h | 12 ++++++++++++
pgp.c | 3 ++-
4 files changed, 17 insertions(+), 1 deletion(-)
--- PATCHES
+++ PATCHES 2012-04-11 04:52:45.000000000 +0000
@@ -1,3 +1,4 @@
+patch-1.5.3.vk.pgp_verbose_mime
patch-1.5.9.aw.listreply.1
patch-1.5.23.sidebar.20140412.txt
rr.compressed
--- globals.h
+++ globals.h 2012-04-11 04:52:45.000000000 +0000
@@ -239,6 +239,8 @@ WHERE REGEXP PgpGoodSign;
WHERE char *PgpSignAs;
WHERE short PgpTimeout;
WHERE char *PgpEntryFormat;
@ -10,10 +23,9 @@ diff -rupN a/globals.h b/globals.h
WHERE char *PgpClearSignCommand;
WHERE char *PgpDecodeCommand;
WHERE char *PgpVerifyCommand;
diff -rupN a/init.h b/init.h
--- a/init.h 2010-09-15 23:39:31.000000000 +0800
+++ b/init.h 2012-04-11 12:52:44.825523029 +0800
@@ -2556,6 +2556,18 @@ struct option_t MuttVars[] = {
--- init.h
+++ init.h 2012-04-11 04:52:45.000000000 +0000
@@ -2719,6 +2719,18 @@ struct option_t MuttVars[] = {
** a line quoted text if it also matches $$smileys. This mostly
** happens at the beginning of a line.
*/
@ -32,18 +44,13 @@ diff -rupN a/init.h b/init.h
diff -rupN a/PATCHES b/PATCHES
--- a/PATCHES 2008-03-20 04:07:06.000000000 +0800
+++ b/PATCHES 2012-04-11 12:52:44.824523030 +0800
@@ -0,0 +1 @@
+patch-1.5.3.vk.pgp_verbose_mime
diff -rupN a/pgp.c b/pgp.c
--- a/pgp.c 2010-09-14 01:19:55.000000000 +0800
+++ b/pgp.c 2012-04-11 12:52:44.825523029 +0800
@@ -1129,6 +1129,8 @@ BODY *pgp_sign_message (BODY *a)
--- pgp.c
+++ pgp.c 2015-09-11 14:47:19.817518523 +0000
@@ -1213,7 +1213,8 @@ BODY *pgp_sign_message (BODY *a)
t->disposition = DISPNONE;
t->encoding = ENC7BIT;
t->unlink = 1; /* ok to remove this file after sending. */
- mutt_set_parameter ("name", "signature.asc", &t->parameter);
+ mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
+ t->description = safe_strdup (PgpMimeSignatureDescription);

30
widechar.sidebar.dif
View File

@ -1,6 +1,10 @@
---
handler.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- handler.c
+++ handler.c 2013-04-22 00:00:00.000000000 +0000
@@ -778,7 +778,7 @@ static void enriched_set_flags (const wc
+++ handler.c 2015-09-11 14:52:40.778018507 +0000
@@ -780,7 +780,7 @@ static void enriched_set_flags (const wc
static int text_enriched_handler (BODY *a, STATE *s)
{
enum {
@ -9,7 +13,7 @@
} state = TEXT;
long bytes = a->length;
@@ -807,7 +807,7 @@ static int text_enriched_handler (BODY *
@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY *
{
if (state != ST_EOF)
{
@ -18,7 +22,7 @@
state = ST_EOF;
else
bytes--;
@@ -815,6 +815,8 @@ static int text_enriched_handler (BODY *
@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY *
switch (state)
{
@ -27,7 +31,7 @@
case TEXT :
switch (wc)
{
@@ -875,9 +877,8 @@ static int text_enriched_handler (BODY *
@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY *
enriched_flush (&stte, 1);
else
{
@ -38,7 +42,7 @@
}
break;
@@ -1490,7 +1491,7 @@ void mutt_decode_attachment (BODY *b, ST
@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, ST
* strip all trailing spaces to improve interoperability;
* if $text_flowed is unset, simply verbatim copy input
*/
@ -47,15 +51,15 @@
{
char *buf = NULL;
size_t l = 0, sz = 0;
@@ -1518,7 +1519,6 @@ int mutt_body_handler (BODY *b, STATE *s
int decode = 0;
int plaintext = 0;
@@ -1595,7 +1596,6 @@ static int run_decode_and_handler (BODY
int origType;
char *savePrefix = NULL;
FILE *fp = NULL;
- char tempfile[_POSIX_PATH_MAX];
handler_t handler = NULL;
LOFF_T tmpoffset = 0;
size_t tmplength = 0;
@@ -1528,6 +1528,8 @@ int mutt_body_handler (BODY *b, STATE *s
LOFF_T tmpoffset = 0;
int decode = 0;
@@ -1604,6 +1604,8 @@ static int run_decode_and_handler (BODY
#ifdef HAVE_FMEMOPEN
char *temp;
size_t tempsize;
@ -63,4 +67,4 @@
+ char tempfile[_POSIX_PATH_MAX];
#endif
int oflags = s->flags;
fseeko (s->fpin, b->offset, 0);