Hello community,
here is the log from the commit of package mutt for openSUSE:Factory
checked in at Tue Mar 3 22:28:26 CET 2009.
--------
--- mutt/mutt.changes 2008-04-10 15:29:09.000000000 +0200
+++ mutt/mutt.changes 2009-03-03 18:12:36.360001827 +0100
@@ -1,0 +2,12 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mutt-1.5.15.sidebar-fix.dif
mutt-1.5.17.dif
mutt-1.5.17-opennfs.dif
mutt-1.5.17.tar.bz2
patch-1.5.17.rr.compressed.1.bz2
patch-1.5.17.sidebar.20071102.txt.bz2
New:
----
mutt-1.5.19.dif
mutt-1.5.19-opennfs.dif
mutt-1.5.19.sidebar-fix.dif
mutt-1.5.19.tar.bz2
patch-1.5.19.rr.compressed.1.bz2
patch-1.5.19.sidebar.20080611.txt.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.Z14829/_old 2009-03-03 22:27:05.000000000 +0100
+++ /var/tmp/diff_new_pack.Z14829/_new 2009-03-03 22:27:05.000000000 +0100
@@ -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 @@
# 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 @@
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 @@
%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 @@
--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 @@
%{_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 @@
%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 @@
- 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 @@
- 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 @@
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 @@
* 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 @@
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 @@
- 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 <sp-devel>
@@ -437,7 +448,7 @@
- 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 @@
- 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 @@
- 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
++++++ mutt-1.5.15.sidebar-fix.dif -> mutt-1.5.19.dif ++++++
--- mutt/mutt-1.5.15.sidebar-fix.dif 2007-06-01 13:37:57.000000000 +0200
+++ mutt/mutt-1.5.19.dif 2009-03-03 15:58:21.500002479 +0100
@@ -1,156 +1,295 @@
---- 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;
+--- 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 <F1> "<shell-escape> less /usr/local/share/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"
+@@ -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
+-#
+
- switch (tmp->magic)
- {
- case M_MBOX:
- case M_MMDF:
++set autoedit=yes
++
+ # Name: autoedit
+ # Type: boolean
+ # Default: no
+@@ -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.
+ #
+-#
+-# set check_mbox_size=no
+-#
++
++set check_mbox_size=yes
++
+ # Name: check_mbox_size
+ # Type: boolean
+ # Default: no
+@@ -750,11 +750,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
+@@ -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.
+ #
+-#
+-# set pager_context=0
+-#
++
++set pager_context=4
++
+ # Name: pager_context
+ # Type: number
+ # Default: 0
+@@ -2134,9 +2134,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
+@@ -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.
+ #
+-#
+-# set pager_stop=no
+-#
++
++set pager_stop=yes
++
+ # Name: pager_stop
+ # Type: boolean
+ # Default: no
+@@ -3678,9 +3678,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
+@@ -3812,6 +3812,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
+@@ -4071,9 +4083,9 @@ attachments -I message/external-body
+ # Setting this variable overrides the value of the $sendmail
+ # variable.
+ #
+-#
+-# set sort=date
+-#
++
++set sort=reverse-date-sent
++
+ # Name: sort
+ # Type: sort order
+ # Default: date
+@@ -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
+-#
++
++set tilde=yes
++
+ # Name: tilde
+ # Type: boolean
+ # Default: no
+@@ -4678,3 +4690,39 @@ attachments -I message/external-body
+ # in this case.
+ #
+ #
++# 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''.
++#
++#
+--- 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"
-- {
-- 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)
+ # 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 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)
+ {
-+ 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))
++ char* identify = authenticator->method;
++ if (identify && !ascii_strcasecmp(identify, method))
++ if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL)
+ {
-+ BuffyCount++;
-+ tmp->new = 1;
-+ break;
++ FREE(&methods);
++ return r;
+ }
-+ 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;
-+ }
++ authenticator++;
+ }
-+ closedir (dirp);
-+
- break;
++ } else {
++#endif
+ while (authenticator->authenticate)
+ {
+ if (!authenticator->method ||
+@@ -85,6 +102,9 @@ int imap_authenticate (IMAP_DATA* idata)
+
+ authenticator++;
}
++#ifdef USE_SASL
++ }
++#endif
}
---- 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 */
+
+ FREE (&methods);
++++++ mutt-1.5.17-opennfs.dif -> mutt-1.5.19-opennfs.dif ++++++
--- mutt/mutt-1.5.17-opennfs.dif 2007-12-20 19:57:18.000000000 +0100
+++ mutt/mutt-1.5.19-opennfs.dif 2009-03-03 17:02:23.104002378 +0100
@@ -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 */
++++++ mutt-1.5.15.sidebar-fix.dif -> mutt-1.5.19.sidebar-fix.dif ++++++
--- mutt/mutt-1.5.15.sidebar-fix.dif 2007-06-01 13:37:57.000000000 +0200
+++ mutt/mutt-1.5.19.sidebar-fix.dif 2009-03-03 16:57:58.856002820 +0100
@@ -1,5 +1,5 @@
--- buffy.c
-+++ buffy.c 2007-06-01 13:37:02.671160950 +0200
++++ 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;
@@ -18,7 +18,7 @@
#ifdef USE_IMAP
if (tmp->magic != M_IMAP)
#endif
-@@ -347,14 +345,18 @@ int mutt_buffy_check (int force)
+@@ -347,13 +345,18 @@ int mutt_buffy_check (int force)
)
{
@@ -29,53 +29,35 @@
case M_MBOX:
case M_MMDF:
-- {
-- if (STAT_CHECK || tmp->msgcount == 0)
+- 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++;
-- }
+ 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)
-+ {
-+ BuffyCount++;
+ {
+- tmp->has_new = tmp->new = 1;
+ 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)
+@@ -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;
+- tmp->has_new = tmp->new = 1;
+ if (!option(OPTSIDEBAR))
+ {
+ BuffyCount++;
@@ -83,69 +65,71 @@
+ break;
+ }
+ tmp->new = 1;
- tmp->msgcount++;
- tmp->msg_unread++;
- }
- }
- if(tmp->msg_unread)
- BuffyCount++;
--
-+
- closedir (dirp);
-
+ 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
-@@ -435,25 +447,25 @@ int mutt_buffy_check (int force)
+ /*
+ * 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:
-- {
-- 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 ((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;
-+ }
-+ }
++ tmp->new = 1;
+ }
+- closedir (dp);
+ }
+ closedir (dirp);
+
break;
}
}
--- buffy.h
-+++ buffy.h 2006-11-16 12:26:58.000000000 +0100
++++ 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;
@@ -153,4 +137,4 @@
- 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 */
+ int msg_flagged; /* number of flagged messages */
++++++ mutt-1.5.17.tar.bz2 -> mutt-1.5.19.tar.bz2 ++++++
++++ 304893 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org