pool/mutt
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
41c0019edc
mutt/mutt-1.5.13.dif

308 lines
8.8 KiB
Plaintext
Raw Blame History

--- Makefile.am
+++ Makefile.am 2006-08-17 18:34:10.000000000 +0200
@@ -54,7 +54,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSY
AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
-CPPFLAGS=@CPPFLAGS@ -I$(includedir)
+CPPFLAGS=@CPPFLAGS@
EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
--- Muttrc
+++ Muttrc 2006-08-17 19:01:01.000000000 +0200
@@ -15,7 +15,7 @@ macro index,pager \cb "<pipe-message> ur
macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
# Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less ${prefix}/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
+macro generic,index,pager <F1> "<shell-escape>less -iM /usr/share/doc/packages/mutt/manual.txt.gz<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"
@@ -287,9 +287,9 @@ attachments -I message/external-body
# in a reply. For a full listing of defined printf()-like sequences see
# the section on ``$index_format''.
#
-#
-# set autoedit=no
-#
+
+set autoedit=yes
+
# Name: autoedit
# Type: boolean
# Default: no
@@ -641,11 +641,11 @@ attachments -I message/external-body
# filtered message is read from the standard output.
#
#
-# set dotlock_program="/usr/local/bin/mutt_dotlock"
+# set dotlock_program="/usr/bin/mutt_dotlock"
#
# Name: dotlock_program
# Type: path
-# Default: "/usr/local/bin/mutt_dotlock"
+# Default: "/usr/bin/mutt_dotlock"
#
#
# Contains the path of the mutt_dotlock (8) binary to be used by
@@ -1438,11 +1438,11 @@ attachments -I message/external-body
# See also: ``$to_chars''.
#
#
-# set ispell="/usr/bin/ispell"
+# set ispell="ispell"
#
# Name: ispell
# Type: path
-# Default: "/usr/bin/ispell"
+# Default: "ispell"
#
#
# How to invoke ispell (GNU's spell-checking software).
@@ -1890,9 +1890,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.
#
-#
-# set pager_context=0
-#
+
+set pager_context=4
+
# Name: pager_context
# Type: number
# Default: 0
@@ -1916,9 +1916,9 @@ attachments -I message/external-body
# pager. The valid sequences are listed in the ``$index_format''
# section.
#
-#
-# set pager_index_lines=0
-#
+
+set pager_index_lines=10
+
# Name: pager_index_lines
# Type: number
# Default: 0
@@ -1936,9 +1936,9 @@ attachments -I message/external-body
# is less than pager_index_lines, then the index will only use as
# many lines as it needs.
#
-#
-# set pager_stop=no
-#
+
+set pager_stop=yes
+
# Name: pager_stop
# Type: boolean
# Default: no
@@ -3357,9 +3357,9 @@ attachments -I message/external-body
# (possibly undeleted) message whenever a command that modifies the
# current message is executed.
#
-#
-# set reverse_alias=no
-#
+
+set reverse_alias=yes
+
# Name: reverse_alias
# Type: boolean
# Default: no
@@ -3479,6 +3479,18 @@ attachments -I message/external-body
# Also see the ``$force_name'' variable.
#
#
+# set send_group_reply_to=no
+#
+# Name: send_group_reply_to
+# Type: boolean
+# Default: no
+#
+#
+# This variable controls how group replies are done.
+# When set, all recepients listet in "To:" are set in the
+# "To:" header again, else in the "CC", which is the default.
+#
+#
# set score=yes
#
# Name: score
@@ -3684,9 +3696,9 @@ attachments -I message/external-body
# messages from the current folder. The default is to pause one second, so
# a value of zero for this option suppresses the pause.
#
-#
-# set sort=date
-#
+
+set sort=reverse-date-sent
+
# Name: sort
# Type: sort order
# Default: date
@@ -3980,9 +3992,9 @@ attachments -I message/external-body
# messages to be searched are decoded before searching. If unset,
# messages are searched as they appear in the folder.
#
-#
-# set tilde=no
-#
+
+set tilde=yes
+
# Name: tilde
# Type: boolean
# Default: no
@@ -4236,3 +4248,39 @@ attachments -I message/external-body
# messages to be sent. Exim users may wish to unset this.
#
#
+# set xterm_icon="M%?n?AIL&ail?"
+#
+# Name: xterm_icon
+# Type: string
+# Default: "M%?n?AIL&ail?"
+#
+#
+# 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''.
+#
+#
+# set xterm_set_titles=no
+#
+# Name: xterm_set_titles
+# Type: boolean
+# Default: no
+#
+#
+# Controls whether mutt sets the xterm title bar and icon name
+# (as long as you're in an appropriate terminal). The default must
+# be off to force in the validity checking.
+#
+#
+# set xterm_title="Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
+#
+# Name: xterm_title
+# Type: string
+# Default: "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
+#
+#
+# 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''.
+#
+#
--- Muttrc.head.in
+++ Muttrc.head.in 2006-08-17 18:46:05.000000000 +0200
@@ -15,7 +15,7 @@ macro index,pager \cb "<pipe-message> ur
macro attach,compose \cb "<pipe-entry> urlview<Enter>" "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"
--- configure.in
+++ configure.in 2006-08-17 18:34:10.000000000 +0200
@@ -222,7 +222,7 @@ main ()
mutt_cv_slang=$withval
if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
- elif test -d $withval/include; then
+ elif test -d $withval/include && test $withval != /usr ; then
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -633,8 +633,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-
if test "$with_ssl" != "yes"
then
+ case $withval in /usr|/usr/local) ;;
+ *)
LDFLAGS="$LDFLAGS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include"
+ ;;
+ esac
fi
saved_LIBS="$LIBS"
@@ -688,8 +692,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with
if test "$with_sasl" != "yes"
then
+ case $with_sasl in /usr|/usr/local) ;;
+ *)
CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
LDFLAGS="$LDFLAGS -L$with_sasl/lib"
+ ;;
+ esac
fi
saved_LIBS="$LIBS"
--- init.h
+++ init.h 2006-08-17 19:07:25.000000000 +0200
@@ -1951,6 +1951,9 @@ struct option_t MuttVars[] = {
** since it would otherwise have to abort the connection anyway. This
** option supersedes ``$$ssl_starttls''.
*/
+#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL)
+ { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 },
+#endif
{ "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
/*
** .pp
--- doc/Makefile.in
+++ doc/Makefile.in 2006-08-17 18:34:10.000000000 +0200
@@ -431,7 +431,7 @@ uninstall-local:
check:
manual.txt: manual.html
- -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
+ -lynx -dont_wrap_pre -center -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
manual.html: $(srcdir)/html.xsl stamp-doc-xml
-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
--- imap/auth.c
+++ imap/auth.c 2006-11-09 16:19:56.000000000 +0100
@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
authenticator = imap_authenticators;
+#ifdef USE_SASL
+ /* "login" not supported by SASL */
+ if (!ascii_strcasecmp ("login", method))
+ {
+ while (authenticator->authenticate)
+ {
+ char* identify = authenticator->method;
+ if (identify && !ascii_strcasecmp(identify, method))
+ if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL)
+ {
+ FREE(&methods);
+ return r;
+ }
+ authenticator++;
+ }
+ } else {
+#endif
while (authenticator->authenticate)
{
if (!authenticator->method ||
@@ -85,6 +102,9 @@ int imap_authenticate (IMAP_DATA* idata)
authenticator++;
}
+#ifdef USE_SASL
+ }
+#endif
}
FREE (&methods);
Reference in New Issue View Git Blame Copy Permalink