cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- bug-fix and SECURITY update to 1.5.20; fixes CVE-2009-1390 (X.509

Browse Source 
Certificate Chain Security Bypass vulnerability).

- added a couple of post-1.5.20 patches from upstream for regressions

- cleanup the port's handling of sample config files

testing by Simon Kuhnle, Edd Barrett, testing and ok landry@.
This commit is contained in:
sthen 2009-06-16 09:37:19 +00:00
parent ede46f770e
commit 7a418f67c2
14 changed files with 115 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mail/mutt/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.30 2009/04/20 07:43:21 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.31 2009/06/16 09:37:19 sthen Exp $
CATEGORIES= mail
@ -11,6 +11,7 @@ MASTER_SITES_MUTT= ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/
MASTER_SITES1= http://lunar-linux.org/~tchan/mutt/
MASTER_SITES2= http://spacehopper.org/mutt/
DIST_SUBDIR= mutt
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
@ -39,8 +40,8 @@ CONFIGURE_ARGS+=--enable-external_dotlock \
--sysconfdir=${CONFDIR} \
--with-docdir="${PREFIX}/share/doc/mutt" \
--with-gss \
--with-sharedir="${PREFIX}/share/mutt" \
--with-ssl \
--with-ssl
FAKE_FLAGS= sysconfdir="${PREFIX}/share/examples/mutt"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
@ -56,12 +57,13 @@ WANTLIB+= ncurses
.endif
# compressed folder support
DIST_COMPRESSED?= patch-${VERSION}.rr.compressed.1.gz:0
.if ${FLAVOR:L:Mcompressed}
PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0
PATCHFILES+= ${DIST_COMPRESSED}
PATCH_DIST_STRIP= -p1
CONFIGURE_ARGS+= --enable-compressed
.else
SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0
SUPDISTFILES+= ${DIST_COMPRESSED}
.endif
.if ${FLAVOR:L:Mmixmaster}
@ -90,11 +92,6 @@ SUBST_VARS= CONFDIR
MUTTRCDIR?=
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mutt
${INSTALL_DATA} ${WRKSRC}/${MUTTRCDIR}Muttrc \
${PREFIX}/share/examples/mutt/Muttrc.sample
${INSTALL_DATA} ${WRKDIST}/mime.types \
${PREFIX}/share/examples/mutt/mime.types.sample
@mv -f ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt
@perl -pi -e "s,/etc/Muttrc,${CONFDIR}/Muttrc," ${PREFIX}/man/man1/mutt.1
@perl -pi -e "s,/etc/mime.types,${CONFDIR}/mime.types," ${PREFIX}/man/man1/mutt.1

14
mail/mutt/snapshot/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.52 2009/05/22 15:21:25 sthen Exp $
# $OpenBSD: Makefile,v 1.53 2009/06/16 09:37:19 sthen Exp $
COMMENT= tty-based e-mail client, development version
VERSION= 1.5.19
VERSION= 1.5.20
DISTNAME= mutt-${VERSION}
PKGNAME= mutt-${VERSION}p0
MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
WANTLIB= z
@ -12,6 +11,8 @@ WANTLIB= z
FLAVORS= idn sasl sidebar
FLAVOR?=
# should be 2.63
AUTOCONF_VERSION= 2.62
CONFIGURE_ARGS= --enable-hcache \
--enable-smtp \
--without-gdbm
@ -25,11 +26,14 @@ LIB_DEPENDS+= sasl2::security/cyrus-sasl2
MUTTRCDIR= doc/
DIST_COMPRESSED=compressed-1.5.20.diff.gz:2
DIST_SIDEBAR= sidebar-1.5.20.diff.gz:2
.if ${FLAVOR:L:Msidebar}
PATCHFILES+= patch-${VERSION}.sidebar.20090522.txt:1
PATCHFILES+= ${DIST_SIDEBAR}
PATCH_DIST_STRIP= -p1
.else
SUPDISTFILES+= patch-${VERSION}.sidebar.20090522.txt:1
SUPDISTFILES+= ${DIST_SIDEBAR}
.endif
.include <bsd.port.mk>

30
mail/mutt/snapshot/distinfo
View File

@ -1,15 +1,15 @@
MD5 (mutt/mutt-1.5.19.tar.gz) = c7N0e8f3yAWSHo0k66xpPw==
MD5 (mutt/patch-1.5.19.rr.compressed.1.gz) = fk6KVHdj0hc1GEbzFZkBng==
MD5 (mutt/patch-1.5.19.sidebar.20090522.txt) = vTXhcQGOyybU6wp0Ohoidw==
RMD160 (mutt/mutt-1.5.19.tar.gz) = 3LjQJ1k7/M1i63q6M4AHvOPH4i4=
RMD160 (mutt/patch-1.5.19.rr.compressed.1.gz) = uOtSAf3nURN35ViJU8Bx0LfjDI0=
RMD160 (mutt/patch-1.5.19.sidebar.20090522.txt) = EWRR1ZqnRmRPJp+MAoSENgyE40I=
SHA1 (mutt/mutt-1.5.19.tar.gz) = luTMHhQZuoFvzBnXclWXjmLCB5M=
SHA1 (mutt/patch-1.5.19.rr.compressed.1.gz) = xjkjCl/ayW1aTnNeMgr2bkveaIo=
SHA1 (mutt/patch-1.5.19.sidebar.20090522.txt) = BWw5RlfHjgVJCdz94GkgB86jP+M=
SHA256 (mutt/mutt-1.5.19.tar.gz) = sWC67fJnakwsGlx0BJ4sY/APzP9D7iWUNnCHoIv9Y8g=
SHA256 (mutt/patch-1.5.19.rr.compressed.1.gz) = t7Tur+bHrlxqGKj2e3DafCxLKXvUqvN1wZm8XMKYXIw=
SHA256 (mutt/patch-1.5.19.sidebar.20090522.txt) = ZLIoKqyIozdLtIqaB7Y3REP+PI9ZBd75rDzcJtn4NVo=
SIZE (mutt/mutt-1.5.19.tar.gz) = 3558746
SIZE (mutt/patch-1.5.19.rr.compressed.1.gz) = 10562
SIZE (mutt/patch-1.5.19.sidebar.20090522.txt) = 52307
MD5 (mutt/compressed-1.5.20.diff.gz) = 4xSjIY/dvydz3LExkxoN4g==
MD5 (mutt/mutt-1.5.20.tar.gz) = AnzdmVkgPeDDxkFJp+41HA==
MD5 (mutt/sidebar-1.5.20.diff.gz) = muZJPx4h6wLWmr1NFdrPsA==
RMD160 (mutt/compressed-1.5.20.diff.gz) = RgaMsDPxgKJTawFQzzm9En/Z1bI=
RMD160 (mutt/mutt-1.5.20.tar.gz) = 31gveTZLn9cKAAHnahGdj3gnXrs=
RMD160 (mutt/sidebar-1.5.20.diff.gz) = jjILlQtLTKeWs5zmg3wngTftsWA=
SHA1 (mutt/compressed-1.5.20.diff.gz) = KhlFfvfP1GA6azseUzAebFHjsnc=
SHA1 (mutt/mutt-1.5.20.tar.gz) = 0r7Hozdx8SjKSbFyOwa20kijXTE=
SHA1 (mutt/sidebar-1.5.20.diff.gz) = kyH1cb8C3sO407wONyrKTtJB/Ps=
SHA256 (mutt/compressed-1.5.20.diff.gz) = 6WGic/h6jKRGWGgc+tdTwkxlAjajcZksWvk9elzjpo8=
SHA256 (mutt/mutt-1.5.20.tar.gz) = lXn8B510/1yJIj/wnfQC705Qi6jKklxJ50qgnAKpp5Y=
SHA256 (mutt/sidebar-1.5.20.diff.gz) = iALUvsxKFzfmlVoURvLd1zyB9DVfLCKBLnFL/GIettQ=
SIZE (mutt/compressed-1.5.20.diff.gz) = 368893
SIZE (mutt/mutt-1.5.20.tar.gz) = 3635047
SIZE (mutt/sidebar-1.5.20.diff.gz) = 544721

10
mail/mutt/snapshot/patches/patch-browser_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-browser_c,v 1.5 2007/11/11 10:09:43 sthen Exp $
--- browser.c.orig Wed Sep 5 19:28:05 2007
+++ browser.c Fri Nov 2 08:17:06 2007
$OpenBSD: patch-browser_c,v 1.6 2009/06/16 09:37:19 sthen Exp $
--- browser.c.orig Thu Jun 11 18:52:54 2009
+++ browser.c Mon Jun 15 21:06:08 2009
@@ -27,6 +27,7 @@
#include "buffy.h"
#include "mapping.h"
@ -39,9 +39,9 @@ $OpenBSD: patch-browser_c,v 1.5 2007/11/11 10:09:43 sthen Exp $
add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
}
closedir (dp);
@@ -464,6 +481,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
@@ -479,6 +496,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
mutt_pretty_mailbox (buffer);
mutt_pretty_mailbox (buffer, sizeof (buffer));
+ check_maildir_times (tmp, &s);
add_folder (menu, state, buffer, &s, tmp->new);

8
mail/mutt/snapshot/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2008/05/21 13:46:19 sthen Exp $
--- configure.ac.orig Thu Apr 17 23:22:08 2008
+++ configure.ac Sat May 17 22:34:14 2008
@@ -537,7 +537,7 @@ docdir=$mutt_cv_docdir
$OpenBSD: patch-configure_ac,v 1.4 2009/06/16 09:37:19 sthen Exp $
--- configure.ac.orig Tue Jun 9 07:50:33 2009
+++ configure.ac Mon Jun 15 21:06:12 2009
@@ -546,7 +546,7 @@ docdir=$mutt_cv_docdir
AC_SUBST(docdir)
if test x$mutt_cv_setgid = xyes; then

10
mail/mutt/snapshot/patches/patch-doc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.8 2008/05/21 13:46:19 sthen Exp $
--- doc/Makefile.in.orig Sun Apr 20 04:08:50 2008
+++ doc/Makefile.in Sat May 17 22:54:18 2008
@@ -491,7 +491,7 @@ uninstall-am: uninstall-info-am uninstall-local
$OpenBSD: patch-doc_Makefile_in,v 1.9 2009/06/16 09:37:19 sthen Exp $
--- doc/Makefile.in.orig Tue Jun 9 07:50:43 2009
+++ doc/Makefile.in Mon Jun 15 21:06:12 2009
@@ -517,7 +517,7 @@ uninstall-am: uninstall-local
all: makedoc-all
@ -10,7 +10,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.8 2008/05/21 13:46:19 sthen Exp $
install-data-local: makedoc-all instdoc
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
@@ -592,8 +592,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-
@@ -627,8 +627,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-
muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
$(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m | \

15
mail/mutt/snapshot/patches/patch-handler_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-handler_c,v 1.1 2009/06/16 09:37:19 sthen Exp $
unbreak header weeding for message/rfc822 parts, mutt bug #3265
--- handler.c.orig Mon Jun 15 21:08:41 2009
+++ handler.c Mon Jun 15 21:08:57 2009
@@ -1090,7 +1090,7 @@ static int message_handler (BODY *a, STATE *s)
mutt_copy_hdr (s->fpin, s->fpout, off_start, b->parts->offset,
(((s->flags & M_WEED) || ((s->flags & (M_DISPLAY|M_PRINTING)) && option (OPTWEED))) ? (CH_WEED | CH_REORDER) : 0) |
(s->prefix ? CH_PREFIX : 0) | CH_DECODE | CH_FROM |
- (s->flags & M_DISPLAY) ? CH_DISPLAY : 0, s->prefix);
+ ((s->flags & M_DISPLAY) ? CH_DISPLAY : 0), s->prefix);
if (s->prefix)
state_puts (s->prefix, s);

8
mail/mutt/snapshot/patches/patch-imap_browse_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-imap_browse_c,v 1.4 2008/05/21 13:46:19 sthen Exp $
--- imap/browse.c.orig Sat May 17 19:52:24 2008
+++ imap/browse.c Sat May 17 22:34:14 2008
@@ -318,7 +318,9 @@ int imap_mailbox_rename(const char* mailbox)
$OpenBSD: patch-imap_browse_c,v 1.5 2009/06/16 09:37:19 sthen Exp $
--- imap/browse.c.orig Tue Jan 20 04:36:13 2009
+++ imap/browse.c Mon Jun 15 21:06:09 2009
@@ -322,7 +322,9 @@ int imap_mailbox_rename(const char* mailbox)
}
snprintf(buf, sizeof (buf), _("Rename mailbox %s to: "), mx.mbox);

24
mail/mutt/snapshot/patches/patch-imap_imap_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-imap_imap_c,v 1.1 2009/06/16 09:37:19 sthen Exp $
fix segfault in imap_synx_mailbox; mutt bug #3226
--- imap/imap.c.orig Mon Jun 15 21:11:05 2009
+++ imap/imap.c Mon Jun 15 21:11:58 2009
@@ -1178,7 +1178,7 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int*
return rc;
/* if we are expunging anyway, we can do deleted messages very quickly... */
- if (expunge && mutt_bit_isset (ctx->rights, M_ACL_DELETE))
+ if (expunge && mutt_bit_isset (idata->ctx->rights, M_ACL_DELETE))
{
if ((rc = imap_exec_msgset (idata, "UID STORE", "+FLAGS.SILENT (\\Deleted)",
M_DELETED, 1, 0)) < 0)
@@ -1293,7 +1293,7 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int*
ctx->changed = 0;
/* We must send an EXPUNGE command if we're not closing. */
- if (expunge && !(ctx->closing) &&
+ if (expunge && !(idata->ctx->closing) &&
mutt_bit_isset(ctx->rights, M_ACL_DELETE))
{
mutt_message _("Expunging messages from server...");

16
mail/mutt/snapshot/patches/patch-url_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-url_c,v 1.1 2009/06/16 09:37:19 sthen Exp $
don't parse URL port as signed short, but to int and cast to
unsigned short; mutt bug #3264
--- url.c.orig Mon Jun 15 21:04:14 2009
+++ url.c Mon Jun 15 21:04:26 2009
@@ -144,7 +144,7 @@ static char *ciss_parse_userhost (ciss_url_t *ciss, ch
if ((p = strchr (t, ':')))
{
*p++ = '\0';
- if (mutt_atos (p, (short*) &ciss->port) < 0)
+ if (mutt_atoi (p, &t) < 0 || t < 0 || t > 0xffff)
return NULL;
}
else

9
mail/mutt/snapshot/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2009/04/20 07:43:21 sthen Exp $
@comment $OpenBSD: PLIST,v 1.19 2009/06/16 09:37:19 sthen Exp $
@pkgpath mail/mutt/snapshot,hcache
bin/flea
@bin bin/mutt
@ -40,12 +40,14 @@ share/doc/mutt/optionalfeatures.html
share/doc/mutt/patch-notes.txt
share/doc/mutt/reference.html
share/doc/mutt/samples/
share/doc/mutt/security.html
share/doc/mutt/smime-notes.txt
share/doc/mutt/tuning.html
share/examples/mutt/
@sample ${CONFDIR}/
share/examples/mutt/Mush.rc
share/examples/mutt/Muttrc.sample
@comment share/examples/mutt/Muttrc
share/examples/mutt/Muttrc.dist
@sample ${CONFDIR}/Muttrc
share/examples/mutt/Pine.rc
share/examples/mutt/Tin.rc
@ -72,7 +74,8 @@ share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
share/examples/mutt/iconv/iconv.solaris-2.6.rc
share/examples/mutt/iconv/iconv.solaris-2.7.rc
share/examples/mutt/mime.types.sample
@comment share/examples/mutt/mime.types
share/examples/mutt/mime.types.dist
@sample ${CONFDIR}/mime.types
share/examples/mutt/mutt_xtitle
share/examples/mutt/pgp2.rc

4
mail/mutt/stable/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.36 2009/04/20 07:43:21 sthen Exp $
# $OpenBSD: Makefile,v 1.37 2009/06/16 09:37:19 sthen Exp $
COMMENT= tty-based e-mail client
VERSION= 1.4.2.3
DISTNAME= mutt-${VERSION}
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
MASTER_SITES= ${MASTER_SITES_MUTT}
.include <bsd.port.mk>

12
mail/mutt/stable/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.4 2007/06/15 19:01:07 kili Exp $
--- Makefile.in.orig Sun May 27 03:00:00 2007
+++ Makefile.in Mon May 28 19:10:48 2007
@@ -906,7 +906,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local
+install-data-am: Muttrc
install-exec-am: install-binPROGRAMS install-binSCRIPTS \
install-exec-local

6
mail/mutt/stable/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2009/04/20 07:43:21 sthen Exp $
@comment $OpenBSD: PLIST,v 1.10 2009/06/16 09:37:19 sthen Exp $
bin/flea
@bin bin/mutt
@bin bin/mutt_dotlock
@ -39,7 +39,7 @@ share/doc/mutt/patch-notes.txt
share/doc/mutt/samples/
share/examples/mutt/
share/examples/mutt/Mush.rc
share/examples/mutt/Muttrc.sample
share/examples/mutt/Muttrc
@sample ${CONFDIR}/Muttrc
share/examples/mutt/Pine.rc
share/examples/mutt/Tin.rc
@ -63,7 +63,7 @@ share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
share/examples/mutt/iconv/iconv.solaris-2.6.rc
share/examples/mutt/iconv/iconv.solaris-2.7.rc
share/examples/mutt/mime.types.sample
share/examples/mutt/mime.types
@sample ${CONFDIR}/mime.types
share/examples/mutt/pgp2.rc
share/examples/mutt/pgp5.rc