Accepting request 23900 from server:mail

Copy from server:mail/mutt based on submit request 23900 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/23900
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=19

mutt-1.5.15-wrapcolumn.diff

@@ -1,7 +1,9 @@
---- init.h
+Index: init.h
-+++ init.h	2007-06-01 13:18:51.045205100 +0200
+===================================================================
-@@ -2959,7 +2959,8 @@ struct option_t MuttVars[] = {
+--- init.h.orig
-   ** When set, mutt will weed headers when displaying, forwarding,
++++ init.h
+@@ -3308,7 +3308,8 @@ struct option_t MuttVars[] = {
+   ** When \fIset\fP, mutt will weed headers when displaying, forwarding,
    ** printing, or replying to messages.
    */
 -  { "wrap",             DT_NUM,  R_PAGER, UL &Wrap, 0 },

mutt-1.5.19-opennfs.dif

@@ -1,5 +1,7 @@
---- Makefile.am
+Index: Makefile.am
-+++ Makefile.am	2009-03-03 00:00:00.000000000 +0100
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
 @@ -23,7 +23,7 @@ mutt_SOURCES = \
  	edit.c enter.c flags.c init.c filter.c from.c \
  	getdomain.c group.c \
@@ -18,9 +20,11 @@
  pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) 
  pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
  
---- Makefile.in
+Index: Makefile.in
-+++ Makefile.in	2009-03-03 17:00:37.648811010 +0100
+===================================================================
-@@ -75,7 +75,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
+--- Makefile.in.orig
++++ Makefile.in
+@@ -77,7 +77,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
  	hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
  	help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
  	mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \
@@ -29,16 +33,16 @@
  	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)
+@@ -105,7 +105,7 @@ pgpewrap_LDADD = $(LDADD)
  pgpewrap_DEPENDENCIES = @LIBOBJS@
  am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
  	lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \
 -	pgppacket.$(OBJEXT) ascii.$(OBJEXT)
 +	pgppacket.$(OBJEXT) ascii.$(OBJEXT) opennfs.$(OBJEXT)
  pgpring_OBJECTS = $(am_pgpring_OBJECTS)
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- SCRIPTS = $(bin_SCRIPTS)
+ am__vpath_adj = case $$p in \
-@@ -302,7 +302,7 @@ mutt_SOURCES = \
+@@ -352,7 +352,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 \
@@ -47,8 +51,10 @@
  	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 \
---- lib.c
+Index: lib.c
-+++ lib.c	2009-03-03 00:00:00.000000000 +0100
+===================================================================
+--- lib.c.orig
++++ lib.c
 @@ -50,6 +50,7 @@
  #define EX_OK 0
  #endif
@@ -57,7 +63,7 @@
  #include "lib.h"
  
  
-@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla
+@@ -632,6 +633,10 @@ int safe_open (const char *path, int fla
    struct stat osb, nsb;
    int fd;
  
@@ -68,7 +74,7 @@
    if (flags & O_EXCL) 
    {
      char safe_file[_POSIX_PATH_MAX];
-@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla
+@@ -655,7 +660,7 @@ int safe_open (const char *path, int fla
  
    if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0)
      return fd;
@@ -77,9 +83,11 @@
    /* make sure the file is not symlink */
    if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
        compare_stat(&osb, &nsb) == -1)
---- mbox.c
+Index: mbox.c
-+++ mbox.c	2009-03-03 00:00:00.000000000 +0100
+===================================================================
-@@ -749,7 +749,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+--- mbox.c.orig
++++ mbox.c
+@@ -767,7 +767,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
  
    /* Create a temporary file to write the new version of the mailbox in. */
    mutt_mktemp (tempfile);
@@ -88,9 +96,11 @@
        (fp = fdopen (i, "w")) == NULL)
    {
      if (-1 != i)
---- mh.c
+Index: mh.c
-+++ mh.c	2009-03-03 00:00:00.000000000 +0100
+===================================================================
-@@ -238,7 +238,11 @@ static int mh_mkstemp (CONTEXT * dest, F
+--- mh.c.orig
++++ mh.c
+@@ -252,7 +252,11 @@ static int mh_mkstemp (CONTEXT * dest, F
    {
      snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d",
  	      dest->path, NONULL (Hostname), (int) getpid (), Counter++);
@@ -102,7 +112,7 @@
      {
        if (errno != EEXIST)
        {
-@@ -1248,8 +1252,11 @@ int maildir_open_new_message (MESSAGE *
+@@ -1265,8 +1269,11 @@ int maildir_open_new_message (MESSAGE *
  
      dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
  		path));
@@ -115,16 +125,20 @@
      {
        if (errno != EEXIST)
        {
---- mutt.h
+Index: mutt.h
-+++ mutt.h	2009-03-03 00:00:00.000000000 +0100
+===================================================================
-@@ -956,4 +956,5 @@ typedef struct
+--- mutt.h.orig
++++ mutt.h
+@@ -968,4 +968,5 @@ typedef struct
  #include "lib.h"
  #include "globals.h"
  
 +extern int opennfs(const char *, int, int);
  #endif /*MUTT_H*/
---- opennfs.c
+Index: opennfs.c
-+++ opennfs.c	2009-03-03 00:00:00.000000000 +0100
+===================================================================
+--- /dev/null
++++ opennfs.c
 @@ -0,0 +1,122 @@
 +#include <errno.h>
 +#include <fcntl.h>
@@ -248,10 +262,12 @@
 +    if (clear) free(clear);
 +    return open(path, flags, mode);
 +}
---- sendlib.c
+Index: sendlib.c
-+++ sendlib.c	2009-03-03 00:00:00.000000000 +0100
+===================================================================
-@@ -2028,7 +2028,7 @@ send_msg (const char *path, char **args,
+--- sendlib.c.orig
-       if (SendmailWait >= 0 && tempfile)
++++ sendlib.c
+@@ -2122,7 +2122,7 @@ send_msg (const char *path, char **args,
+       if (SendmailWait >= 0 && tempfile && *tempfile)
        {
  	/* *tempfile will be opened as stdout */
 -	if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0)

mutt.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  3 19:09:32 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
 -------------------------------------------------------------------
 Wed Sep  9 13:43:58 CEST 2009 - werner@suse.de
 

mutt.spec

@@ -32,7 +32,7 @@ Requires:       smtp_daemon
 #Requires:    desktop-data-SuSE
 AutoReqProv:    on
 Version:        1.5.20
-Release:        3
+Release:        4
 Summary:        Mail Program
 # ftp://ftp.mutt.org/mutt/devel/
 Source0:        %name-%version.tar.bz2

patch-1.5.20.sidebar.20090619.txt.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8147c7c7377dc4aacbeb072d2a31ba2a246e795cd1d317a7c8a9100a0f5adc9
+oid sha256:ce80c95f83db56f636ef913da0093abe479691f1c21c12f9088f021e638884e5
-size 12438
+size 11882

patch-1.5.5.1.nt.xtitles.3.ab.1

@@ -1,13 +1,16 @@
-diff -ur ../MUTT/mutt/PATCHES mutt/PATCHES
+Index: mutt-1.5.20/PATCHES
---- ../MUTT/mutt/PATCHES	2002-12-09 18:44:54.000000000 +0100
+===================================================================
-+++ mutt/PATCHES	2004-01-19 13:50:52.000000000 +0100
+--- mutt-1.5.20.orig/PATCHES
-@@ -1,0 +1 @@
++++ mutt-1.5.20/PATCHES
+@@ -1 +1,2 @@
+ patch-1.5.19.rr.compressed.1
 +patch-1.5.5.1.nt.xtitles.3.ab.1
-diff -ur ../MUTT/mutt/curs_main.c mutt/curs_main.c
+Index: mutt-1.5.20/curs_main.c
---- ../MUTT/mutt/curs_main.c	2003-09-03 19:09:09.000000000 +0200
+===================================================================
-+++ mutt/curs_main.c	2004-01-19 13:45:37.000000000 +0100
+--- mutt-1.5.20.orig/curs_main.c
-@@ -103,6 +103,19 @@
++++ mutt-1.5.20/curs_main.c
- extern const char *ReleaseDate;
+@@ -110,6 +110,19 @@ static const char *No_visible = N_("No v
+ 
  extern size_t UngetCount;
  
 +#define ASCII_CTRL_G                  0x07
@@ -26,9 +29,9 @@ diff -ur ../MUTT/mutt/curs_main.c mutt/curs_main.c
  void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num)
  {
    format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX;
-@@ -562,6 +575,13 @@
+@@ -566,6 +579,13 @@ int mutt_index_menu (void)
- 	mutt_paddstr (COLS, buf);
  	SETCOLOR (MT_COLOR_NORMAL);
+         BKGDSET (MT_COLOR_NORMAL);
  	menu->redraw &= ~REDRAW_STATUS;
 +	if (option(OPTXTERMSETTITLES))
 +	{
@@ -40,22 +43,24 @@ diff -ur ../MUTT/mutt/curs_main.c mutt/curs_main.c
        }
  
        menu->redraw = 0;
-diff -ur ../MUTT/mutt/globals.h mutt/globals.h
+Index: mutt-1.5.20/globals.h
---- ../MUTT/mutt/globals.h	2003-07-15 13:41:32.000000000 +0200
+===================================================================
-+++ mutt/globals.h	2004-01-19 13:45:37.000000000 +0100
+--- mutt-1.5.20.orig/globals.h
-@@ -112,6 +112,8 @@
++++ mutt-1.5.20/globals.h
+@@ -141,6 +141,8 @@ WHERE char *Tempdir;
  WHERE char *Tochars;
  WHERE char *Username;
  WHERE char *Visual;
 +WHERE char *XtermTitle;
 +WHERE char *XtermIcon;
  
+ WHERE char *CurrentFolder;
  WHERE char *LastFolder;
- 
+Index: mutt-1.5.20/init.c
-diff -ur ../MUTT/mutt/init.c mutt/init.c
+===================================================================
---- ../MUTT/mutt/init.c	2004-01-05 19:49:00.000000000 +0100
+--- mutt-1.5.20.orig/init.c
-+++ mutt/init.c	2004-01-19 13:48:45.000000000 +0100
++++ mutt-1.5.20/init.c
-@@ -891,6 +891,26 @@
+@@ -1833,6 +1833,26 @@ static int parse_set (BUFFER *tmp, BUFFE
  	toggle_option (MuttVars[idx].data);
        else
  	set_option (MuttVars[idx].data);
@@ -80,14 +85,15 @@ diff -ur ../MUTT/mutt/init.c mutt/init.c
 +
 +      }
      }
-     else if (DTYPE (MuttVars[idx].type) == DT_STR ||
+     else if (myvar || DTYPE (MuttVars[idx].type) == DT_STR ||
  	     DTYPE (MuttVars[idx].type) == DT_PATH ||
-diff -ur ../MUTT/mutt/init.h mutt/init.h
+Index: mutt-1.5.20/init.h
---- ../MUTT/mutt/init.h	2004-01-05 19:49:00.000000000 +0100
+===================================================================
-+++ mutt/init.h	2004-01-19 13:45:37.000000000 +0100
+--- mutt-1.5.20.orig/init.h
-@@ -2670,6 +2670,27 @@
++++ mutt-1.5.20/init.h
-   ** Controls whether mutt writes out the Bcc header when preparing
+@@ -3348,6 +3348,27 @@ struct option_t MuttVars[] = {
-   ** messages to be sent.  Exim users may wish to use this.
+   ** Also see the $$read_inc, $$net_inc and $$time_inc variables and the
+   ** ``$tuning'' section of the manual for performance considerations.
    */
 +  {"xterm_icon",       DT_STR,   R_BOTH, UL &XtermIcon,  UL "M%?n?AIL&ail?"},
 +  /*
@@ -111,25 +117,27 @@ diff -ur ../MUTT/mutt/init.h mutt/init.h
 +  ** to the one used by ``$$status_format''.
 +  */
    /*--*/
-   { NULL }
+   { NULL, 0, 0, 0, 0 }
  };
-diff -ur ../MUTT/mutt/mutt.h mutt/mutt.h
+Index: mutt-1.5.20/mutt.h
---- ../MUTT/mutt/mutt.h	2004-01-05 19:49:00.000000000 +0100
+===================================================================
-+++ mutt/mutt.h	2004-01-19 13:45:37.000000000 +0100
+--- mutt-1.5.20.orig/mutt.h
-@@ -424,6 +424,7 @@
++++ mutt-1.5.20/mutt.h
+@@ -452,6 +452,7 @@ enum
    OPTWRAPSEARCH,
    OPTWRITEBCC,		/* write out a bcc header? */
    OPTXMAILER,
 +  OPTXTERMSETTITLES,
  
-   /* PGP options */
+   OPTCRYPTUSEGPGME,
-   
+   OPTCRYPTUSEPKA,
-diff -ur ../MUTT/mutt/pager.c mutt/pager.c
+Index: mutt-1.5.20/pager.c
---- ../MUTT/mutt/pager.c	2004-01-05 19:49:00.000000000 +0100
+===================================================================
-+++ mutt/pager.c	2004-01-19 13:45:37.000000000 +0100
+--- mutt-1.5.20.orig/pager.c
-@@ -1740,6 +1740,13 @@
++++ mutt-1.5.20/pager.c
-       SETCOLOR (MT_COLOR_STATUS);
+@@ -1784,6 +1784,13 @@ mutt_pager (const char *banner, const ch
-       mutt_paddstr (COLS, buffer);
+       }
+       BKGDSET (MT_COLOR_NORMAL);
        SETCOLOR (MT_COLOR_NORMAL);
 +      if (option(OPTXTERMSETTITLES))
 +      {
@@ -140,11 +148,12 @@ diff -ur ../MUTT/mutt/pager.c mutt/pager.c
 +      }
      }
  
-     redraw = 0;
+     if ((redraw & REDRAW_INDEX) && index)
-diff -ur ../MUTT/mutt/mutt_menu.h mutt/mutt_menu.h
+Index: mutt-1.5.20/mutt_menu.h
---- ../MUTT/mutt/mutt_menu.h	2005-09-18 10:22:22.000000000 +0200
+===================================================================
-+++ mutt/mutt_menu.h	2006-08-28 13:17:19.000000000 +0200
+--- mutt-1.5.20.orig/mutt_menu.h
-@@ -112,4 +112,7 @@
++++ mutt-1.5.20/mutt_menu.h
+@@ -112,4 +112,7 @@ int mutt_menuLoop (MUTTMENU *);
  void index_make_entry (char *, size_t, struct menu_t *, int);
  int index_color (int);