SOURCES: mutt-bj.status-time.patch, mutt-cd.signatures_menu.patch, ...
radek
radek at pld-linux.org
Mon Mar 26 15:11:20 CEST 2007
Author: radek Date: Mon Mar 26 13:11:20 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged 1.5.14 from DEVEL
---- Files affected:
SOURCES:
mutt-bj.status-time.patch (1.1 -> 1.2) , mutt-cd.signatures_menu.patch (1.1 -> 1.2) , mutt-cd.trash_folder.patch (1.1 -> 1.2) , mutt-esmtp.patch (1.2 -> 1.3) , mutt-folder_columns.patch (1.3 -> 1.4) , mutt-home_etc.patch (1.3 -> 1.4) , mutt-manual.patch (1.4 -> 1.5) , mutt-po.patch (1.1 -> 1.2) , mutt-rr.compressed.patch (1.6 -> 1.7) , mutt-xface.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/mutt-bj.status-time.patch
diff -u SOURCES/mutt-bj.status-time.patch:1.1 SOURCES/mutt-bj.status-time.patch:1.2
--- SOURCES/mutt-bj.status-time.patch:1.1 Thu Jan 24 22:09:57 2002
+++ SOURCES/mutt-bj.status-time.patch Mon Mar 26 15:11:15 2007
@@ -1,7 +1,7 @@
-diff -Nur mutt-1.3.25-2/curs_main.c mutt-1.3.25/curs_main.c
---- mutt-1.3.25-2/curs_main.c Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/curs_main.c Tue Jan 22 00:07:02 2002
-@@ -546,7 +546,7 @@
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main.c
+--- mutt-1.5.10.orig/curs_main.c 2005-10-07 09:28:10.000000000 +0200
++++ mutt-1.5.10/curs_main.c 2005-10-07 09:28:24.000000000 +0200
+@@ -559,7 +559,7 @@
menu_redraw_current (menu);
}
@@ -10,10 +10,19 @@
{
menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
-diff -Nur mutt-1.3.25-2/globals.h mutt-1.3.25/globals.h
---- mutt-1.3.25-2/globals.h Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/globals.h Tue Jan 22 00:07:02 2002
-@@ -145,6 +145,7 @@
+Only in mutt-1.5.10/doc: manual-1.html
+Only in mutt-1.5.10/doc: manual-2.html
+Only in mutt-1.5.10/doc: manual-3.html
+Only in mutt-1.5.10/doc: manual-4.html
+Only in mutt-1.5.10/doc: manual-5.html
+Only in mutt-1.5.10/doc: manual-6.html
+Only in mutt-1.5.10/doc: manual-7.html
+Only in mutt-1.5.10/doc: manual.html
+Only in mutt-1.5.10/doc: manual.txt
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/globals.h mutt-1.5.10/globals.h
+--- mutt-1.5.10.orig/globals.h 2005-08-03 11:17:46.000000000 +0200
++++ mutt-1.5.10/globals.h 2005-10-07 09:28:24.000000000 +0200
+@@ -174,6 +174,7 @@
WHERE short ReadInc;
WHERE short SendmailWait;
WHERE short SleepTime INITVAL (1);
@@ -21,10 +30,10 @@
WHERE short Timeout;
WHERE short WrapMargin;
WHERE short WriteInc;
-diff -Nur mutt-1.3.25-2/init.h mutt-1.3.25/init.h
---- mutt-1.3.25-2/init.h Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/init.h Tue Jan 22 00:09:07 2002
-@@ -2119,6 +2119,9 @@
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/init.h mutt-1.5.10/init.h
+--- mutt-1.5.10.orig/init.h 2005-10-07 09:28:10.000000000 +0200
++++ mutt-1.5.10/init.h 2005-10-07 09:28:24.000000000 +0200
+@@ -2626,6 +2626,9 @@
** .dt %u .dd number of unread messages *
** .dt %v .dd Mutt version string
** .dt %V .dd currently active limit pattern, if any *
@@ -34,7 +43,7 @@
** .dt %>X .dd right justify the rest of the string and pad with "X"
** .dt %|X .dd pad to the end of the line with "X"
** .de
-@@ -2160,6 +2163,16 @@
+@@ -2671,6 +2674,16 @@
** Setting this variable causes the ``status bar'' to be displayed on
** the first line of the screen rather than near the bottom.
*/
@@ -51,10 +60,10 @@
{ "strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, 0 },
/*
** .pp
-diff -Nur mutt-1.3.25-2/menu.c mutt-1.3.25/menu.c
---- mutt-1.3.25-2/menu.c Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/menu.c Tue Jan 22 00:07:02 2002
-@@ -1045,3 +1045,23 @@
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/menu.c mutt-1.5.10/menu.c
+--- mutt-1.5.10.orig/menu.c 2005-06-12 20:32:46.000000000 +0200
++++ mutt-1.5.10/menu.c 2005-10-07 09:28:24.000000000 +0200
+@@ -1087,3 +1087,23 @@
}
/* not reached */
}
@@ -78,19 +87,19 @@
+ else
+ return 0;
+}
-diff -Nur mutt-1.3.25-2/mutt_menu.h mutt-1.3.25/mutt_menu.h
---- mutt-1.3.25-2/mutt_menu.h Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/mutt_menu.h Tue Jan 22 00:07:02 2002
-@@ -107,3 +107,5 @@
- /* used in both the index and pager index to make an entry. */
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/mutt_menu.h mutt-1.5.10/mutt_menu.h
+--- mutt-1.5.10.orig/mutt_menu.h 2005-08-11 21:37:02.000000000 +0200
++++ mutt-1.5.10/mutt_menu.h 2005-10-07 09:28:59.000000000 +0200
+@@ -112,4 +112,5 @@
void index_make_entry (char *, size_t, struct menu_t *, int);
int index_color (int);
-+
+
+int update_status_time (void);
-diff -Nur mutt-1.3.25-2/pager.c mutt-1.3.25/pager.c
---- mutt-1.3.25-2/pager.c Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/pager.c Tue Jan 22 00:07:02 2002
-@@ -1712,7 +1712,7 @@
+ #endif /* _MUTT_MENU_H_ */
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/pager.c mutt-1.5.10/pager.c
+--- mutt-1.5.10.orig/pager.c 2005-08-11 21:37:02.000000000 +0200
++++ mutt-1.5.10/pager.c 2005-10-07 09:28:24.000000000 +0200
+@@ -1763,7 +1763,7 @@
SETCOLOR (MT_COLOR_NORMAL);
}
@@ -99,10 +108,10 @@
{
/* redraw the pager_index indicator, because the
* flags for this message might have changed. */
-diff -Nur mutt-1.3.25-2/status.c mutt-1.3.25/status.c
---- mutt-1.3.25-2/status.c Tue Jan 22 00:06:44 2002
-+++ mutt-1.3.25/status.c Tue Jan 22 00:07:02 2002
-@@ -26,6 +26,7 @@
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/status.c mutt-1.5.10/status.c
+--- mutt-1.5.10.orig/status.c 2005-10-07 09:28:10.000000000 +0200
++++ mutt-1.5.10/status.c 2005-10-07 09:28:24.000000000 +0200
+@@ -30,6 +30,7 @@
#include <string.h>
#include <ctype.h>
#include <unistd.h>
@@ -110,7 +119,7 @@
static char *get_sort_str (char *buf, size_t buflen, int method)
{
-@@ -284,6 +285,61 @@
+@@ -288,6 +289,61 @@
*buf = 0;
return (src);
@@ -172,4 +181,3 @@
default:
snprintf (buf, buflen, "%%%s%c", prefix, op);
break;
-
================================================================
Index: SOURCES/mutt-cd.signatures_menu.patch
diff -u SOURCES/mutt-cd.signatures_menu.patch:1.1 SOURCES/mutt-cd.signatures_menu.patch:1.2
--- SOURCES/mutt-cd.signatures_menu.patch:1.1 Tue Feb 12 21:57:45 2002
+++ SOURCES/mutt-cd.signatures_menu.patch Mon Mar 26 15:11:15 2007
@@ -56,8 +56,8 @@
case OP_PIPE:
case OP_FILTER:
diff -pruN2 mutt-1.3.27.orig/doc/manual.sgml.head mutt-1.3.27/doc/manual.sgml.head
---- mutt-1.3.27.orig/doc/manual.sgml.head Sat Jan 12 12:35:43 2002
-+++ mutt-1.3.27/doc/manual.sgml.head Wed Jan 23 22:35:32 2002
+--- mutt-1.3.27.orig/doc/manual.xml.head Sat Jan 12 12:35:43 2002
++++ mutt-1.3.27/doc/manual.xml.head Wed Jan 23 22:35:32 2002
@@ -526,4 +526,5 @@ c edit-cc edit the
b edit-bcc edit the Bcc field
y send-message send the message
@@ -179,7 +179,7 @@
diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
--- mutt-1.3.27.orig/signature.c Thu Jan 1 01:00:00 1970
+++ mutt-1.3.27/signature.c Wed Jan 23 22:35:32 2002
-@@ -0,0 +1,495 @@
+@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 2001 Cedric Duval <cedricduval at free.fr>
+ *
@@ -197,6 +197,10 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ */
++
++#if HAVE_CONFIG_H
++# include "config.h"
++#endif
+
+#include "mutt.h"
+#include "mutt_menu.h"
================================================================
Index: SOURCES/mutt-cd.trash_folder.patch
diff -u SOURCES/mutt-cd.trash_folder.patch:1.1 SOURCES/mutt-cd.trash_folder.patch:1.2
--- SOURCES/mutt-cd.trash_folder.patch:1.1 Tue Feb 12 21:57:01 2002
+++ SOURCES/mutt-cd.trash_folder.patch Mon Mar 26 15:11:15 2007
@@ -1,28 +1,35 @@
-diff -pruN2 mutt-1.3.27.orig/commands.c mutt-1.3.27/commands.c
---- mutt-1.3.27.orig/commands.c Mon Dec 3 11:17:57 2001
-+++ mutt-1.3.27/commands.c Wed Jan 23 22:33:11 2002
-@@ -616,9 +616,13 @@ void _mutt_save_message (HEADER *h, CONT
- mutt_parse_mime_message (Context, h);
-
-- if (mutt_append_message (ctx, Context, h, cmflags, chflags) == 0 && delete)
-+ if (mutt_append_message (ctx, Context, h, cmflags, chflags) == 0)
- {
-- mutt_set_flag (Context, h, M_DELETE, 1);
-- if (option (OPTDELETEUNTAG))
-- mutt_set_flag (Context, h, M_TAG, 0);
-+ if (delete)
-+ {
-+ mutt_set_flag (Context, h, M_DELETE, 1);
-+ if (option (OPTDELETEUNTAG))
-+ mutt_set_flag (Context, h, M_TAG, 0);
-+ }
-+ mutt_set_flag (Context, h, M_APPENDED, 1);
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/PATCHES mutt-1.5.10/PATCHES
+--- mutt-1.5.10.orig/PATCHES 2005-10-07 09:29:54.000000000 +0200
++++ mutt-1.5.10/PATCHES 2005-10-07 09:30:06.000000000 +0200
+@@ -1,2 +1,3 @@
+ vvv.quote
++patch-1.3.27.cd.trash_folder.1
+ rr.compressed
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/commands.c mutt-1.5.10/commands.c
+--- mutt-1.5.10.orig/commands.c 2005-08-02 09:08:00.000000000 +0200
++++ mutt-1.5.10/commands.c 2005-10-07 09:32:06.000000000 +0200
+@@ -690,6 +690,7 @@
+ if (option (OPTDELETEUNTAG))
+ mutt_set_flag (Context, h, M_TAG, 0);
}
++ mutt_set_flag (Context, h, M_APPENDED, 1);
+
+ return 0;
}
-diff -pruN2 mutt-1.3.27.orig/flags.c mutt-1.3.27/flags.c
---- mutt-1.3.27.orig/flags.c Tue Jan 15 22:12:59 2002
-+++ mutt-1.3.27/flags.c Wed Jan 23 22:33:11 2002
-@@ -76,4 +76,15 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+Only in mutt-1.5.10/doc: manual-1.html
+Only in mutt-1.5.10/doc: manual-2.html
+Only in mutt-1.5.10/doc: manual-3.html
+Only in mutt-1.5.10/doc: manual-4.html
+Only in mutt-1.5.10/doc: manual-5.html
+Only in mutt-1.5.10/doc: manual-6.html
+Only in mutt-1.5.10/doc: manual-7.html
+Only in mutt-1.5.10/doc: manual.html
+Only in mutt-1.5.10/doc: manual.txt
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/flags.c mutt-1.5.10/flags.c
+--- mutt-1.5.10.orig/flags.c 2005-02-03 19:47:52.000000000 +0100
++++ mutt-1.5.10/flags.c 2005-10-07 09:30:06.000000000 +0200
+@@ -91,6 +91,17 @@
+ }
break;
+ case M_APPENDED:
@@ -37,20 +44,24 @@
+ break;
+
case M_NEW:
- if (bf)
-diff -pruN2 mutt-1.3.27.orig/globals.h mutt-1.3.27/globals.h
---- mutt-1.3.27.orig/globals.h Thu Jan 3 21:56:46 2002
-+++ mutt-1.3.27/globals.h Wed Jan 23 22:33:11 2002
-@@ -110,4 +110,5 @@ WHERE char *Status;
+
+ #ifdef USE_IMAP
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/globals.h mutt-1.5.10/globals.h
+--- mutt-1.5.10.orig/globals.h 2005-10-07 09:29:54.000000000 +0200
++++ mutt-1.5.10/globals.h 2005-10-07 09:30:06.000000000 +0200
+@@ -130,6 +130,7 @@
+ WHERE char *Status;
WHERE char *Tempdir;
WHERE char *Tochars;
+WHERE char *TrashPath;
WHERE char *Username;
WHERE char *Visual;
-diff -pruN2 mutt-1.3.27.orig/init.h mutt-1.3.27/init.h
---- mutt-1.3.27.orig/init.h Mon Dec 10 11:09:03 2001
-+++ mutt-1.3.27/init.h Wed Jan 23 22:33:11 2002
-@@ -2236,4 +2236,11 @@ struct option_t MuttVars[] = {
+
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/init.h mutt-1.5.10/init.h
+--- mutt-1.5.10.orig/init.h 2005-10-07 09:29:54.000000000 +0200
++++ mutt-1.5.10/init.h 2005-10-07 09:30:06.000000000 +0200
+@@ -2774,6 +2774,13 @@
+ ** by \fIyou\fP. The sixth character is used to indicate when a mail
** was sent to a mailing-list you subscribe to (default: L).
*/
+ { "trash", DT_PATH, R_NONE, UL &TrashPath, 0 },
@@ -62,31 +73,39 @@
+ */
#ifdef USE_SOCKET
{ "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 },
-diff -pruN2 mutt-1.3.27.orig/mutt.h mutt-1.3.27/mutt.h
---- mutt-1.3.27.orig/mutt.h Tue Jan 15 22:00:32 2002
-+++ mutt-1.3.27/mutt.h Wed Jan 23 22:33:11 2002
-@@ -185,4 +185,5 @@ enum
+ /*
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/mutt.h mutt-1.5.10/mutt.h
+--- mutt-1.5.10.orig/mutt.h 2005-10-07 09:29:54.000000000 +0200
++++ mutt-1.5.10/mutt.h 2005-10-07 09:30:06.000000000 +0200
+@@ -207,6 +207,7 @@
+ M_DELETE,
M_UNDELETE,
M_DELETED,
+ M_APPENDED,
M_FLAG,
M_TAG,
-@@ -618,4 +619,5 @@ typedef struct header
+ M_UNTAG,
+@@ -702,6 +703,7 @@
+ unsigned int mime : 1; /* has a Mime-Version header? */
unsigned int flagged : 1; /* marked important? */
unsigned int tagged : 1;
+ unsigned int appended : 1; /* has been saved */
unsigned int deleted : 1;
unsigned int changed : 1;
-@@ -740,4 +742,5 @@ typedef struct
+ unsigned int attach_del : 1; /* has an attachment marked for deletion */
+@@ -830,6 +832,7 @@
+ int new; /* how many new messages? */
int unread; /* how many unread messages? */
int deleted; /* how many deleted messages */
+ int appended; /* how many saved messages? */
int flagged; /* how many flagged messages */
int msgnotreadyet; /* which msg "new" in pager, -1 if none */
-diff -pruN2 mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c
---- mutt-1.3.27.orig/mx.c Tue Jan 15 22:09:53 2002
-+++ mutt-1.3.27/mx.c Wed Jan 23 22:33:11 2002
-@@ -816,4 +816,45 @@ static int sync_mailbox (CONTEXT *ctx, i
+ #if defined USE_POP || defined USE_IMAP
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/mx.c mutt-1.5.10/mx.c
+--- mutt-1.5.10.orig/mx.c 2005-10-07 09:29:54.000000000 +0200
++++ mutt-1.5.10/mx.c 2005-10-07 09:30:06.000000000 +0200
+@@ -850,6 +850,47 @@
+ return rc;
}
+/* move deleted mails to the trash folder */
@@ -132,7 +151,9 @@
+
/* save changes and close mailbox */
int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
-@@ -999,9 +1040,17 @@ int mx_close_mailbox (CONTEXT *ctx, int
+ {
+@@ -1032,11 +1073,19 @@
+
if (ctx->changed || ctx->deleted)
{
- if ((check = sync_mailbox (ctx, index_hint)) != 0)
@@ -151,7 +172,9 @@
+ }
}
}
-@@ -1174,6 +1223,10 @@ int mx_sync_mailbox (CONTEXT *ctx, int *
+
+@@ -1214,8 +1263,12 @@
+ if (ctx->magic == M_IMAP)
rc = imap_sync_mailbox (ctx, purge, index_hint);
else
-#endif
@@ -163,10 +186,12 @@
+ }
if (rc == 0)
{
-diff -pruN2 mutt-1.3.27.orig/postpone.c mutt-1.3.27/postpone.c
---- mutt-1.3.27.orig/postpone.c Mon Dec 3 11:17:57 2001
-+++ mutt-1.3.27/postpone.c Wed Jan 23 22:33:11 2002
-@@ -271,4 +271,7 @@ int mutt_get_postponed (CONTEXT *ctx, HE
+ #ifdef USE_IMAP
+diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/postpone.c mutt-1.5.10/postpone.c
+--- mutt-1.5.10.orig/postpone.c 2005-02-03 19:47:53.000000000 +0100
++++ mutt-1.5.10/postpone.c 2005-10-07 09:30:06.000000000 +0200
+@@ -279,6 +279,9 @@
+ /* finished with this message, so delete it. */
mutt_set_flag (PostContext, h, M_DELETE, 1);
+ /* and consider it saved, so that it won't be moved to the trash folder */
@@ -174,8 +199,4 @@
+
/* update the count for the status display */
PostCount = PostContext->msgcount - PostContext->deleted;
-diff -pruN mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES
---- mutt-1.3.27.orig/PATCHES Mon Nov 26 20:16:52 2001
-+++ mutt-1.3.27/PATCHES Thu Dec 6 16:27:55 2001
-@@ -1,0 +1 @@
-+patch-1.3.27.cd.trash_folder.1
+
================================================================
Index: SOURCES/mutt-esmtp.patch
diff -u SOURCES/mutt-esmtp.patch:1.2 SOURCES/mutt-esmtp.patch:1.3
--- SOURCES/mutt-esmtp.patch:1.2 Wed Dec 21 13:45:27 2005
+++ SOURCES/mutt-esmtp.patch Mon Mar 26 15:11:15 2007
@@ -1,7 +1,25 @@
-diff -urN mutt-1.4.1.org/configure.in mutt-1.4.1/configure.in
---- mutt-1.4.1.org/configure.in 2003-08-21 15:30:19.000000000 +0200
-+++ mutt-1.4.1/configure.in 2003-08-21 15:31:08.962016232 +0200
-@@ -869,6 +869,19 @@
+--- mutt-1.5.9/Makefile.am.orig 2005-03-31 20:44:06.543128320 +0200
++++ mutt-1.5.9/Makefile.am 2005-03-31 20:48:44.552864416 +0200
+@@ -62,6 +62,7 @@
+ mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
+ pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
+ browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
++ mutt_libesmtp.c \
+ crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
+ pgppacket.c mutt_idna.h hcache.c mutt_ssl_gnutls.c \
+ nntp.c newsrc.c \
+@@ -82,6 +83,7 @@
+ makedoc.c stamp-doc-rc README.SSL smime.h\
+ muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
+ ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
++ mutt_libesmtp.h \
+ snprintf.c regex.c crypt-gpgme.h
+
+ EXTRA_SCRIPTS = smime_keys
+diff -urN --exclude-from=bin/diff.excludes mutt-1.5.3/configure.in mutt-1.5.3/configure.in
+--- mutt-1.5.3/configure.in Tue Dec 17 04:35:21 2002
++++ mutt-1.5.3/configure.in Wed Mar 5 11:50:47 2003
+@@ -916,6 +916,19 @@
AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
fi
@@ -10,23 +28,23 @@
+if test x$use_libesmtp = xyes; then
+ CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
+ MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs"
-+ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o -lpthread"
++ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o"
+
+ AC_DEFINE(USE_LIBESMTP,
+ 1,
-+ [Define to enable the use of libesmtp])
++ [Define to enable the use of libesmtp])
+fi
+dnl -- end libesmtp --
+
AC_OUTPUT(Makefile intl/Makefile m4/Makefile
po/Makefile.in doc/Makefile contrib/Makefile
muttbug.sh
-diff -urN mutt-1.4.1.org/globals.h mutt-1.4.1/globals.h
---- mutt-1.4.1.org/globals.h 2003-08-21 15:30:19.000000000 +0200
-+++ mutt-1.4.1/globals.h 2003-08-21 15:31:08.964015928 +0200
-@@ -103,6 +103,12 @@
+diff -urN --exclude-from=bin/diff.excludes mutt-1.5.3/globals.h mutt-1.5.3/globals.h
+--- mutt-1.5.3/globals.h Mon Sep 9 15:05:44 2002
++++ mutt-1.5.3/globals.h Wed Mar 5 11:50:48 2003
+@@ -101,6 +101,12 @@
+ WHERE char *Shell;
WHERE char *Signature;
- WHERE char *SigDirectory;
WHERE char *SimpleSearch;
+#if defined(USE_LIBESMTP)
+WHERE char *SmtpAuthUser;
@@ -37,10 +55,9 @@
WHERE char *Spoolfile;
#if defined(USE_SSL) || defined(USE_NSS)
WHERE char *SslCertFile INITVAL (NULL);
-diff -urN mutt-1.4.1.org/init.h mutt-1.4.1/init.h
---- mutt-1.4.1.org/init.h 2003-08-21 15:30:19.000000000 +0200
-+++ mutt-1.4.1/init.h 2003-08-21 15:31:08.976014104 +0200
-@@ -99,6 +99,9 @@
+--- mutt-1.5.9/init.h.orig 2005-03-31 20:44:06.454141848 +0200
++++ mutt-1.5.9/init.h 2005-03-31 20:49:49.479993992 +0200
+@@ -98,6 +98,9 @@
# ifndef USE_SOCKET
# define USE_SOCKET
# endif
@@ -50,49 +67,50 @@
#endif
struct option_t MuttVars[] = {
-@@ -1468,6 +1471,38 @@
- /*
+@@ -1987,6 +1990,39 @@
+ ** (S/MIME only)
*/
- #endif /* HAVE_PGP */
-+
+
++
+#if defined(USE_LIBESMTP)
+ { "smtp_auth_username", DT_STR, R_NONE, UL &SmtpAuthUser, 0 },
+ /*
-+ ** .pp
-+ ** Defines the username to use with SMTP AUTH. Setting this variable will
-+ ** cause mutt to attempt to use SMTP AUTH when sending.
-+ */
-+ { "smtp_auth_password", DT_STR, R_NONE, UL &SmtpAuthPass, 0 },
-+ /*
-+ ** .pp
-+ ** Defines the password to use with SMTP AUTH. If ``$$smtp_auth_username''
-+ ** is set, but this variable is not, you will be prompted for a password
-+ ** when sending.
-+ */
-+ { "smtp_host", DT_STR, R_NONE, UL &SmtpHost, 0 },
-+ /*
-+ ** .pp
-+ ** Defines the SMTP host which will be used to deliver mail, as opposed
-+ ** to invoking the sendmail binary. Setting this variable overrides the
-+ ** value of ``$$sendmail'', and any associated variables.
-+ */
-+ { "smtp_port", DT_NUM, R_NONE, UL &SmtpPort, 25 },
-+ /*
-+ ** .pp
-+ ** Defines the port that the SMTP host is listening on for mail delivery.
-+ ** Must be specified as a number.
-+ ** .pp
-+ ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP
-+ ** servers will probably desire 587, the mail submission port.
-+ */
++ ** .pp
++ ** Defines the username to use with SMTP AUTH. Setting this variable will
++ ** cause mutt to attempt to use SMTP AUTH when sending.
++ */
++ { "smtp_auth_password", DT_STR, R_NONE, UL &SmtpAuthPass, 0 },
++ /*
++ ** .pp
++ ** Defines the password to use with SMTP AUTH. If ``$$smtp_auth_username''
++ ** is set, but this variable is not, you will be prompted for a password
++ ** when sending.
++ */
++ { "smtp_host", DT_STR, R_NONE, UL &SmtpHost, 0 },
++ /*
++ ** .pp
++ ** Defines the SMTP host which will be used to deliver mail, as opposed
++ ** to invoking the sendmail binary. Setting this variable overrides the
++ ** value of ``$$sendmail'', and any associated variables.
++ */
++ { "smtp_port", DT_NUM, R_NONE, UL &SmtpPort, 25 },
++ /*
++ ** .pp
++ ** Defines the port that the SMTP host is listening on for mail delivery.
++ ** Must be specified as a number.
++ ** .pp
++ ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP
++ ** servers will probably desire 587, the mail submission port.
++ */
+#endif
-
- #if defined(USE_SSL)||defined(USE_NSS)
- # ifndef USE_NSS
-diff -urN mutt-1.4.1.org/m4/libesmtp.m4 mutt-1.4.1/m4/libesmtp.m4
---- mutt-1.4.1.org/m4/libesmtp.m4 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.4.1/m4/libesmtp.m4 2003-08-21 15:31:08.978013800 +0200
-@@ -0,0 +1,60 @@
++
+ #if defined(USE_SSL)||defined(USE_NSS)||defined(USE_GNUTLS)
+ #ifdef USE_SSL
+ { "ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0 },
+diff -urN --exclude-from=bin/diff.excludes mutt-1.5.3/m4/libesmtp.m4 mutt-1.5.3/m4/libesmtp.m4
+--- mutt-1.5.3/m4/libesmtp.m4 Wed Dec 31 18:00:00 1969
++++ mutt-1.5.3/m4/libesmtp.m4 Wed Mar 5 11:52:36 2003
+@@ -0,0 +1,63 @@
+dnl vim:ft=config:
+
+dnl Search for libesmtp, by Steven Engelhardt <sengelha at yahoo.com>
@@ -115,7 +133,10 @@
+ fi
+
+ dnl 1. Find libesmtp-config
-+ mutt_libesmtp_config_path=`which libesmtp-config || echo no`
++ AC_PATH_PROG([mutt_libesmtp_config_path],
++ [libesmtp-config],
++ [no],
++ [$mutt_libesmtp_check_path])
+
+ if test "$mutt_libesmtp_config_path" = "no"
+ then
@@ -153,12 +174,12 @@
+ ]
+ )
+])
-diff -urN mutt-1.4.1.org/main.c mutt-1.4.1/main.c
---- mutt-1.4.1.org/main.c 2003-08-21 15:30:19.000000000 +0200
-+++ mutt-1.4.1/main.c 2003-08-21 15:31:08.982013192 +0200
-@@ -226,6 +226,12 @@
+diff -urN --exclude-from=bin/diff.excludes mutt-1.5.3/main.c mutt-1.5.3/main.c
+--- mutt-1.5.3/main.c Wed Dec 11 05:20:05 2002
++++ mutt-1.5.3/main.c Wed Mar 5 11:50:48 2003
+@@ -240,6 +240,12 @@
#else
- "-USE_SASL "
+ "-USE_SASL2 "
#endif
+
+#ifdef USE_LIBESMTP
@@ -169,36 +190,17 @@
"\n"
#ifdef HAVE_REGCOMP
-diff -urN mutt-1.4.1.org/Makefile.am mutt-1.4.1/Makefile.am
---- mutt-1.4.1.org/Makefile.am 2003-08-21 15:30:18.000000000 +0200
-+++ mutt-1.4.1/Makefile.am 2003-08-21 15:31:08.984012888 +0200
-@@ -68,7 +68,8 @@
- EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
- mutt_tunnel.c pop.c pop_auth.c pop_lib.c pgp.c pgpinvoke.c pgpkey.c \
- pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
-- browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c
-+ browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c \
-+ mutt_libesmtp.c
-
- EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO configure acconfig.h account.h \
- attach.h buffy.h charset.h compress.h copy.h dotlock.h functions.h \
-@@ -80,7 +81,7 @@
- mbyte.h lib.h extlib.c pgpewrap.c pgplib.h Muttrc.head Muttrc \
- makedoc.c stamp-doc-rc README.SSL \
- muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
-- snprintf.c regex.c
-+ snprintf.c regex.c mutt_libesmtp.h
-
- mutt_dotlock_SOURCES = mutt_dotlock.c
- mutt_dotlock_LDADD = @LIBOBJS@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mutt-bj.status-time.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/mutt-cd.signatures_menu.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/mutt-cd.trash_folder.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/mutt-esmtp.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/mutt-folder_columns.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/mutt-home_etc.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/mutt-manual.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/mutt-po.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/mutt-rr.compressed.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/mutt-xface.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list