UPDATE: mutt 1.5.15

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: mutt 1.5.15

steven mestdagh
please give it a try.

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/mail/mutt/Makefile.inc,v
retrieving revision 1.23
diff -u -r1.23 Makefile.inc
--- Makefile.inc 3 Aug 2006 19:56:08 -0000 1.23
+++ Makefile.inc 28 May 2007 22:33:18 -0000
@@ -10,7 +10,7 @@
    ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/
 
 MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/
-MASTER_SITES1= http://mirrors.protection.cx/~jolan/
+MASTER_SITES1= http://lunar-linux.org/~tchan/mutt/
 
 MODULES= devel/gettext
 
@@ -26,7 +26,7 @@
 FLAVOR?=
 
 AUTOCONF_VERSION?= 2.59
-CONFIGURE_STYLE= autoconf old
+CONFIGURE_STYLE?= autoconf old
 CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \
  --with-docdir="${PREFIX}/share/doc/mutt" \
  --enable-flock \
@@ -85,10 +85,10 @@
 .endif
 
 .if ${FLAVOR:L:Msidebar}
-PATCHFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1
+PATCHFILES+= patch-1.5.15.sidebar.20070408.txt:1
 PATCH_DIST_STRIP= -p1
 .else
-SUPDISTFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1
+SUPDISTFILES+= patch-1.5.15.sidebar.20070408.txt:1
 .endif
 
 .if defined(HOMESPOOL)
Index: snapshot/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- snapshot/Makefile 4 May 2007 09:09:31 -0000 1.41
+++ snapshot/Makefile 28 May 2007 22:33:18 -0000
@@ -2,11 +2,13 @@
 
 COMMENT= "tty-based e-mail client, development version"
 
-VERSION= 1.5.12
+VERSION= 1.5.15
 DISTNAME= mutt-${VERSION}
-PKGNAME= ${DISTNAME}p0
 MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
 
 FLAVORS= hcache idn sidebar
+
+CONFIGURE_STYLE=autoconf
+AUTOCONF_VERSION=2.60
 
 .include <bsd.port.mk>
Index: snapshot/distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- snapshot/distinfo 5 Apr 2007 16:20:03 -0000 1.24
+++ snapshot/distinfo 28 May 2007 22:33:18 -0000
@@ -1,15 +1,15 @@
-MD5 (mutt-1.5.12.tar.gz) = VxlsgWIRpykA/cVDQesBMg==
-MD5 (patch-1.5.12.rr.compressed.1.gz) = u35DnXSyLt6RLS0whisTZw==
-MD5 (patch-1.5.12.sidebar.20060720.txt-fixed) = D50gbC1jspWBqTT2rt/7wg==
-RMD160 (mutt-1.5.12.tar.gz) = 5o1MWwmbgUh2nROKNvqFYbJ4lpw=
-RMD160 (patch-1.5.12.rr.compressed.1.gz) = fJujLZRMyELDQFNe5ikTMFLiaA8=
-RMD160 (patch-1.5.12.sidebar.20060720.txt-fixed) = vqh6fLv/g4mRLb2VIxYZ9dLQJ+4=
-SHA1 (mutt-1.5.12.tar.gz) = u4iKNfQqd95+MmwDtghUrRzCZuo=
-SHA1 (patch-1.5.12.rr.compressed.1.gz) = I9Ix9D2D4B55zemGFnkRZUFDZEY=
-SHA1 (patch-1.5.12.sidebar.20060720.txt-fixed) = 3t8eNwwIwiTVYrUkk1mKNKe2HP8=
-SHA256 (mutt-1.5.12.tar.gz) = DQwqts6g2TV5vFSQ+v2uO/ZABw2ZNJDHsAzKxPqAi2c=
-SHA256 (patch-1.5.12.rr.compressed.1.gz) = 3XJf+4BlEhPJbbTvta8NASJzQMvgr0L0mHdTnVoEjpE=
-SHA256 (patch-1.5.12.sidebar.20060720.txt-fixed) = aodlLbf+M3VRvt3CBISTfnbf6Kf3JxChnJXvfBCyX+M=
-SIZE (mutt-1.5.12.tar.gz) = 3440835
-SIZE (patch-1.5.12.rr.compressed.1.gz) = 10430
-SIZE (patch-1.5.12.sidebar.20060720.txt-fixed) = 47421
+MD5 (mutt-1.5.15.tar.gz) = ssHrRf2Vj2WJ7lKpjyo84Q==
+MD5 (patch-1.5.15.rr.compressed.1.gz) = 85xrqz4O7+L2P4h8P9UIjA==
+MD5 (patch-1.5.15.sidebar.20070408.txt) = j8rl6jjqxFYWdi1298razw==
+RMD160 (mutt-1.5.15.tar.gz) = DMCE0vzavAvEFjL8/5BwPCBt49s=
+RMD160 (patch-1.5.15.rr.compressed.1.gz) = Wm+64x31G1D6Mht3tNDgbfEji2Y=
+RMD160 (patch-1.5.15.sidebar.20070408.txt) = KFv+iQW5KBSYfuAm99caHwjlAAI=
+SHA1 (mutt-1.5.15.tar.gz) = Gtq/bgfgmbtmTIPjwBALu9/sepo=
+SHA1 (patch-1.5.15.rr.compressed.1.gz) = i8hjFO/0IGrfeEoOJjqCPPDxpKE=
+SHA1 (patch-1.5.15.sidebar.20070408.txt) = igdDcTHfWka14uwuGIslJBHvkk4=
+SHA256 (mutt-1.5.15.tar.gz) = A/ofRdR0PNOVtjTRmuu8LBkYz2toPgr1EHbMx59kOpo=
+SHA256 (patch-1.5.15.rr.compressed.1.gz) = OOyLYhsB0DHucmnMtz20jn5vuktrlaoXR/aOe42YDnk=
+SHA256 (patch-1.5.15.sidebar.20070408.txt) = O2HNIcvlvVhRpUQc4Ems4zKfcQv1IkBkpik9N50Uxfg=
+SIZE (mutt-1.5.15.tar.gz) = 3517899
+SIZE (patch-1.5.15.rr.compressed.1.gz) = 10539
+SIZE (patch-1.5.15.sidebar.20070408.txt) = 51101
Index: snapshot/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile_in
--- snapshot/patches/patch-Makefile_in 2 Aug 2006 14:30:09 -0000 1.3
+++ snapshot/patches/patch-Makefile_in 28 May 2007 22:33:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.3 2006/08/02 14:30:09 bernd Exp $
---- Makefile.in.orig Fri Jul 14 20:21:03 2006
-+++ Makefile.in Fri Jul 21 18:08:41 2006
-@@ -939,7 +939,7 @@ info: info-recursive
+--- Makefile.in.orig Fri Apr  6 22:05:40 2007
++++ Makefile.in Mon May 28 23:48:08 2007
+@@ -945,7 +945,7 @@ info: info-recursive
 
  info-am:
 
Index: snapshot/patches/patch-browser_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-browser_c,v
retrieving revision 1.3
diff -u -r1.3 patch-browser_c
--- snapshot/patches/patch-browser_c 14 Sep 2005 21:00:03 -0000 1.3
+++ snapshot/patches/patch-browser_c 28 May 2007 22:33:18 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-browser_c,v 1.3 2005/09/14 21:00:03 bernd Exp $
---- browser.c.orig Thu Aug 11 21:37:01 2005
-+++ browser.c Fri Aug 12 09:21:37 2005
+--- browser.c.orig Tue Apr  3 06:57:21 2007
++++ browser.c Mon May 28 23:48:08 2007
 @@ -27,6 +27,7 @@
  #include "buffy.h"
  #include "mapping.h"
@@ -9,7 +9,7 @@
  #include "mailbox.h"
  #include "browser.h"
  #ifdef USE_IMAP
-@@ -351,6 +352,21 @@ static void init_state (struct browser_s
+@@ -351,6 +352,21 @@ static void init_state (struct browser_state *state, M
      menu->data = state->entry;
  }
 
@@ -31,7 +31,7 @@
  static int examine_directory (MUTTMENU *menu, struct browser_state *state,
       char *d, const char *prefix)
  {
-@@ -414,6 +430,7 @@ static int examine_directory (MUTTMENU *
+@@ -414,6 +430,7 @@ static int examine_directory (MUTTMENU *menu, struct b
      tmp = Incoming;
      while (tmp && mutt_strcmp (buffer, tmp->path))
        tmp = tmp->next;
@@ -39,7 +39,7 @@
      add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
    }
    closedir (dp);  
-@@ -459,6 +476,7 @@ static int examine_mailboxes (MUTTMENU *
+@@ -463,6 +480,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
      strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
      mutt_pretty_mailbox (buffer);
 
Index: snapshot/patches/patch-configure_ac
===================================================================
RCS file: snapshot/patches/patch-configure_ac
diff -N snapshot/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ snapshot/patches/patch-configure_ac 28 May 2007 22:33:18 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Tue May 29 00:09:10 2007
++++ configure.ac Tue May 29 00:09:19 2007
+@@ -531,7 +531,7 @@ docdir=$mutt_cv_docdir
+ AC_SUBST(docdir)
+
+ if test x$mutt_cv_setgid = xyes; then
+-        DOTLOCK_GROUP='mail'
++        DOTLOCK_GROUP='wheel'
+         DOTLOCK_PERMISSION=2755
+ else
+         DOTLOCK_GROUP=''
Index: snapshot/patches/patch-configure_in
===================================================================
RCS file: snapshot/patches/patch-configure_in
diff -N snapshot/patches/patch-configure_in
--- snapshot/patches/patch-configure_in 2 Aug 2006 14:30:09 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.5 2006/08/02 14:30:09 bernd Exp $
---- configure.in.orig Fri Jul 14 20:15:32 2006
-+++ configure.in Sat Jul 15 11:06:15 2006
-@@ -476,7 +476,7 @@ docdir=$mutt_cv_docdir
- AC_SUBST(docdir)
-
- if test x$mutt_cv_setgid = xyes; then
--        DOTLOCK_GROUP='mail'
-+        DOTLOCK_GROUP='wheel'
-         DOTLOCK_PERMISSION=2755
- else
-         DOTLOCK_GROUP=''
Index: snapshot/patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-doc_Makefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-doc_Makefile_in
--- snapshot/patches/patch-doc_Makefile_in 2 Aug 2006 14:30:09 -0000 1.5
+++ snapshot/patches/patch-doc_Makefile_in 28 May 2007 22:33:18 -0000
@@ -1,16 +1,16 @@
 $OpenBSD: patch-doc_Makefile_in,v 1.5 2006/08/02 14:30:09 bernd Exp $
---- doc/Makefile.in.orig Wed Jul  5 10:40:07 2006
-+++ doc/Makefile.in Sat Jul 15 11:08:39 2006
-@@ -71,7 +71,7 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA
- all: ../makedoc$(EXEEXT)
+--- doc/Makefile.in.orig Fri Apr  6 09:17:10 2007
++++ doc/Makefile.in Mon May 28 23:56:21 2007
+@@ -395,7 +395,7 @@ uninstall-am: uninstall-info-am uninstall-local
+ all:
  $(MAKE) makedoc-all
 
 -makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
 +makedoc-all: mutt.1 muttrc.man
 
- install: makedoc-all instdoc
+ install-data-local: makedoc-all instdoc
  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -171,8 +171,8 @@ update-doc: stamp-doc-xml stamp-doc-chun
+@@ -472,8 +472,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked manual.txt
 
  muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m |    \
@@ -19,5 +19,5 @@
 + cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail | \
 + /usr/bin/tbl > muttrc.man
 
- EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
- -e 's,@bindir\@,$(bindir),g' \
+ mutt.1: $(srcdir)/mutt.man
+ $(EDIT) $(srcdir)/mutt.man > $@
Index: snapshot/patches/patch-filter_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-filter_c,v
retrieving revision 1.3
diff -u -r1.3 patch-filter_c
--- snapshot/patches/patch-filter_c 14 Sep 2005 21:00:03 -0000 1.3
+++ snapshot/patches/patch-filter_c 28 May 2007 22:33:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-filter_c,v 1.3 2005/09/14 21:00:03 bernd Exp $
---- filter.c.orig Thu Feb  3 19:47:52 2005
-+++ filter.c Fri Aug 12 09:21:37 2005
-@@ -117,7 +117,7 @@ mutt_create_filter_fd (const char *cmd,
+--- filter.c.orig Sun Apr  1 23:58:55 2007
++++ filter.c Mon May 28 23:56:17 2007
+@@ -117,7 +117,7 @@ mutt_create_filter_fd (const char *cmd, FILE **in, FIL
        close (fderr);
      }
 
Index: snapshot/patches/patch-mutt_tunnel_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-mutt_tunnel_c,v
retrieving revision 1.4
diff -u -r1.4 patch-mutt_tunnel_c
--- snapshot/patches/patch-mutt_tunnel_c 2 Aug 2006 14:30:09 -0000 1.4
+++ snapshot/patches/patch-mutt_tunnel_c 28 May 2007 22:33:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-mutt_tunnel_c,v 1.4 2006/08/02 14:30:09 bernd Exp $
---- mutt_tunnel.c.orig Tue Dec 20 10:36:02 2005
-+++ mutt_tunnel.c Sat Jul 15 11:06:15 2006
-@@ -97,7 +97,7 @@ static int tunnel_socket_open (CONNECTIO
+--- mutt_tunnel.c.orig Sun Apr  1 23:58:56 2007
++++ mutt_tunnel.c Mon May 28 23:56:17 2007
+@@ -97,7 +97,7 @@ static int tunnel_socket_open (CONNECTION *conn)
      /* Don't let the subprocess think it can use the controlling tty */
      setsid ();
 
Index: snapshot/patches/patch-muttlib_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-muttlib_c,v
retrieving revision 1.1
diff -u -r1.1 patch-muttlib_c
--- snapshot/patches/patch-muttlib_c 4 May 2007 09:09:31 -0000 1.1
+++ snapshot/patches/patch-muttlib_c 28 May 2007 22:33:18 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-muttlib_c,v 1.1 2007/05/04 09:09:31 kili Exp $
 
---- muttlib.c.orig Thu May  3 09:41:31 2007
-+++ muttlib.c Thu May  3 13:54:16 2007
-@@ -536,7 +536,9 @@ char *mutt_gecos_name (char *dest, size_t destlen, str
+--- muttlib.c.orig Tue Apr  3 19:52:56 2007
++++ muttlib.c Mon May 28 23:56:17 2007
+@@ -539,7 +539,9 @@ char *mutt_gecos_name (char *dest, size_t destlen, str
    {
      if (dest[idx] == '&')
      {
Index: snapshot/patches/patch-system_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-system_c,v
retrieving revision 1.3
diff -u -r1.3 patch-system_c
--- snapshot/patches/patch-system_c 14 Sep 2005 21:00:03 -0000 1.3
+++ snapshot/patches/patch-system_c 28 May 2007 22:33:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-system_c,v 1.3 2005/09/14 21:00:03 bernd Exp $
---- system.c.orig Thu Feb  3 19:47:53 2005
-+++ system.c Fri Aug 12 09:21:37 2005
-@@ -114,7 +114,7 @@ int _mutt_system (const char *cmd, int f
+--- system.c.orig Sun Apr  1 23:58:58 2007
++++ system.c Mon May 28 23:56:17 2007
+@@ -114,7 +114,7 @@ int _mutt_system (const char *cmd, int flags)
      sigaction (SIGTSTP, &act, NULL);
      sigaction (SIGCONT, &act, NULL);
 
Index: snapshot/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/pkg/PLIST,v
retrieving revision 1.15
diff -u -r1.15 PLIST
--- snapshot/pkg/PLIST 2 Aug 2006 14:30:09 -0000 1.15
+++ snapshot/pkg/PLIST 28 May 2007 22:33:18 -0000
@@ -40,6 +40,7 @@
 share/doc/mutt/reference.html
 share/doc/mutt/samples/
 share/doc/mutt/smime-notes.txt
+share/doc/mutt/tuning.html
 share/examples/mutt/
 @sample ${CONFDIR}/
 share/examples/mutt/Mush.rc
@@ -72,6 +73,7 @@
 share/examples/mutt/iconv/iconv.solaris-2.7.rc
 share/examples/mutt/mime.types.sample
 @sample ${CONFDIR}/mime.types
+share/examples/mutt/mutt_xtitle
 share/examples/mutt/pgp2.rc
 share/examples/mutt/pgp5.rc
 share/examples/mutt/pgp6.rc

Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: mutt 1.5.15

Stuart Henderson
On 2007/05/29 00:36, steven mestdagh wrote:
> please give it a try.

I tried it at release (no compressed patch until more recently so
I didn't bother sending an update); text/flowed quoting is somewhat
mangled in 1.5.15, it's been fixed in more recent devel snapshots
which I've been running since I spotted that (I didn't want the
old code back now I saw that it can retry lost imap connections)

> -SUPDISTFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1
> +SUPDISTFILES+= patch-1.5.15.sidebar.20070408.txt:1

there's a conflict (in PATCHES) with compressed and sidebar together
unless one or other is modified (hence -fixed on protection.cx).