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

mutt-1.5.13-memmove.dif

@@ -1,13 +0,0 @@
---- muttlib.c
-+++ muttlib.c	2007-05-16 09:26:24.607110614 +0000
-@@ -537,8 +537,8 @@ char *mutt_gecos_name (char *dest, size_
-     if (dest[idx] == '&')
-     {
-       memmove (&dest[idx + pwnl], &dest[idx + 1],
--	       MAX(destlen - idx - pwnl - 1, 0));
--      memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl));
-+	       MAX((ssize_t)(destlen - idx - pwnl - 1), 0));
-+      memcpy (&dest[idx], pw->pw_name, MIN((ssize_t)(destlen - idx - 1), pwnl));
-       dest[idx] = toupper ((unsigned char) dest[idx]);
-     }
-   }

mutt-1.5.15.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f60f40aee3543ff31617534bfeec51de51044eac5b1ac96339fe297dd8dae45c
-size 2340986

mutt-1.5.16.dif

@@ -1,7 +1,7 @@
 --- Muttrc
-+++ Muttrc	2007-06-01 12:55:02.004189493 +0200
++++ Muttrc	2007-06-01 12:55:02.004189000 +0200
-@@ -15,7 +15,7 @@ macro index,pager \cb "<pipe-message> ur
+@@ -18,7 +18,7 @@ macro index,pager,attach,compose \cb "\
- macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
+ "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
 -macro generic,pager <F1> "<shell-escape> less /usr/local/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
@@ -9,7 +9,7 @@
  
  # 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"
-@@ -330,9 +330,9 @@ attachments   -I message/external-body
+@@ -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''.
  # 
@@ -22,7 +22,7 @@
  # Name: autoedit
  # Type: boolean
  # Default: no
-@@ -706,11 +706,11 @@ attachments   -I message/external-body
+@@ -709,11 +709,11 @@ attachments   -I message/external-body
  # filtered message is read from the standard output.
  # 
  # 
@@ -36,7 +36,7 @@
  # 
  # 
  # Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -1965,9 +1965,9 @@ attachments   -I message/external-body
+@@ -1981,9 +1981,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.
  # 
@@ -49,7 +49,7 @@
  # Name: pager_context
  # Type: number
  # Default: 0
-@@ -1991,9 +1991,9 @@ attachments   -I message/external-body
+@@ -2007,9 +2007,9 @@ attachments   -I message/external-body
  # pager.  The valid sequences are listed in the ``$index_format''
  # section.
  # 
@@ -62,7 +62,7 @@
  # Name: pager_index_lines
  # Type: number
  # Default: 0
-@@ -2011,9 +2011,9 @@ attachments   -I message/external-body
+@@ -2027,9 +2027,9 @@ attachments   -I message/external-body
  # is less than pager_index_lines, then the index will only use as
  # many lines as it needs.
  # 
@@ -75,7 +75,7 @@
  # Name: pager_stop
  # Type: boolean
  # Default: no
-@@ -3434,9 +3434,9 @@ attachments   -I message/external-body
+@@ -3450,9 +3450,9 @@ attachments   -I message/external-body
  # (possibly undeleted) message whenever a command that modifies the
  # current message is executed.
  # 
@@ -88,7 +88,7 @@
  # Name: reverse_alias
  # Type: boolean
  # Default: no
-@@ -3567,6 +3567,18 @@ attachments   -I message/external-body
+@@ -3583,6 +3583,18 @@ attachments   -I message/external-body
  # Also see the ``$force_name'' variable.
  # 
  # 
@@ -107,9 +107,9 @@
  # set score=yes
  #
  # Name: score
-@@ -3806,9 +3818,9 @@ attachments   -I message/external-body
+@@ -3837,9 +3849,9 @@ attachments   -I message/external-body
- # 
+ # Setting this variable overrides the value of the ``$sendmail''
- # Example: set smtp_authenticators="digest-md5:cram-md5"
+ # variable.
  # 
 -# 
 -# set sort=date
@@ -120,7 +120,7 @@
  # Name: sort
  # Type: sort order
  # Default: date
-@@ -4104,9 +4116,9 @@ attachments   -I message/external-body
+@@ -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.
  # 
@@ -133,7 +133,7 @@
  # Name: tilde
  # Type: boolean
  # Default: no
-@@ -4374,3 +4386,39 @@ attachments   -I message/external-body
+@@ -4405,3 +4417,39 @@ attachments   -I message/external-body
  # in this case.
  # 
  # 
@@ -174,9 +174,9 @@
 +# 
 +# 
 --- Muttrc.head
-+++ Muttrc.head	2007-06-01 12:51:03.642800558 +0200
++++ Muttrc.head	2007-06-01 12:51:03.642800000 +0200
-@@ -15,7 +15,7 @@ macro index,pager \cb "<pipe-message> ur
+@@ -18,7 +18,7 @@ macro index,pager,attach,compose \cb "\
- macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
+ "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
 -macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
@@ -185,7 +185,7 @@
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
 --- configure.ac
-+++ configure.ac	2007-06-01 12:57:38.328822596 +0200
++++ 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
@@ -223,7 +223,7 @@
            saved_LIBS="$LIBS"
 --- init.h
 +++ init.h	2006-08-17 19:07:25.000000000 +0200
-@@ -1952,6 +1952,9 @@ struct option_t MuttVars[] = {
+@@ -1960,6 +1960,9 @@ struct option_t MuttVars[] = {
     ** since it would otherwise have to abort the connection anyway. This
     ** option supersedes ``$$ssl_starttls''.
     */
@@ -234,16 +234,16 @@
    /*
    ** .pp
 --- doc/Makefile.in
-+++ doc/Makefile.in	2006-08-17 18:34:10.000000000 +0200
++++ doc/Makefile.in	2007-06-12 12:04:49.827249163 +0200
-@@ -435,7 +435,7 @@ uninstall-local:
+@@ -436,7 +436,7 @@ uninstall-local:
  
  check:
  manual.txt: manual.html
--	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
+-	-lynx -dump -nolist -with_backspaces $^ > $@ || \
-+	-lynx -dont_wrap_pre -center -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
++	-lynx -dont_wrap_pre -center -dump -nolist -with_backspaces $^ > $@ || \
+ 	w3m -dump $^ > $@ || \
+ 	elinks -dump -no-numbering -no-references $^ > $@
  
- manual.html: $(srcdir)/html.xsl stamp-doc-xml
- 	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 --- imap/auth.c
 +++ imap/auth.c	2006-11-09 16:19:56.000000000 +0100
 @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)

mutt-1.5.16.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:067a2fbb20cbbc814bcec28a74ba411f30edfcb127af58ec8bcdfba3eb6b3c88
+size 2353303

mutt.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 21 14:05:33 CEST 2007 - werner@suse.de
+
+- Update to mutt version 1.5.16 the bug fix version
+
 -------------------------------------------------------------------
 Fri Jun  1 14:03:12 CEST 2007 - werner@suse.de
 

mutt.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package mutt (Version 1.5.15)
+# spec file for package mutt (Version 1.5.16)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -23,7 +23,7 @@ Requires:       smtp_daemon
 # desktop selections.
 #Requires:    desktop-data-SuSE
 Autoreqprov:    on
-Version:        1.5.15
+Version:        1.5.16
 Release:        1
 Summary:        Mail Program
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -35,7 +35,7 @@ Source3:        mutt.png
 Source4:        mutt.desktop
 Patch:          %name-%version.dif
 # http://www.spinnaker.de/mutt/compressed/
-Patch1:         patch-%version.rr.compressed.2.bz2
+Patch1:         patch-%version.rr.compressed.1.bz2
 Patch2:         %name-1.5.9i-pgpewrap.diff
 Patch3:         %name-1.5.9i-sendgroupreplyto.diff
 Patch4:         %name-1.5.15-wrapcolumn.diff
@@ -44,7 +44,6 @@ Patch5:         patch-1.5.5.1.nt.xtitles.3.ab.1
 Patch6:         patch-%version.sidebar.20070408.txt.bz2
 Patch7:         mutt-1.5.15.sidebar-fix.dif
 Patch8:         mutt-1.5.15-opennfs.dif
-Patch9:         mutt-1.5.13-memmove.dif
 
 %description
 A very powerful mail user agent. It supports (among other nice things)
@@ -69,12 +68,12 @@ Authors:
 %patch6 -p1
 %patch7 -p0
 %patch8 -p0
-%patch9 -p0
 cp 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"
@@ -159,6 +158,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/Muttrc
 
 %changelog
+* Thu Jun 21 2007 - werner@suse.de
+- Update to mutt version 1.5.16 the bug fix version
 * Fri Jun 01 2007 - werner@suse.de
 - Update to mutt version 1.5.15 due CVE-2007-1558 (bug #279843)
 * Wed May 16 2007 - werner@suse.de

patch-1.5.15.rr.compressed.2.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e14f6fc50381bb40cd673f12426baaf8d6096687ac7038cfb88d7924aaf49f51
-size 10182

patch-1.5.15.sidebar.20070408.txt.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:250e630a02013c5b162976e7f3c9c01cbc92b92f6c43cfba5678564f199c597e
-size 11416

patch-1.5.16.rr.compressed.1.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd4d5b9d83aeb4551603ff3d0216196a0d7b0b5eadee52dcbc40482a06091fd0
+size 10159

patch-1.5.16.sidebar.20070408.txt.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:337240a739165138cea44a52969baca548cd9e24b0e3df4548abc684d935fc8f
+size 10871