pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/mutt-devel Update mutt-devel to 1.5.10
details: https://anonhg.NetBSD.org/pkgsrc/rev/2761f050488d
branches: trunk
changeset: 498801:2761f050488d
user: tonio <tonio%pkgsrc.org@localhost>
date: Sat Sep 03 16:57:07 2005 +0000
description:
Update mutt-devel to 1.5.10
This release contains many bug fixes for imap support and gpg support.
Change maintainer, i will take this one
Approved by cube@
Adding patch-ae fixing PR 30981
the same patch was comitted to mutt's cvs HEAD
http://dev.mutt.org/cgi-bin/gitweb.cgi?p=mutt/.git;a=commitdiff;h=7423dcab2c8ed2dff79354db0ab8a444a075bb64
diffstat:
mail/mutt-devel/Makefile | 7 +++----
mail/mutt-devel/PLIST | 3 +--
mail/mutt-devel/distinfo | 14 ++++++++------
mail/mutt-devel/patches/patch-ad | 32 ++++++++++++++++++++++++++++++++
mail/mutt-devel/patches/patch-ae | 18 ++++++++++++++++++
mail/mutt-devel/patches/patch-ag | 21 +++++++++++++++------
mail/mutt-devel/patches/patch-ai | 10 +++++-----
7 files changed, 82 insertions(+), 23 deletions(-)
diffs (176 lines):
diff -r 6e6942eb2c3e -r 2761f050488d mail/mutt-devel/Makefile
--- a/mail/mutt-devel/Makefile Sat Sep 03 16:16:03 2005 +0000
+++ b/mail/mutt-devel/Makefile Sat Sep 03 16:57:07 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2005/08/20 21:58:00 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/09/03 16:57:07 tonio Exp $
-DISTNAME= mutt-1.5.9i
+DISTNAME= mutt-1.5.10i
PKGNAME= ${DISTNAME:C/i$//}
-PKGREVISION= 1
CATEGORIES= mail
MUTT_SITES= ftp://ftp.mutt.org/mutt/ \
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -10,7 +9,7 @@
ftp://ftp.fu-berlin.de/unix/mail/mutt/
MASTER_SITES= ${MUTT_SITES:=devel/}
-MAINTAINER= jlam%NetBSD.org@localhost
+MAINTAINER= tonio%NetBSD.org@localhost
HOMEPAGE= http://www.mutt.org/
COMMENT= Text-based MIME mail client with PGP & S/MIME support
diff -r 6e6942eb2c3e -r 2761f050488d mail/mutt-devel/PLIST
--- a/mail/mutt-devel/PLIST Sat Sep 03 16:16:03 2005 +0000
+++ b/mail/mutt-devel/PLIST Sat Sep 03 16:57:07 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/08/20 21:58:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/09/03 16:57:07 tonio Exp $
bin/flea
bin/mutt
bin/muttbug
@@ -36,7 +36,6 @@
share/doc/mutt/html/manual.html
share/doc/mutt/manual.txt
share/doc/mutt/patch-notes.txt
-share/doc/mutt/samples
share/doc/mutt/smime-notes.txt
share/examples/mutt/Mush.rc
share/examples/mutt/Muttrc
diff -r 6e6942eb2c3e -r 2761f050488d mail/mutt-devel/distinfo
--- a/mail/mutt-devel/distinfo Sat Sep 03 16:16:03 2005 +0000
+++ b/mail/mutt-devel/distinfo Sat Sep 03 16:57:07 2005 +0000
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.25 2005/09/03 03:21:23 jlam Exp $
+$NetBSD: distinfo,v 1.26 2005/09/03 16:57:07 tonio Exp $
-SHA1 (mutt-1.5.9i.tar.gz) = a380747b86f11b2b3bf3c4407e70bfebe6d0af02
-RMD160 (mutt-1.5.9i.tar.gz) = 888848046382b3c4e8b18eacd30af4291a7ed23d
-Size (mutt-1.5.9i.tar.gz) = 3036003 bytes
+SHA1 (mutt-1.5.10i.tar.gz) = 3f9cbd330b1458a5c317fd29331f425aa36e0877
+RMD160 (mutt-1.5.10i.tar.gz) = e6855dd72e41b5e451b17bac9934bea8ca0c5db7
+Size (mutt-1.5.10i.tar.gz) = 3156345 bytes
SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
SHA1 (patch-ab) = deab9098ad64ab77b29233a3bf3df1439f36989a
SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
-SHA1 (patch-ag) = 97200a45130506d79d41884c130825d502806a76
+SHA1 (patch-ad) = c427d4ef5129018f26e5a4b3ee2fa5bfb59af3b9
+SHA1 (patch-ae) = b3d88646e7c350f00a551d1127e517b0dd19c5c1
+SHA1 (patch-ag) = 134cd5f16d0be9c4f15eb13e8908079794dfe7f6
SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
-SHA1 (patch-ai) = e9a872cdde09dfae012d63a475f100e8be70acb5
+SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
SHA1 (patch-al) = 9a2c61fae88c6c42534490ee19498677a355c276
diff -r 6e6942eb2c3e -r 2761f050488d mail/mutt-devel/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt-devel/patches/patch-ad Sat Sep 03 16:57:07 2005 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-ad,v 1.7 2005/09/03 16:57:07 tonio Exp $
+
+--- contrib/Makefile.in.orig 2005-09-03 12:03:36.000000000 +0200
++++ contrib/Makefile.in 2005-09-03 12:07:09.000000000 +0200
+@@ -39,21 +39,20 @@
+ check:
+
+ install:
+- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/iconv
+ for f in $(SAMPLES) ; do \
+- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \
++ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(sysconfdir) ; \
+ done
+ for f in $(srcdir)/iconv/*.rc ; do \
+- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \
++ $(INSTALL) -m 644 $$f $(DESTDIR)$(sysconfdir)/iconv ; \
+ done
+
+ uninstall:
+ for f in $(SAMPLES) ; do \
+- rm -f $(DESTDIR)$(docdir)/samples/$$f ; \
++ rm -f $(DESTDIR)$(sysconfdir)/$$f ; \
+ done
+- -rm -rf $(DESTDIR)$(docdir)/samples/iconv
+- -rmdir $(DESTDIR)$(docdir)/samples
+- -rmdir $(DESTDIR)$(docdir)
++ -rm -rf $(DESTDIR)$(sysconfdir)/iconv
++ -rmdir $(DESTDIR)$(sysconfdir)
+
+ maintainer-clean: distclean
+
diff -r 6e6942eb2c3e -r 2761f050488d mail/mutt-devel/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt-devel/patches/patch-ae Sat Sep 03 16:57:07 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.3 2005/09/03 16:57:07 tonio Exp $
+
+Fix PR 30981
+
+--- imap/auth_sasl.c.orig 2005-09-03 18:38:04.000000000 +0200
++++ imap/auth_sasl.c 2005-09-03 18:39:26.000000000 +0200
+@@ -150,7 +150,10 @@
+ }
+ }
+
+- if (!client_start)
++ /* client-start is only available with the SASL-IR extension, but
++ * SASL 2.1 seems to want to use it regardless, at least for DIGEST
++ * fast reauth. Override if the server sent an initial continuation */
++ if (!client_start || buf[0])
+ {
+ do
+ {
diff -r 6e6942eb2c3e -r 2761f050488d mail/mutt-devel/patches/patch-ag
--- a/mail/mutt-devel/patches/patch-ag Sat Sep 03 16:16:03 2005 +0000
+++ b/mail/mutt-devel/patches/patch-ag Sat Sep 03 16:57:07 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2005/08/20 21:58:00 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2005/09/03 16:57:07 tonio Exp $
---- doc/Makefile.in.orig 2005-02-15 14:28:24.000000000 -0500
-+++ doc/Makefile.in
-@@ -80,8 +80,8 @@ install: all instdoc
+--- doc/Makefile.in.orig 2005-08-11 21:37:02.000000000 +0200
++++ doc/Makefile.in 2005-09-03 11:16:26.000000000 +0200
+@@ -81,8 +81,8 @@
./instdoc $(srcdir)/dotlock.man \
$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
@@ -11,5 +11,14 @@
+ ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
+ ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- for f in $(srcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+ for f in $(topsrcdir_DOCFILES) ; do \
+ $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+@@ -170,7 +170,7 @@
+ -e 's,@docdir\@,$(docdir),g'
+
+ mutt.1: $(srcdir)/mutt.man
+- $(EDIT) $< > $@
++ $(EDIT) $(srcdir)/mutt.man > $@
+
+ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
+ $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \
diff -r 6e6942eb2c3e -r 2761f050488d mail/mutt-devel/patches/patch-ai
--- a/mail/mutt-devel/patches/patch-ai Sat Sep 03 16:16:03 2005 +0000
+++ b/mail/mutt-devel/patches/patch-ai Sat Sep 03 16:57:07 2005 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.1 2004/07/21 22:37:10 jlam Exp $
+$NetBSD: patch-ai,v 1.2 2005/09/03 16:57:07 tonio Exp $
---- mutt.h.orig Sun Feb 1 12:15:17 2004
-+++ mutt.h
-@@ -328,6 +328,7 @@ enum
+--- mutt.h.orig 2005-09-03 10:51:23.000000000 +0200
++++ mutt.h 2005-09-03 10:52:23.000000000 +0200
+@@ -336,6 +336,7 @@
OPTBEEP,
OPTBEEPNEW,
OPTBOUNCEDELIVERED,
+ OPTCHANGEFOLDERNEXT,
+ OPTBRAILLEFRIENDLY,
OPTCHECKNEW,
OPTCOLLAPSEUNREAD,
- OPTCONFIRMAPPEND,
Home |
Main Index |
Thread Index |
Old Index