From 7d53893f4097f0f403a42015770dcf0075234b4b Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Thu, 16 Sep 2010 11:38:46 +0400 Subject: [PATCH] Update Mutt to 1.5.21 - patches for buffy.c and mutt-ssl.c were committed upstream; - patch for mktemp was modified to the current version of the code. Signed-off-by: Eygene Ryabinkin --- mail/mutt-devel/Makefile | 5 +-- mail/mutt-devel/distinfo | 36 +++++++--------------- mail/mutt-devel/files/extra-patch-doc-xml | 4 +- mail/mutt-devel/files/patch-02 | 18 ++++++------ mail/mutt-devel/files/patch-buffy.c | 10 ------ mail/mutt-devel/files/patch-doc-manual.xml.head | 22 +++++++------ mail/mutt-devel/files/patch-mktemp | 27 +++++++++------- mail/mutt-devel/files/patch-mutt-ssl.c | 11 ------- 8 files changed, 52 insertions(+), 81 deletions(-) delete mode 100644 mail/mutt-devel/files/patch-buffy.c delete mode 100644 mail/mutt-devel/files/patch-mutt-ssl.c diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index d24f778..053dfb3 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -117,8 +117,7 @@ # PORTNAME= mutt-devel -PORTVERSION= 1.5.20 -PORTREVISION?= 7 +PORTVERSION= 1.5.21 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -446,7 +445,7 @@ post-patch:: .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} -MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 +MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 MAN5= muttrc.5 .if !defined(WITHOUT_MUTT_MAILBOX_MANPAGES) MAN5+= mbox.5 mmdf.5 diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo index d36b068..1f4b37d 100644 --- a/mail/mutt-devel/distinfo +++ b/mail/mutt-devel/distinfo @@ -1,24 +1,12 @@ -MD5 (mutt/mutt-1.5.20.tar.gz) = 027cdd9959203de0c3c64149a7ee351c -SHA256 (mutt/mutt-1.5.20.tar.gz) = 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796 -SIZE (mutt/mutt-1.5.20.tar.gz) = 3635047 -MD5 (mutt/patch-1.5.20.rr.compressed.gz) = 5e608027bda1fddc2bc38c03a560f0a9 -SHA256 (mutt/patch-1.5.20.rr.compressed.gz) = 87a7eed23ee234fcb3564e13bb034a3bfe858fb69677c7f8e7321446acf01034 -SIZE (mutt/patch-1.5.20.rr.compressed.gz) = 10190 -MD5 (mutt/patch-1.5.20.vvv.nntp.gz) = 80355166f8ae9bff064124f2d2e6870f -SHA256 (mutt/patch-1.5.20.vvv.nntp.gz) = ea199ed303519ed816bded493cc4fe2985b497ec29b1c1c201f1428b1354260b -SIZE (mutt/patch-1.5.20.vvv.nntp.gz) = 55449 -MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa -SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373 -SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545 -MD5 (mutt/patch-1.5.20.vvv.initials.gz) = c71ebc64f20f516f45168530d57f6c21 -SHA256 (mutt/patch-1.5.20.vvv.initials.gz) = fc2cf1dadfab02545116fc70855cfe14f4efd8e1a32b9a6c366fc5e09bdafd23 -SIZE (mutt/patch-1.5.20.vvv.initials.gz) = 690 -MD5 (mutt/patch-1.5.20.vvv.quote.gz) = 1d6213598d354942006f17b2c46720f2 -SHA256 (mutt/patch-1.5.20.vvv.quote.gz) = 7f3ea7999f00738c2dab0e67d69d76d354d14d0615c00784233e6d1149cb749d -SIZE (mutt/patch-1.5.20.vvv.quote.gz) = 1772 -MD5 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = ae70a6668e297bdc804b2673221b4727 -SHA256 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 12b9f41476850a5e2eed2334be9326e4905e8a6d786740689b6966a5d285070c -SIZE (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 6812 -MD5 (mutt/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0 -SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986 -SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526 +MD5 (mutt/mutt-1.5.21.tar.gz) = a29db8f1d51e2f10c070bf88e8a553fd +SHA256 (mutt/mutt-1.5.21.tar.gz) = 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0 +SIZE (mutt/mutt-1.5.21.tar.gz) = 3716886 +MD5 (mutt/patch-1.5.21.rr.compressed.gz) = 0632fd94c96b3e452144b730e3cf0fd3 +SHA256 (mutt/patch-1.5.21.rr.compressed.gz) = 5056b181222c4322667fd99a6314e80a4a8b4613357364d9deddef626136b4d9 +SIZE (mutt/patch-1.5.21.rr.compressed.gz) = 10133 +MD5 (mutt/patch-1.5.21.vvv.initials.gz) = 9444edd98d52e6f6a4fa17bcc3160a93 +SHA256 (mutt/patch-1.5.21.vvv.initials.gz) = ecce3643b04d1aced7085bca506896298bd56d991a5d1af057922c8358abf141 +SIZE (mutt/patch-1.5.21.vvv.initials.gz) = 691 +MD5 (mutt/patch-1.5.21.vvv.quote.gz) = 93185b8fdf8d12f13a7a65136204193c +SHA256 (mutt/patch-1.5.21.vvv.quote.gz) = b0613d305932b31eaf005ee0740558d46561a6d7a333c97a00d34a1d0c1ef843 +SIZE (mutt/patch-1.5.21.vvv.quote.gz) = 1280 diff --git a/mail/mutt-devel/files/extra-patch-doc-xml b/mail/mutt-devel/files/extra-patch-doc-xml index 6f74fb5..05be26e 100644 --- a/mail/mutt-devel/files/extra-patch-doc-xml +++ b/mail/mutt-devel/files/extra-patch-doc-xml @@ -4,8 +4,8 @@ all: ../makedoc$(EXEEXT) $(MAKE) makedoc-all --makedoc-all: mutt.1 muttrc.man -+makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt +-makedoc-all: mutt.1 smime_keys.1 muttrc.man ++makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-chunked manual.txt install-data-local: makedoc-all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02 index 572cd1a..fddbd30 100644 --- a/mail/mutt-devel/files/patch-02 +++ b/mail/mutt-devel/files/patch-02 @@ -1,15 +1,15 @@ ---- doc/Makefile.am.orig 2009-02-06 13:25:21.000000000 +0100 -+++ doc/Makefile.am 2009-02-06 13:27:06.000000000 +0100 -@@ -44,7 +44,7 @@ +--- doc/Makefile.am.orig 2010-09-16 10:51:42.000000000 +0400 ++++ doc/Makefile.am 2010-09-16 10:54:28.000000000 +0400 +@@ -47,7 +47,7 @@ all: makedoc-all --makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt -+makedoc-all: mutt.1 muttrc.man +-makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt ++makedoc-all: mutt.1 smime_keys.1 muttrc.man install-data-local: makedoc-all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 -@@ -66,9 +66,6 @@ +@@ -70,9 +70,6 @@ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ done -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) @@ -19,14 +19,14 @@ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \ mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \ -@@ -99,9 +96,7 @@ +@@ -103,9 +100,7 @@ check: manual.txt: manual.html -- -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \ +- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ - LC_ALL=C w3m -dump manual.html > $@ || \ - LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ -+ -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ ++ -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ Muttrc: stamp-doc-rc diff --git a/mail/mutt-devel/files/patch-buffy.c b/mail/mutt-devel/files/patch-buffy.c deleted file mode 100644 index 2fef09a..0000000 --- a/mail/mutt-devel/files/patch-buffy.c +++ /dev/null @@ -1,10 +0,0 @@ ---- buffy.c.orig 2009-06-02 19:16:26.000000000 +0200 -+++ buffy.c 2010-05-18 07:41:47.000000000 +0200 -@@ -236,7 +236,6 @@ - { - if(*tmp) - { -- FREE (&((*tmp)->path)); - tmp1=(*tmp)->next; - FREE (tmp); /* __FREE_CHECKED__ */ - *tmp=tmp1; diff --git a/mail/mutt-devel/files/patch-doc-manual.xml.head b/mail/mutt-devel/files/patch-doc-manual.xml.head index 7a2e76b..290de77 100644 --- a/mail/mutt-devel/files/patch-doc-manual.xml.head +++ b/mail/mutt-devel/files/patch-doc-manual.xml.head @@ -1,5 +1,5 @@ ---- doc/manual.xml.head.orig 2009-06-22 08:35:06.000000000 +0200 -+++ doc/manual.xml.head 2009-06-22 08:37:31.000000000 +0200 +--- doc/manual.xml.head.orig 2010-09-16 10:57:11.000000000 +0400 ++++ doc/manual.xml.head 2010-09-16 10:59:29.000000000 +0400 @@ -1,6 +1,6 @@ -@@ -7271,7 +7271,7 @@ - - The built-in SMTP support supports encryption (the smtps protocol - using SSL or TLS) as well as SMTP authentication using SASL. The authentication mechanisms --for SASL are specified in $smtp_authenticators -+for SASL are specified in $smtp_authenticators - defaulting to an empty list which makes Mutt try all available methods - from most-secure to least-secure. +@@ -7896,8 +7896,8 @@ + The built-in SMTP support supports encryption (the + smtps protocol using SSL or TLS) as well as SMTP + authentication using SASL. The authentication mechanisms for SASL are +-specified in $smtp_authenticators defaulting to ++specified in ++$smtp_authenticators defaulting to + an empty list which makes Mutt try all available methods from + most-secure to least-secure. diff --git a/mail/mutt-devel/files/patch-mktemp b/mail/mutt-devel/files/patch-mktemp index 4954640..d4c6622 100644 --- a/mail/mutt-devel/files/patch-mktemp +++ b/mail/mutt-devel/files/patch-mktemp @@ -1,15 +1,18 @@ ---- muttlib.c.orig 2009-02-06 13:39:51.000000000 +0100 -+++ muttlib.c 2009-02-06 13:42:35.000000000 +0100 -@@ -733,7 +733,11 @@ +--- muttlib.c.orig 2010-09-16 11:00:04.000000000 +0400 ++++ muttlib.c 2010-09-16 11:16:05.000000000 +0400 +@@ -781,11 +781,14 @@ - void _mutt_mktemp (char *s, const char *src, int line) + void _mutt_mktemp (char *s, size_t slen, const char *src, int line) { -- snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getuid(), (int) getpid (), Counter++); -+ char t[7]; -+ snprintf (t, 7, "-%05d", Counter++); -+ snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname)); -+ mktemp (s); -+ strncat(s, t, 6); +- size_t n = snprintf (s, slen, "%s/mutt-%s-%d-%d-%ld%ld", NONULL (Tempdir), NONULL (Hostname), ++ size_t n = snprintf (s, slen, "%s/mutt-%s-%d-%d-%ld%ld-XXXXXX", NONULL (Tempdir), NONULL (Hostname), + (int) getuid (), (int) getpid (), random (), random ()); + if (n >= slen) + dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n", + src, line, slen, n)); ++ if (mktemp(s) == NULL) ++ dprint (1, (debugfile, "%s:%d: ERROR: mktemp(%s) failed: %s\n", ++ src, line, s, strerror(errno))); dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); - unlink (s); - } + if (unlink (s) && errno != ENOENT) + dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno)); diff --git a/mail/mutt-devel/files/patch-mutt-ssl.c b/mail/mutt-devel/files/patch-mutt-ssl.c deleted file mode 100644 index 2b021a0..0000000 --- a/mail/mutt-devel/files/patch-mutt-ssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mutt_ssl.c.orig 2009-06-10 07:08:29.000000000 +0200 -+++ mutt_ssl.c 2010-05-03 10:45:21.000000000 +0200 -@@ -652,7 +652,7 @@ - char *buf = NULL; - int bufsize; - /* needed to get the DNS subjectAltNames: */ -- STACK *subj_alt_names; -+ STACK_OF(GENERAL_NAME) *subj_alt_names; - int subj_alt_names_count; - GENERAL_NAME *subj_alt_name; - /* did we find a name matching hostname? */ -- 1.7.2.3