diff --git a/mutt-1.5.16.tar.bz2 b/mutt-1.5.16.tar.bz2 deleted file mode 100644 index 15b9e33..0000000 --- a/mutt-1.5.16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:067a2fbb20cbbc814bcec28a74ba411f30edfcb127af58ec8bcdfba3eb6b3c88 -size 2353303 diff --git a/mutt-1.5.15-opennfs.dif b/mutt-1.5.17-opennfs.dif similarity index 86% rename from mutt-1.5.15-opennfs.dif rename to mutt-1.5.17-opennfs.dif index a609d01..f87e212 100644 --- a/mutt-1.5.15-opennfs.dif +++ b/mutt-1.5.17-opennfs.dif @@ -1,5 +1,16 @@ ---- Makefile.am -+++ Makefile.am 2006-10-06 18:28:31.000000000 +0200 +--- + 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) \ edit.c enter.c flags.c init.c filter.c from.c \ getdomain.c group.c \ @@ -13,13 +24,13 @@ mutt_dotlock_LDADD = @LIBOBJS@ mutt_dotlock_DEPENDENCIES = @LIBOBJS@ --pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c -+pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c opennfs.c +-pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c ++pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c opennfs.c md5.c pgppacket.c ascii.c pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) ---- Makefile.in -+++ Makefile.in 2006-10-06 18:28:50.000000000 +0200 +--- 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) \ @@ -32,13 +43,13 @@ @@ -103,7 +103,7 @@ pgpewrap_LDADD = $(LDADD) pgpewrap_DEPENDENCIES = @LIBOBJS@ am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ - lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(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) SCRIPTS = $(bin_SCRIPTS) -@@ -307,7 +307,7 @@ mutt_SOURCES = $(BUILT_SOURCES) \ +@@ -308,7 +308,7 @@ mutt_SOURCES = $(BUILT_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 +58,8 @@ 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 -+++ lib.c 2007-06-01 13:42:16.024606624 +0200 +--- a/lib.c ++++ b/lib.c @@ -48,6 +48,7 @@ #define EX_OK 0 #endif @@ -57,7 +68,7 @@ #include "lib.h" -@@ -562,6 +563,10 @@ int safe_open (const char *path, int fla +@@ -566,6 +567,10 @@ int safe_open (const char *path, int fla struct stat osb, nsb; int fd; @@ -68,7 +79,7 @@ if (flags & O_EXCL) { char safe_file[_POSIX_PATH_MAX]; -@@ -585,7 +590,7 @@ int safe_open (const char *path, int fla +@@ -589,7 +594,7 @@ int safe_open (const char *path, int fla if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0) return fd; @@ -77,8 +88,8 @@ /* make sure the file is not symlink */ if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || compare_stat(&osb, &nsb) == -1) ---- mbox.c -+++ mbox.c 2006-10-06 18:09:47.000000000 +0200 +--- a/mbox.c ++++ b/mbox.c @@ -741,7 +741,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int /* Create a temporary file to write the new version of the mailbox in. */ @@ -88,8 +99,8 @@ (fp = fdopen (i, "w")) == NULL) { if (-1 != i) ---- mh.c -+++ mh.c 2007-06-01 13:47:48.892011435 +0200 +--- a/mh.c ++++ b/mh.c @@ -238,7 +238,11 @@ static int mh_mkstemp (CONTEXT * dest, F { snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d", @@ -102,7 +113,7 @@ { if (errno != EEXIST) { -@@ -1208,8 +1212,11 @@ int maildir_open_new_message (MESSAGE * +@@ -1215,8 +1219,11 @@ int maildir_open_new_message (MESSAGE * dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", path)); @@ -115,16 +126,16 @@ { if (errno != EEXIST) { ---- mutt.h -+++ mutt.h 2006-10-06 17:58:56.000000000 +0200 -@@ -971,4 +971,5 @@ typedef struct +--- a/mutt.h ++++ b/mutt.h +@@ -974,4 +974,5 @@ typedef struct #include "lib.h" #include "globals.h" +extern int opennfs(const char *, int, int); #endif /*MUTT_H*/ ---- opennfs.c -+++ opennfs.c 2006-10-10 14:28:12.000000000 +0200 +--- /dev/null ++++ b/opennfs.c @@ -0,0 +1,122 @@ +#include +#include @@ -248,9 +259,9 @@ + if (clear) free(clear); + return open(path, flags, mode); +} ---- sendlib.c -+++ sendlib.c 2006-10-06 18:03:56.000000000 +0200 -@@ -2022,7 +2022,7 @@ send_msg (const char *path, char **args, +--- a/sendlib.c ++++ b/sendlib.c +@@ -2030,7 +2030,7 @@ send_msg (const char *path, char **args, if (SendmailWait >= 0 && tempfile) { /* *tempfile will be opened as stdout */ diff --git a/mutt-1.5.16.dif b/mutt-1.5.17.dif similarity index 100% rename from mutt-1.5.16.dif rename to mutt-1.5.17.dif diff --git a/mutt-1.5.17.tar.bz2 b/mutt-1.5.17.tar.bz2 new file mode 100644 index 0000000..7ee9e8c --- /dev/null +++ b/mutt-1.5.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64fd048cca7b359a78516533de27d207369b70c91d3929d313f2d2629e330a1d +size 2391303 diff --git a/mutt.changes b/mutt.changes index abd8323..fe2000a 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 20 20:00:30 CET 2007 - bwalle@suse.de + +- updated to mutt version 1.5.16 the bug fix release +- updated sidebar patch to 1.5.17.sidebar.20071102 +- updated compression patch to 1.5.17.rr.compressed.1 + ------------------------------------------------------------------- Wed Dec 5 18:09:25 CET 2007 - ro@suse.de diff --git a/mutt.spec b/mutt.spec index 198a65c..18451e9 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,5 +1,5 @@ # -# spec file for package mutt (Version 1.5.16) +# spec file for package mutt (Version 1.5.17) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,8 +23,8 @@ Requires: smtp_daemon # desktop selections. #Requires: desktop-data-SuSE AutoReqProv: on -Version: 1.5.16 -Release: 59 +Version: 1.5.17 +Release: 1 Summary: Mail Program BuildRoot: %{_tmppath}/%{name}-%{version}-build # ftp://ftp.mutt.org/mutt/devel/ @@ -42,9 +42,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.20070704.txt.bz2 +Patch6: patch-%version.sidebar.20071102.txt.bz2 Patch7: mutt-1.5.15.sidebar-fix.dif -Patch8: mutt-1.5.15-opennfs.dif +Patch8: mutt-1.5.17-opennfs.dif %description A very powerful mail user agent. It supports (among other nice things) @@ -68,7 +68,7 @@ Authors: %patch5 -p1 %patch6 -p1 %patch7 -p0 -%patch8 -p0 +%patch8 -p1 cp Muttrc Muttrc.SuSE cp %{S:2} . @@ -161,6 +161,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/Muttrc %changelog +* Thu Dec 20 2007 - bwalle@suse.de +- updated to mutt version 1.5.16 the bug fix release +- updated sidebar patch to 1.5.17.sidebar.20071102 +- updated compression patch to 1.5.17.rr.compressed.1 * Wed Dec 05 2007 - ro@suse.de - moved /etc/skel/.muttrc to this package * Thu Sep 20 2007 - werner@suse.de diff --git a/patch-1.5.16.rr.compressed.1.bz2 b/patch-1.5.16.rr.compressed.1.bz2 deleted file mode 100644 index 1a5271a..0000000 --- a/patch-1.5.16.rr.compressed.1.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd4d5b9d83aeb4551603ff3d0216196a0d7b0b5eadee52dcbc40482a06091fd0 -size 10159 diff --git a/patch-1.5.16.sidebar.20070704.txt.bz2 b/patch-1.5.16.sidebar.20070704.txt.bz2 deleted file mode 100644 index 362c775..0000000 --- a/patch-1.5.16.sidebar.20070704.txt.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0965271eccd7533390403a3420837ead4935b733af54a301b2a9fb83aad0dd9c -size 11442 diff --git a/patch-1.5.17.rr.compressed.1.bz2 b/patch-1.5.17.rr.compressed.1.bz2 new file mode 100644 index 0000000..d04e620 --- /dev/null +++ b/patch-1.5.17.rr.compressed.1.bz2 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..c3e64f9 --- /dev/null +++ b/patch-1.5.17.sidebar.20071102.txt.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:602ea04662e5f9e1f186bf6bc584970b65b86e52bd404c0e329413f8ab121e93 +size 12217