From a861341f60bb0a5765f4071132a8a1117a5b23a6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 3 Mar 2009 21:28:29 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=13 --- mutt-1.5.15.sidebar-fix.dif | 156 ---------------- mutt-1.5.17.tar.bz2 | 3 - ....17-opennfs.dif => mutt-1.5.19-opennfs.dif | 83 ++++----- mutt-1.5.17.dif => mutt-1.5.19.dif | 176 +++++++++--------- mutt-1.5.19.sidebar-fix.dif | 140 ++++++++++++++ mutt-1.5.19.tar.bz2 | 3 + mutt.changes | 12 ++ mutt.spec | 77 ++++---- patch-1.5.17.rr.compressed.1.bz2 | 3 - patch-1.5.17.sidebar.20071102.txt.bz2 | 3 - patch-1.5.19.rr.compressed.1.bz2 | 3 + patch-1.5.19.sidebar.20080611.txt.bz2 | 3 + 12 files changed, 329 insertions(+), 333 deletions(-) delete mode 100644 mutt-1.5.15.sidebar-fix.dif delete mode 100644 mutt-1.5.17.tar.bz2 rename mutt-1.5.17-opennfs.dif => mutt-1.5.19-opennfs.dif (78%) rename mutt-1.5.17.dif => mutt-1.5.19.dif (73%) create mode 100644 mutt-1.5.19.sidebar-fix.dif create mode 100644 mutt-1.5.19.tar.bz2 delete mode 100644 patch-1.5.17.rr.compressed.1.bz2 delete mode 100644 patch-1.5.17.sidebar.20071102.txt.bz2 create mode 100644 patch-1.5.19.rr.compressed.1.bz2 create mode 100644 patch-1.5.19.sidebar.20080611.txt.bz2 diff --git a/mutt-1.5.15.sidebar-fix.dif b/mutt-1.5.15.sidebar-fix.dif deleted file mode 100644 index 044626a..0000000 --- a/mutt-1.5.15.sidebar-fix.dif +++ /dev/null @@ -1,156 +0,0 @@ ---- buffy.c -+++ buffy.c 2007-06-01 13:37:02.671160950 +0200 -@@ -259,7 +259,7 @@ int mutt_buffy_check (int force) - char path[_POSIX_PATH_MAX]; - struct stat contex_sb; - time_t t; -- CONTEXT *ctx; -+ - #ifdef USE_IMAP - /* update postponed count as well, on force */ - if (force) -@@ -294,8 +294,6 @@ int mutt_buffy_check (int force) - - for (tmp = Incoming; tmp; tmp = tmp->next) - { -- if ( tmp->new == 1 ) -- tmp->has_new = 1; - #ifdef USE_IMAP - if (tmp->magic != M_IMAP) - #endif -@@ -347,14 +345,18 @@ int mutt_buffy_check (int force) - ) - - { -+ int check; -+ - switch (tmp->magic) - { - case M_MBOX: - case M_MMDF: - -- { -- if (STAT_CHECK || tmp->msgcount == 0) -+ check = STAT_CHECK; -+ -+ if (option(OPTSIDEBAR) && (check || tmp->msgcount == 0)) - { -+ CONTEXT *ctx; - BUFFY b = *tmp; - int msgcount = 0; - int msg_unread = 0; -@@ -369,21 +371,22 @@ int mutt_buffy_check (int force) - *tmp = b; - tmp->msgcount = msgcount; - tmp->msg_unread = msg_unread; -- if(STAT_CHECK) { -- tmp->has_new = tmp->new = 1; -- BuffyCount++; -- } -+ } -+ if (check) -+ { -+ BuffyCount++; -+ tmp->new = 1; - } - else if (option(OPTCHECKMBOXSIZE)) - { - /* some other program has deleted mail from the folder */ - tmp->size = (long) sb.st_size; - } -- if (tmp->newly_created && -- (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -- tmp->newly_created = 0; -- } -- break; -+ if (tmp->newly_created && -+ (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -+ tmp->newly_created = 0; -+ -+ break; - - case M_MAILDIR: - -@@ -402,16 +405,25 @@ int mutt_buffy_check (int force) - if (*de->d_name != '.' && - (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) - { -- tmp->has_new = tmp->new = 1; -+ if (!option(OPTSIDEBAR)) -+ { -+ BuffyCount++; -+ tmp->new = 1; -+ break; -+ } -+ tmp->new = 1; - tmp->msgcount++; - tmp->msg_unread++; - } - } - if(tmp->msg_unread) - BuffyCount++; -- -+ - closedir (dirp); - -+ if (!option(OPTSIDEBAR)) -+ break; -+ - /* - * count read messages (for folderlist (sidebar) we also need to count - * messages in cur so that we the total number of messages -@@ -435,25 +447,25 @@ int mutt_buffy_check (int force) - break; - - case M_MH: -- { -- DIR *dp; -- struct dirent *de; -- if ((tmp->new = mh_buffy (tmp->path)) > 0) -- BuffyCount++; -- -- if ((dp = opendir (path)) == NULL) -- break; -- tmp->msgcount = 0; -- while ((de = readdir (dp))) -- { -- if (mh_valid_message (de->d_name)) -- { -- tmp->msgcount++; -- tmp->has_new = tmp->new = 1; -- } -- } -- closedir (dp); -- } -+ -+ if ((tmp->new = mh_buffy (tmp->path)) > 0) -+ BuffyCount++; -+ if (!option(OPTSIDEBAR)) -+ break; -+ -+ if ((dirp = opendir (path)) == NULL) -+ break; -+ tmp->msgcount = 0; -+ while ((de = readdir (dirp))) -+ { -+ if (mh_valid_message (de->d_name)) -+ { -+ tmp->msgcount++; -+ tmp->new = 1; -+ } -+ } -+ closedir (dirp); -+ - break; - } - } ---- buffy.h -+++ buffy.h 2006-11-16 12:26:58.000000000 +0100 -@@ -27,7 +27,6 @@ typedef struct buffy_t - struct buffy_t *next; - struct buffy_t *prev; - short new; /* mailbox has new mail */ -- short has_new; /* set it new if new and not read */ - int msgcount; /* total number of messages */ - int msg_unread; /* number of unread messages */ - short notified; /* user has been notified */ diff --git a/mutt-1.5.17.tar.bz2 b/mutt-1.5.17.tar.bz2 deleted file mode 100644 index 7ee9e8c..0000000 --- a/mutt-1.5.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64fd048cca7b359a78516533de27d207369b70c91d3929d313f2d2629e330a1d -size 2391303 diff --git a/mutt-1.5.17-opennfs.dif b/mutt-1.5.19-opennfs.dif similarity index 78% rename from mutt-1.5.17-opennfs.dif rename to mutt-1.5.19-opennfs.dif index f87e212..f0aca7c 100644 --- a/mutt-1.5.17-opennfs.dif +++ b/mutt-1.5.19-opennfs.dif @@ -1,17 +1,6 @@ ---- - 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(-) - ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,7 +23,7 @@ mutt_SOURCES = $(BUILT_SOURCES) \ +--- Makefile.am ++++ Makefile.am 2009-03-03 00:00:00.000000000 +0100 +@@ -23,7 +23,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 \ @@ -20,7 +9,7 @@ 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 \ -@@ -87,7 +87,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c +@@ -78,7 +78,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c mutt_dotlock_LDADD = @LIBOBJS@ mutt_dotlock_DEPENDENCIES = @LIBOBJS@ @@ -29,18 +18,18 @@ pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) ---- a/Makefile.in -+++ b/Makefile.in -@@ -81,7 +81,7 @@ am_mutt_OBJECTS = $(am__objects_1) addrb - group.$(OBJEXT) handler.$(OBJEXT) hash.$(OBJEXT) \ - hdrline.$(OBJEXT) headers.$(OBJEXT) help.$(OBJEXT) \ - hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) mbox.$(OBJEXT) \ -- menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) pager.$(OBJEXT) \ -+ menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) opennfs.$(OBJEXT) pager.$(OBJEXT) \ - parse.$(OBJEXT) pattern.$(OBJEXT) postpone.$(OBJEXT) \ - query.$(OBJEXT) recvattach.$(OBJEXT) recvcmd.$(OBJEXT) \ - rfc822.$(OBJEXT) rfc1524.$(OBJEXT) rfc2047.$(OBJEXT) \ -@@ -103,7 +103,7 @@ pgpewrap_LDADD = $(LDADD) +--- Makefile.in ++++ Makefile.in 2009-03-03 17:00:37.648811010 +0100 +@@ -75,7 +75,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) \ +- pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ ++ opennfs.$(OBJEXT) pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ + postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \ + recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ + rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ +@@ -102,7 +102,7 @@ pgpewrap_LDADD = $(LDADD) pgpewrap_DEPENDENCIES = @LIBOBJS@ am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \ @@ -49,7 +38,7 @@ pgpring_OBJECTS = $(am_pgpring_OBJECTS) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) -@@ -308,7 +308,7 @@ mutt_SOURCES = $(BUILT_SOURCES) \ +@@ -302,7 +302,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 \ @@ -58,9 +47,9 @@ 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 \ ---- a/lib.c -+++ b/lib.c -@@ -48,6 +48,7 @@ +--- lib.c ++++ lib.c 2009-03-03 00:00:00.000000000 +0100 +@@ -50,6 +50,7 @@ #define EX_OK 0 #endif @@ -68,7 +57,7 @@ #include "lib.h" -@@ -566,6 +567,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; @@ -79,7 +68,7 @@ if (flags & O_EXCL) { char safe_file[_POSIX_PATH_MAX]; -@@ -589,7 +594,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; @@ -88,9 +77,9 @@ /* make sure the file is not symlink */ if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || compare_stat(&osb, &nsb) == -1) ---- a/mbox.c -+++ b/mbox.c -@@ -741,7 +741,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int +--- mbox.c ++++ mbox.c 2009-03-03 00:00:00.000000000 +0100 +@@ -749,7 +749,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int /* Create a temporary file to write the new version of the mailbox in. */ mutt_mktemp (tempfile); @@ -99,8 +88,8 @@ (fp = fdopen (i, "w")) == NULL) { if (-1 != i) ---- a/mh.c -+++ b/mh.c +--- mh.c ++++ mh.c 2009-03-03 00:00:00.000000000 +0100 @@ -238,7 +238,11 @@ static int mh_mkstemp (CONTEXT * dest, F { snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d", @@ -113,7 +102,7 @@ { if (errno != EEXIST) { -@@ -1215,8 +1219,11 @@ int maildir_open_new_message (MESSAGE * +@@ -1248,8 +1252,11 @@ int maildir_open_new_message (MESSAGE * dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", path)); @@ -126,16 +115,16 @@ { if (errno != EEXIST) { ---- a/mutt.h -+++ b/mutt.h -@@ -974,4 +974,5 @@ typedef struct +--- mutt.h ++++ mutt.h 2009-03-03 00:00:00.000000000 +0100 +@@ -956,4 +956,5 @@ typedef struct #include "lib.h" #include "globals.h" +extern int opennfs(const char *, int, int); #endif /*MUTT_H*/ ---- /dev/null -+++ b/opennfs.c +--- opennfs.c ++++ opennfs.c 2009-03-03 00:00:00.000000000 +0100 @@ -0,0 +1,122 @@ +#include +#include @@ -259,9 +248,9 @@ + if (clear) free(clear); + return open(path, flags, mode); +} ---- a/sendlib.c -+++ b/sendlib.c -@@ -2030,7 +2030,7 @@ send_msg (const char *path, char **args, +--- sendlib.c ++++ sendlib.c 2009-03-03 00:00:00.000000000 +0100 +@@ -2028,7 +2028,7 @@ send_msg (const char *path, char **args, if (SendmailWait >= 0 && tempfile) { /* *tempfile will be opened as stdout */ diff --git a/mutt-1.5.17.dif b/mutt-1.5.19.dif similarity index 73% rename from mutt-1.5.17.dif rename to mutt-1.5.19.dif index b51d48b..32f7dcd 100644 --- a/mutt-1.5.17.dif +++ b/mutt-1.5.19.dif @@ -1,17 +1,77 @@ ---- Muttrc -+++ Muttrc 2007-09-20 13:02:08.475410283 +0200 -@@ -18,7 +18,7 @@ macro index,pager,attach,compose \cb "\ +--- configure.ac ++++ configure.ac 2007-06-01 12:57:38.328822000 +0200 +@@ -234,7 +234,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" +@@ -656,8 +656,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with- + else + 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" + +@@ -717,8 +721,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 +@@ -2138,6 +2138,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 2009-03-03 15:58:09.281410456 +0100 +@@ -547,7 +547,7 @@ uninstall-local: + + check: + manual.txt: manual.html +- -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \ ++ -LC_ALL=C lynx -dont_wrap_pre -center -dump -nolist -with_backspaces manual.html > $@ || \ + 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 ++++ doc/Muttrc 2009-03-03 15:56:32.904001949 +0100 +@@ -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 " less /usr/local/doc/mutt/manual.txt" "show Mutt documentation" +-macro generic,pager " less /usr/local/share/doc/mutt/manual.txt" "show Mutt documentation" +macro generic,index,pager " less -iM /usr/share/doc/packages/mutt/manual.txt.gz" "show Mutt documentation" # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" -@@ -333,9 +333,9 @@ attachments -I message/external-body - # in a reply. For a full listing of defined printf()-like sequences see - # the section on ``$index_format''. +@@ -348,9 +348,9 @@ attachments -I message/external-body + # in a reply. For a full listing of defined printf(3)-like sequences see + # the section on $index_format. # -# -# set autoedit=no @@ -22,8 +82,8 @@ # Name: autoedit # Type: boolean # Default: no -@@ -421,9 +421,9 @@ attachments -I message/external-body - # follow these menus. The option is disabled by default because many +@@ -437,9 +437,9 @@ attachments -I message/external-body + # follow these menus. The option is unset by default because many # visual terminals don't permit making the cursor invisible. # -# @@ -35,7 +95,7 @@ # Name: check_mbox_size # Type: boolean # Default: no -@@ -709,11 +709,11 @@ attachments -I message/external-body +@@ -750,11 +750,11 @@ attachments -I message/external-body # filtered message is read from the standard output. # # @@ -48,8 +108,8 @@ +# Default: "/usr/bin/mutt_dotlock" # # - # Contains the path of the mutt_dotlock (8) binary to be used by -@@ -1981,9 +1981,9 @@ attachments -I message/external-body + # Contains the path of the mutt_dotlock(8) binary to be used by +@@ -2108,9 +2108,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. # @@ -62,8 +122,8 @@ # Name: pager_context # Type: number # Default: 0 -@@ -2007,9 +2007,9 @@ attachments -I message/external-body - # pager. The valid sequences are listed in the ``$index_format'' +@@ -2134,9 +2134,9 @@ attachments -I message/external-body + # pager. The valid sequences are listed in the $index_format # section. # -# @@ -75,8 +135,8 @@ # Name: pager_index_lines # Type: number # Default: 0 -@@ -2027,9 +2027,9 @@ attachments -I message/external-body - # is less than pager_index_lines, then the index will only use as +@@ -2154,9 +2154,9 @@ attachments -I message/external-body + # is less than $pager_index_lines, then the index will only use as # many lines as it needs. # -# @@ -88,7 +148,7 @@ # Name: pager_stop # Type: boolean # Default: no -@@ -3450,9 +3450,9 @@ attachments -I message/external-body +@@ -3678,9 +3678,9 @@ attachments -I message/external-body # (possibly undeleted) message whenever a command that modifies the # current message is executed. # @@ -101,8 +161,8 @@ # Name: reverse_alias # Type: boolean # Default: no -@@ -3583,6 +3583,18 @@ attachments -I message/external-body - # Also see the ``$force_name'' variable. +@@ -3812,6 +3812,18 @@ attachments -I message/external-body + # Also see the $force_name variable. # # +# set send_group_reply_to=no @@ -120,8 +180,8 @@ # set score=yes # # Name: score -@@ -3837,9 +3849,9 @@ attachments -I message/external-body - # Setting this variable overrides the value of the ``$sendmail'' +@@ -4071,9 +4083,9 @@ attachments -I message/external-body + # Setting this variable overrides the value of the $sendmail # variable. # -# @@ -133,9 +193,9 @@ # Name: sort # Type: sort order # Default: date -@@ -4135,9 +4147,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. +@@ -4382,9 +4394,9 @@ attachments -I message/external-body + # raw message received (for example quoted-printable encoded or with encoded + # headers) which may lead to incorrect search results. # -# -# set tilde=no @@ -146,7 +206,7 @@ # Name: tilde # Type: boolean # Default: no -@@ -4405,3 +4417,39 @@ attachments -I message/external-body +@@ -4678,3 +4690,39 @@ attachments -I message/external-body # in this case. # # @@ -186,9 +246,9 @@ +# to the one used by ``$status_format''. +# +# ---- Muttrc.head -+++ Muttrc.head 2007-06-01 12:51:03.642800000 +0200 -@@ -18,7 +18,7 @@ macro index,pager,attach,compose \cb "\ +--- doc/Muttrc.head ++++ doc/Muttrc.head 2007-06-01 12:51:03.642800000 +0200 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ "call urlview to extract URLs out of a message" # Show documentation when pressing F1 @@ -197,66 +257,6 @@ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" ---- configure.ac -+++ configure.ac 2007-06-01 12:57:38.328822000 +0200 -@@ -225,7 +225,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" -@@ -642,8 +642,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with- - else - 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" - -@@ -698,8 +702,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 -@@ -1960,6 +1960,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 2007-06-12 12:04:49.827249000 +0200 -@@ -436,7 +436,7 @@ uninstall-local: - - check: - manual.txt: manual.html -- -lynx -dump -nolist -with_backspaces $^ > $@ || \ -+ -lynx -dont_wrap_pre -center -dump -nolist -with_backspaces $^ > $@ || \ - w3m -dump $^ > $@ || \ - elinks -dump -no-numbering -no-references $^ > $@ - --- imap/auth.c +++ imap/auth.c 2006-11-09 16:19:56.000000000 +0100 @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata) diff --git a/mutt-1.5.19.sidebar-fix.dif b/mutt-1.5.19.sidebar-fix.dif new file mode 100644 index 0000000..902b0f3 --- /dev/null +++ b/mutt-1.5.19.sidebar-fix.dif @@ -0,0 +1,140 @@ +--- buffy.c ++++ buffy.c 2009-03-03 16:56:53.886429226 +0100 +@@ -259,7 +259,7 @@ int mutt_buffy_check (int force) + char path[_POSIX_PATH_MAX]; + struct stat contex_sb; + time_t t; +- CONTEXT *ctx; ++ + #ifdef USE_IMAP + /* update postponed count as well, on force */ + if (force) +@@ -294,8 +294,6 @@ int mutt_buffy_check (int force) + + for (tmp = Incoming; tmp; tmp = tmp->next) + { +- if ( tmp->new == 1 ) +- tmp->has_new = 1; + #ifdef USE_IMAP + if (tmp->magic != M_IMAP) + #endif +@@ -347,13 +345,18 @@ int mutt_buffy_check (int force) + ) + + { ++ int check; ++ + switch (tmp->magic) + { + case M_MBOX: + case M_MMDF: + +- if (STAT_CHECK || tmp->msgcount == 0) ++ check = STAT_CHECK; ++ ++ if (option(OPTSIDEBAR) && (check || tmp->msgcount == 0)) + { ++ CONTEXT *ctx; + BUFFY b = *tmp; + int msgcount = 0; + int msg_unread = 0; +@@ -368,11 +371,11 @@ int mutt_buffy_check (int force) + *tmp = b; + tmp->msgcount = msgcount; + tmp->msg_unread = msg_unread; +- if (STAT_CHECK) ++ } ++ if (check) + { +- tmp->has_new = tmp->new = 1; + BuffyCount++; +- } ++ tmp->new = 1; + } + else if (option(OPTCHECKMBOXSIZE)) + { +@@ -403,7 +406,13 @@ int mutt_buffy_check (int force) + if (*de->d_name != '.' && + (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) + { +- tmp->has_new = tmp->new = 1; ++ if (!option(OPTSIDEBAR)) ++ { ++ BuffyCount++; ++ tmp->new = 1; ++ break; ++ } ++ tmp->new = 1; + tmp->msgcount++; + tmp->msg_unread++; + } +@@ -413,6 +422,9 @@ int mutt_buffy_check (int force) + + closedir (dirp); + ++ if (!option(OPTSIDEBAR)) ++ break; ++ + /* + * count read messages (for folderlist (sidebar) we also need to count + * messages in cur so that we the total number of messages +@@ -430,8 +442,7 @@ int mutt_buffy_check (int force) + (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) + { + tmp->msgcount++; +- if (p && strchr(p + 3, 'F')) +- { ++ if (p && strchr(p + 3, 'F')) { + tmp->msg_flagged++; + } + } +@@ -440,26 +451,25 @@ int mutt_buffy_check (int force) + break; + + case M_MH: ++ + if ((tmp->new = mh_buffy (tmp->path)) > 0) +- { +- DIR *dp; +- struct dirent *de; +- if ((tmp->new = mh_buffy (tmp->path)) > 0) + BuffyCount++; ++ if (!option(OPTSIDEBAR)) ++ break; + +- if ((dp = opendir (path)) == NULL) +- break; +- tmp->msgcount = 0; +- while ((de = readdir (dp))) ++ if ((dirp = opendir (path)) == NULL) ++ break; ++ tmp->msgcount = 0; ++ while ((de = readdir (dirp))) ++ { ++ if (mh_valid_message (de->d_name)) + { +- if (mh_valid_message (de->d_name)) +- { +- tmp->msgcount++; +- tmp->has_new = tmp->new = 1; +- } ++ tmp->msgcount++; ++ tmp->new = 1; + } +- closedir (dp); + } ++ closedir (dirp); ++ + break; + } + } +--- buffy.h ++++ buffy.h 2009-03-03 16:47:06.444002194 +0100 +@@ -27,7 +27,6 @@ typedef struct buffy_t + struct buffy_t *next; + struct buffy_t *prev; + short new; /* mailbox has new mail */ +- short has_new; /* set it new if new and not read */ + int msgcount; /* total number of messages */ + int msg_unread; /* number of unread messages */ + int msg_flagged; /* number of flagged messages */ diff --git a/mutt-1.5.19.tar.bz2 b/mutt-1.5.19.tar.bz2 new file mode 100644 index 0000000..05562a8 --- /dev/null +++ b/mutt-1.5.19.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2bb6323d00b32abf9d134f165c62f4964457d235cfa68c1790de1e8c61a5fc9 +size 2408422 diff --git a/mutt.changes b/mutt.changes index 83c6a90..f624efd 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 3 17:17:51 CET 2009 - werner@suse.de + +- updated to mutt version 1.5.19 mostly a bugfix release +- updated sidebar patch to 1.5.18.sidebar.20080611 + * make it work with 1.5.19 + * make sidebar-fix also work +- updated compression patch to patch-1.5.19.rr.compressed +- enable smtp support +- enable mixmaster support +- use regex(7) of glibc + ------------------------------------------------------------------- Thu Apr 10 15:18:29 CEST 2008 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 304f39a..e990b11 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,10 +1,17 @@ # -# spec file for package mutt (Version 1.5.17) +# spec file for package mutt (Version 1.5.19) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -24,8 +31,8 @@ Requires: smtp_daemon # desktop selections. #Requires: desktop-data-SuSE AutoReqProv: on -Version: 1.5.17 -Release: 42 +Version: 1.5.19 +Release: 1 Summary: Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 @@ -43,9 +50,9 @@ Patch3: %name-1.5.9i-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 # http://lunar-linux.org/index.php?page=mutt-sidebar -Patch6: patch-%version.sidebar.20071102.txt.bz2 -Patch7: mutt-1.5.15.sidebar-fix.dif -Patch8: mutt-1.5.17-opennfs.dif +Patch6: patch-%version.sidebar.20080611.txt.bz2 +Patch7: mutt-1.5.19.sidebar-fix.dif +Patch8: mutt-1.5.19-opennfs.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -71,25 +78,20 @@ Authors: %patch5 -p1 %patch6 -p1 %patch7 -p0 -%patch8 -p1 -cp Muttrc Muttrc.SuSE +%patch8 -p0 +cp doc/Muttrc Muttrc.SuSE cp %{S:2} . %build autoreconf -fi CC=gcc CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" -%if %suse_version > 1000 CFLAGS="$CFLAGS -fstack-protector" -%endif -%if %suse_version < 1030 -CFLAGS="$CFLAGS -DSUSE_IMAP_FORCE_SSL" -%endif +#CFLAGS="$CFLAGS -DSUSE_IMAP_FORCE_SSL" KRB5CFGPATH=%{S:6} export CC CFLAGS KRB5CFGPATH chmod 755 $KRB5CFGPATH ./configure $RPM_ARCH-suse-linux \ - --disable-domain \ --prefix=%{_prefix} \ --datadir=%{_datadir} \ --sysconfdir=%{_sysconfdir} \ @@ -100,15 +102,16 @@ chmod 755 $KRB5CFGPATH --enable-pgp \ --enable-gpgme \ --enable-nfs-fix \ + --enable-mailtool \ --enable-compressed \ + --disable-external-dotlock \ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ - --with-sasl2=%{_prefix} \ --with-gss=%{_prefix} \ - --enable-buffy-size \ + --with-regex \ + --enable-smtp \ --enable-hcache \ - --with-idn \ - --disable-inodesort + --with-idn make -C doc clean make make -C doc @@ -157,7 +160,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/mutt.png %_mandir/man1/mutt.1.gz -%_mandir/man1/mutt_dotlock.1.gz %_mandir/man5/mmdf_mutt.5.gz %_mandir/man5/muttrc.5.gz %_mandir/man5/mbox_mutt.5.gz @@ -165,6 +167,15 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/Muttrc %changelog +* Tue Mar 03 2009 werner@suse.de +- updated to mutt version 1.5.19 mostly a bugfix release +- updated sidebar patch to 1.5.18.sidebar.20080611 + * make it work with 1.5.19 + * make sidebar-fix also work +- updated compression patch to patch-1.5.19.rr.compressed +- enable smtp support +- enable mixmaster support +- use regex(7) of glibc * Thu Apr 10 2008 werner@suse.de - Avoid trouble with krb5-config * Thu Dec 20 2007 bwalle@suse.de @@ -252,7 +263,7 @@ rm -rf $RPM_BUILD_ROOT - Rename mmdf.5 -> mmdf_mutt.5 to not conflict with tin * Tue Feb 01 2005 mmj@suse.de - Update to 1.5.7 -* Wed Jan 12 2005 mmj@suse.de +* Tue Jan 11 2005 mmj@suse.de - Fix plain auth for sasl with patch from HEAD [#49573] - Update header cache patch to latest * Wed Nov 17 2004 mmj@suse.de @@ -285,9 +296,9 @@ rm -rf $RPM_BUILD_ROOT - People are going to ask over and over again about the alternates error, even though it's documented in the manual page, so install /usr/share/doc/packages/mutt/README.alternates -* Thu Feb 05 2004 mmj@suse.de +* Wed Feb 04 2004 mmj@suse.de - Readd cast that got lost when 99%% of a patch was merged upstream -* Thu Feb 05 2004 mmj@suse.de +* Wed Feb 04 2004 mmj@suse.de - Update to 1.5.6 - Include patch from Joël Riou which adds a variable config_charset that one may define in a rc file @@ -298,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT latin-encoded terminal. * Mon Nov 17 2003 mmj@suse.de - Use rr.compressed for 1.5.5.1 from the author -* Thu Nov 06 2003 mmj@suse.de +* Wed Nov 05 2003 mmj@suse.de - Update to mutt-1.5.5.1i which includes the missing files * Wed Nov 05 2003 mmj@suse.de - Update to mutt-1.5.5i which is the last planned development snap- @@ -352,7 +363,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jan 24 2003 mmj@suse.de - Add --enable-buffy-size which got lost because the maintainer kept several versions around -* Fri Jan 24 2003 mmj@suse.de +* Thu Jan 23 2003 mmj@suse.de - Add patch to use sasl2 instead og sasl * Mon Jan 06 2003 mmj@suse.de - Below action was not A Good Thing[tm] for all, so made it a @@ -376,7 +387,7 @@ rm -rf $RPM_BUILD_ROOT improved IMAP and POP support. Better maildir handling, improved threading. And lots more, which is better summarized on http://www.mutt.org -* Wed May 29 2002 mmj@suse.de +* Tue May 28 2002 mmj@suse.de - Added a patch to allow longer lines [Bug #16030] - Added a patch to allow mailboxes > 2 GB [Bug #16356] * Tue May 14 2002 mmj@suse.de @@ -416,7 +427,7 @@ rm -rf $RPM_BUILD_ROOT - po updates * Sun Sep 02 2001 bjacke@suse.de - update to 1.3.22.1 -* Fri Aug 24 2001 bjacke@suse.de +* Thu Aug 23 2001 bjacke@suse.de - update to 1.3.21 which fixes some MH bugs and others * Mon Aug 13 2001 ro@suse.de - changed neededforbuild to @@ -437,7 +448,7 @@ rm -rf $RPM_BUILD_ROOT - fixed a buffer underrun - fixed possible segfault (#6979) - redisabled buffy fix -* Mon Mar 26 2001 bjacke@suse.de +* Sun Mar 25 2001 bjacke@suse.de - update to 1.3.16i - dropped superfluous additional options patch - add compressed folder patch @@ -501,13 +512,13 @@ rm -rf $RPM_BUILD_ROOT - highlight_unread sometimes didn't work. Fixed. * Thu Oct 14 1999 garloff@suse.de - Added contrib/Pine.rc and Mush.rc to as %%docs -* Thu Oct 14 1999 garloff@suse.de +* Wed Oct 13 1999 garloff@suse.de - Two new options: "delete_tilde" and "highlight_unread". The meaning is obvious ... * Fri Oct 01 1999 werner@suse.de - Added gpg in neededforbuild to get both pgp and gpg path included into mutt. -* Wed Sep 29 1999 werner@suse.de +* Tue Sep 28 1999 werner@suse.de - Put urlview into mutt package - Use changes Muttrc instead of my.Muttrc * there is no variable web_browser anymore @@ -537,7 +548,7 @@ rm -rf $RPM_BUILD_ROOT - update to version 0.85 * Tue May 20 1997 florian@suse.de - update to version 0.74 -* Mon Apr 14 1997 florian@suse.de +* Sun Apr 13 1997 florian@suse.de - update to new version 0.69 * Tue Jan 28 1997 florian@suse.de - update to new version 0.59 diff --git a/patch-1.5.17.rr.compressed.1.bz2 b/patch-1.5.17.rr.compressed.1.bz2 deleted file mode 100644 index d04e620..0000000 --- a/patch-1.5.17.rr.compressed.1.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:842068f610b00ef8e017ff37cd4435b22191bba8dd9cbcd339c5cacf0add9691 -size 10207 diff --git a/patch-1.5.17.sidebar.20071102.txt.bz2 b/patch-1.5.17.sidebar.20071102.txt.bz2 deleted file mode 100644 index c3e64f9..0000000 --- a/patch-1.5.17.sidebar.20071102.txt.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:602ea04662e5f9e1f186bf6bc584970b65b86e52bd404c0e329413f8ab121e93 -size 12217 diff --git a/patch-1.5.19.rr.compressed.1.bz2 b/patch-1.5.19.rr.compressed.1.bz2 new file mode 100644 index 0000000..0ed6070 --- /dev/null +++ b/patch-1.5.19.rr.compressed.1.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1908173681aa6e1544de9989784a315a49f02927f92a50fe26c76c856e769d3 +size 10202 diff --git a/patch-1.5.19.sidebar.20080611.txt.bz2 b/patch-1.5.19.sidebar.20080611.txt.bz2 new file mode 100644 index 0000000..ab9384a --- /dev/null +++ b/patch-1.5.19.sidebar.20080611.txt.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d217721901dddcaeb72404426e9bbaa32ef8c3930c945f5ee54a81aec812eb8 +size 11526