1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

- Update to 1.5.17

PR:		117822
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com> (maintainer)
		rafan (zh-mutt maintainer)
This commit is contained in:
Martin Wilke 2007-12-13 01:26:10 +00:00
parent 51b0374d02
commit 2e1f858ad9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=203431
7 changed files with 93 additions and 83 deletions

View File

@ -1,30 +1,30 @@
MD5 (mutt/mutt-1.5.16.tar.gz) = 10eff7024dbb7ce1f773d688a69ea9db
SHA256 (mutt/mutt-1.5.16.tar.gz) = 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
SIZE (mutt/mutt-1.5.16.tar.gz) = 3534894
MD5 (mutt/patch-1.5.16.rr.compressed.2.gz) = 555677215aae09cb48cae2dcf7a41182
SHA256 (mutt/patch-1.5.16.rr.compressed.2.gz) = 64e119a50a6eb72ab6893ef8a1af8d196567116c123fbce7e0afc825c19aa65e
SIZE (mutt/patch-1.5.16.rr.compressed.2.gz) = 10117
MD5 (mutt/patch-1.5.16.vvv.nntp.3.gz) = 93a828111ce0b17d80ee9f6396708552
SHA256 (mutt/patch-1.5.16.vvv.nntp.3.gz) = fe71626d7a91f85e0434a866c7a1b31cbd6866d6d006c5214b7a39d834b5ac16
SIZE (mutt/patch-1.5.16.vvv.nntp.3.gz) = 55200
MD5 (mutt/mutt-1.5.17.tar.gz) = 49387458be0cb52b85ae0d73af699aae
SHA256 (mutt/mutt-1.5.17.tar.gz) = 17865b1a10e23ccf8757c05657c7d7f7055457f0a04eeacd9ee560eeb6defa81
SIZE (mutt/mutt-1.5.17.tar.gz) = 3572651
MD5 (mutt/patch-1.5.17.rr.compressed.gz) = 4f8edaa937d308d80f0f585b1c7fe47c
SHA256 (mutt/patch-1.5.17.rr.compressed.gz) = ffef4854a558264b6873517f4b4be8e3390eeacec03f2f5aef0cf5c2d43953ad
SIZE (mutt/patch-1.5.17.rr.compressed.gz) = 10124
MD5 (mutt/patch-1.5.17.vvv.nntp.gz) = 42945bbe500e8e016d6760a05fd2e8ed
SHA256 (mutt/patch-1.5.17.vvv.nntp.gz) = 2bc47e018a2188d429ddf6189de83a7a4c30d55f1131dfb09d667237787a09e3
SIZE (mutt/patch-1.5.17.vvv.nntp.gz) = 55463
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.16.vvv.initials.gz) = ff11da4b723127647c986cd027f7fdd2
SHA256 (mutt/patch-1.5.16.vvv.initials.gz) = c6788b1092c0ab4f8d28d5e570804bbedf880a4172452b8231da5bed65bb74de
SIZE (mutt/patch-1.5.16.vvv.initials.gz) = 679
MD5 (mutt/patch-1.5.16.vvv.quote.gz) = 41f8945f5114687974e2a86bcf415f27
SHA256 (mutt/patch-1.5.16.vvv.quote.gz) = b08db26c185693aefd0d398eef9cfd8a90a01d627dc5e2223cee2076d2ed0ef3
SIZE (mutt/patch-1.5.16.vvv.quote.gz) = 2036
MD5 (mutt/patch-1.5.17.vvv.initials.gz) = 08849d642e467bbd17eb7411ba63bf48
SHA256 (mutt/patch-1.5.17.vvv.initials.gz) = 6b1829032a8cfc527f7d1abc6f7a2af6c8fdb8cd080b03a96f94e72cc75ad29c
SIZE (mutt/patch-1.5.17.vvv.initials.gz) = 679
MD5 (mutt/patch-1.5.17.vvv.quote.gz) = d93d91a70d9c25ca917d56738dd57246
SHA256 (mutt/patch-1.5.17.vvv.quote.gz) = fc68dac081bea1b5a9d345c75e2861db2cdc00341fd17b6f0ccd454c02bc4767
SIZE (mutt/patch-1.5.17.vvv.quote.gz) = 2105
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
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/patch-1.5.16.sidebar.20070704.txt) = e6e1a6e258ec6ce6ee489b0f3ff8e2cf
SHA256 (mutt/patch-1.5.16.sidebar.20070704.txt) = 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
SIZE (mutt/patch-1.5.16.sidebar.20070704.txt) = 51103
MD5 (mutt/patch-1.5.17.sidebar.20071102.txt) = 93890c4a5bc1628018a701946a0c3ff5
SHA256 (mutt/patch-1.5.17.sidebar.20071102.txt) = 1d8dda9fed1e1592ff9004e2c776c2f4a84e4e75ca872542e8e07113516fc27b
SIZE (mutt/patch-1.5.17.sidebar.20071102.txt) = 50439
MD5 (mutt/zh-mutt-1.5.16-20060703.diff.gz) = 2731d422bf48c129626c792068bb2149
SHA256 (mutt/zh-mutt-1.5.16-20060703.diff.gz) = 302b7759030fea7c091dbd0ab81d0bfa2ce5a3b51637e3f6609453f6b2e8756d
SIZE (mutt/zh-mutt-1.5.16-20060703.diff.gz) = 4804

View File

@ -109,8 +109,8 @@
#
PORTNAME= mutt-devel
PORTVERSION= 1.5.16
PORTREVISION?= 3
PORTVERSION= 1.5.17
PORTREVISION?= 0
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@ -174,6 +174,7 @@ CD_PATCH_VERSION= 1.5.5.1
CD_IFDEF_PATCH_VERSION= 1.5.4
DW_PATCH_VERSION= 1.5.6
AC_PATCH_VERSION= 1.5.9
VC_PATCH_VERSION= 1.5.16
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}
.endif
@ -403,21 +404,21 @@ CONFIGURE_ARGS+= --disable-smtp
PATCH_DIST_STRIP= -p1
.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.2.gz:vvv
DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
CONFIGURE_ARGS+= --enable-compressed
XML_NEEDED= yes
pre-patch::
@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.2.gz > ${WRKDIR}/patch-compressed
@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
${WRKDIR}/patch-compressed
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
.endif
.if defined(WITH_MUTT_NNTP)
DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz:vvv
DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
CONFIGURE_ARGS+= --enable-nntp
XML_NEEDED= yes
pre-patch::
@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz > ${WRKDIR}/patch-nntp
@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
${WRKDIR}/patch-nntp
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
@ -440,7 +441,7 @@ pre-patch::
PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
.endif
.if defined(WITH_MUTT_SIDEBAR_PATCH)
SIDEBAR_PATCH= patch-1.5.16.sidebar.20070704.txt
SIDEBAR_PATCH= patch-1.5.17.sidebar.20071102.txt
DISTFILES+= ${SIDEBAR_PATCH}:tchan
XML_NEEDED= yes
pre-patch::

View File

@ -1,27 +1,27 @@
MD5 (mutt/mutt-1.5.16.tar.gz) = 10eff7024dbb7ce1f773d688a69ea9db
SHA256 (mutt/mutt-1.5.16.tar.gz) = 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
SIZE (mutt/mutt-1.5.16.tar.gz) = 3534894
MD5 (mutt/patch-1.5.16.rr.compressed.2.gz) = 555677215aae09cb48cae2dcf7a41182
SHA256 (mutt/patch-1.5.16.rr.compressed.2.gz) = 64e119a50a6eb72ab6893ef8a1af8d196567116c123fbce7e0afc825c19aa65e
SIZE (mutt/patch-1.5.16.rr.compressed.2.gz) = 10117
MD5 (mutt/patch-1.5.16.vvv.nntp.3.gz) = 93a828111ce0b17d80ee9f6396708552
SHA256 (mutt/patch-1.5.16.vvv.nntp.3.gz) = fe71626d7a91f85e0434a866c7a1b31cbd6866d6d006c5214b7a39d834b5ac16
SIZE (mutt/patch-1.5.16.vvv.nntp.3.gz) = 55200
MD5 (mutt/mutt-1.5.17.tar.gz) = 49387458be0cb52b85ae0d73af699aae
SHA256 (mutt/mutt-1.5.17.tar.gz) = 17865b1a10e23ccf8757c05657c7d7f7055457f0a04eeacd9ee560eeb6defa81
SIZE (mutt/mutt-1.5.17.tar.gz) = 3572651
MD5 (mutt/patch-1.5.17.rr.compressed.gz) = 4f8edaa937d308d80f0f585b1c7fe47c
SHA256 (mutt/patch-1.5.17.rr.compressed.gz) = ffef4854a558264b6873517f4b4be8e3390eeacec03f2f5aef0cf5c2d43953ad
SIZE (mutt/patch-1.5.17.rr.compressed.gz) = 10124
MD5 (mutt/patch-1.5.17.vvv.nntp.gz) = 42945bbe500e8e016d6760a05fd2e8ed
SHA256 (mutt/patch-1.5.17.vvv.nntp.gz) = 2bc47e018a2188d429ddf6189de83a7a4c30d55f1131dfb09d667237787a09e3
SIZE (mutt/patch-1.5.17.vvv.nntp.gz) = 55463
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.16.vvv.initials.gz) = ff11da4b723127647c986cd027f7fdd2
SHA256 (mutt/patch-1.5.16.vvv.initials.gz) = c6788b1092c0ab4f8d28d5e570804bbedf880a4172452b8231da5bed65bb74de
SIZE (mutt/patch-1.5.16.vvv.initials.gz) = 679
MD5 (mutt/patch-1.5.16.vvv.quote.gz) = 41f8945f5114687974e2a86bcf415f27
SHA256 (mutt/patch-1.5.16.vvv.quote.gz) = b08db26c185693aefd0d398eef9cfd8a90a01d627dc5e2223cee2076d2ed0ef3
SIZE (mutt/patch-1.5.16.vvv.quote.gz) = 2036
MD5 (mutt/patch-1.5.17.vvv.initials.gz) = 08849d642e467bbd17eb7411ba63bf48
SHA256 (mutt/patch-1.5.17.vvv.initials.gz) = 6b1829032a8cfc527f7d1abc6f7a2af6c8fdb8cd080b03a96f94e72cc75ad29c
SIZE (mutt/patch-1.5.17.vvv.initials.gz) = 679
MD5 (mutt/patch-1.5.17.vvv.quote.gz) = d93d91a70d9c25ca917d56738dd57246
SHA256 (mutt/patch-1.5.17.vvv.quote.gz) = fc68dac081bea1b5a9d345c75e2861db2cdc00341fd17b6f0ccd454c02bc4767
SIZE (mutt/patch-1.5.17.vvv.quote.gz) = 2105
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
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/patch-1.5.16.sidebar.20070704.txt) = e6e1a6e258ec6ce6ee489b0f3ff8e2cf
SHA256 (mutt/patch-1.5.16.sidebar.20070704.txt) = 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
SIZE (mutt/patch-1.5.16.sidebar.20070704.txt) = 51103
MD5 (mutt/patch-1.5.17.sidebar.20071102.txt) = 93890c4a5bc1628018a701946a0c3ff5
SHA256 (mutt/patch-1.5.17.sidebar.20071102.txt) = 1d8dda9fed1e1592ff9004e2c776c2f4a84e4e75ca872542e8e07113516fc27b
SIZE (mutt/patch-1.5.17.sidebar.20071102.txt) = 50439

View File

@ -1,10 +1,19 @@
--- doc/manual.xml.head.orig Mon Jul 17 15:23:46 2006
+++ doc/manual.xml.head Mon Jul 17 15:30:23 2006
--- doc/manual.xml.head.orig Sun Nov 4 13:58:04 2007
+++ doc/manual.xml.head Sun Nov 4 14:08:23 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
<book>
<bookinfo>
@@ -6160,7 +6160,7 @@
<para>
The built-in SMTP support supports encryption (the <literal>smtps</literal> protocol
using SSL or TLS) as well as SMTP authentication using SASL. The authentication mechanisms
-for SASL are specified in <link linkend="smtp-authenticators">&dollar;smtp&lowbar;authenticators</link>
+for SASL are specified in <literal>&dollar;smtp&lowbar;authenticators</literal>
defaulting to an empty list which makes mutt try all available methods
from most-secure to least-secure.
</para>

View File

@ -77,27 +77,45 @@
into your system's global Muttrc, which normally resides in /etc or
/usr/local/etc.
--- doc/manual.txt.orig Fri Feb 23 18:15:51 2007
+++ doc/manual.txt Wed Feb 28 14:30:48 2007
@@ -6219,8 +6219,8 @@
--- doc/manual.txt.orig Thu Nov 1 22:07:09 2007
+++ doc/manual.txt Sun Nov 4 13:55:21 2007
@@ -2617,9 +2617,10 @@
shows that arguments can be quoted: the script will receive the expanded string
between the single quotes as the only argument.
For examples on how to configure these formats for the various
versions of PGP which are floating around, see the pgp*.rc and gpg.rc
- files in the samples/ subdirectory which has been installed on your
- system alongside the documentation. (PGP only)
+ files in the share/examples/mutt/ subdirectory which has been installed
+ on your system alongside the documentation. (PGP only)
-A practical example is the mutt_xtitle script installed in the samples
-subdirectory of the mutt documentation: it can be used as filter for
-$status_format to set the current terminal's title, if supported.
+A practical example is the mutt_xtitle script installed in the
+share/examples/mutt/ subdirectory of the mutt documentation: it can be used as
+filter for $status_format to set the current terminal's title, if supported.
+
3.163. pgp_getkeys_command
Chapter 4. Advanced Usage
@@ -6418,8 +6418,8 @@
$$ssmmiimmee__ccaa__llooccaattiioonn" or "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
@@ -6957,9 +6958,9 @@
One or more key IDs.
For examples on how to configure these formats, see the smime.rc in
- the samples/ subdirectory which has been installed on your system
- alongside the documentation. (S/MIME only)
+ the share/examples/mutt/ subdirectory which has been installed on your
+ system alongside the documentation. (S/MIME only)
For examples on how to configure these formats for the various versions of PGP
-which are floating around, see the pgp*.rc and gpg.rc files in the samples/
-subdirectory which has been installed on your system alongside the
-documentation. (PGP only)
+which are floating around, see the pgp*.rc and gpg.rc files in the
+share/examples/mutt/ subdirectory which has been installed on your system
+alongside the documentation. (PGP only)
3.182. smime_verify_command
3.169. pgp_getkeys_command
@@ -7155,9 +7156,9 @@
or file, this expands to "-CApath $smime_ca_location" or "-CAfile
$smime_ca_location".
-For examples on how to configure these formats, see the smime.rc in the samples
-/ subdirectory which has been installed on your system alongside the
-documentation. (S/MIME only)
+For examples on how to configure these formats, see the smime.rc in the
+share/examples/mutt/ subdirectory which has been installed on your system
+alongside the documentation. (S/MIME only)
3.188. smime_verify_command

View File

@ -1,19 +0,0 @@
--- pop_auth.c.orig Thu Jul 17 19:42:53 2003
+++ pop_auth.c Thu Jul 17 19:46:01 2003
@@ -206,12 +206,12 @@
mutt_message _("Authenticating (APOP)...");
/* Compute the authentication hash to send to the server */
- MD5Init (&mdContext);
- MD5Update (&mdContext, (unsigned char *)pop_data->timestamp,
+ MD5_Init (&mdContext);
+ MD5_Update (&mdContext, (unsigned char *)pop_data->timestamp,
strlen (pop_data->timestamp));
- MD5Update (&mdContext, (unsigned char *)pop_data->conn->account.pass,
+ MD5_Update (&mdContext, (unsigned char *)pop_data->conn->account.pass,
strlen (pop_data->conn->account.pass));
- MD5Final (digest, &mdContext);
+ MD5_Final (digest, &mdContext);
for (i = 0; i < sizeof (digest); i++)
sprintf (hash + 2 * i, "%02x", digest[i]);

View File

@ -133,6 +133,7 @@ EOF
echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
echo "%%DOCSDIR%%/html/optionalfeatures.html" >> $tmp_first
echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
echo "%%DOCSDIR%%/html/tuning.html" >> $tmp_first
if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then