diff --git a/mail/mutt/stable/Makefile b/mail/mutt/stable/Makefile index 1657d62d793..3d68db5f308 100644 --- a/mail/mutt/stable/Makefile +++ b/mail/mutt/stable/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2002/01/23 19:41:29 fgsch Exp $ +# $OpenBSD: Makefile,v 1.9 2002/06/14 17:43:51 fgsch Exp $ COMMENT= "tty-based e-mail client" -VERSION= 1.2.5.1 -DISTNAME= mutt-${VERSION} +VERSION= 1.4 +DISTNAME= mutt-${VERSION}i CATEGORIES= mail NEED_VERSION= 1.500 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ @@ -27,6 +27,11 @@ PERMIT_DISTFILES_FTP= Yes FLAVORS= slang mixmaster compressed FLAVOR?= +# XXX workaround sparc64 gcc optimization bug +.if ${MACHINE_ARCH:Msparc64} +PATCH_LIST= gcc-* patch-* +.endif + SYSCONFDIR= /etc/mutt CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \ @@ -51,7 +56,7 @@ CONFIGURE_ARGS+= --with-curses PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0 PATCH_DIST_STRIP=-p1 CONFIGURE_ARGS+= --enable-compressed -.else +#.else SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0 .endif @@ -77,5 +82,6 @@ post-install: ${PREFIX}/share/examples/mutt/Muttrc.sample ${INSTALL_DATA} ${WRKSRC}/mime.types \ ${PREFIX}/share/examples/mutt/mime.types.sample + mv ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt .include diff --git a/mail/mutt/stable/distinfo b/mail/mutt/stable/distinfo index c9d6ae9daeb..c2cc0d9ff0f 100644 --- a/mail/mutt/stable/distinfo +++ b/mail/mutt/stable/distinfo @@ -1,6 +1,6 @@ -MD5 (mutt-1.2.5.1.tar.gz) = 2ede4b04ad0a4c8ecdbaa322f416a8c6 -MD5 (patch-1.2.5.1.rr.compressed.1.gz) = 2bb00d62cc7740624c45b01878d24bc7 -RMD160 (mutt-1.2.5.1.tar.gz) = fc2f6f586ea150aa0460f8b00d2e2cd4c8a2c56e -RMD160 (patch-1.2.5.1.rr.compressed.1.gz) = 593d2cf2f7e20c841be0c444310ac6f26b7f81bc -SHA1 (mutt-1.2.5.1.tar.gz) = f9f3350ef0235b3cd3a9545e0e47b3d093202eb1 -SHA1 (patch-1.2.5.1.rr.compressed.1.gz) = d2ee32793a106c1959b12826568b66fd0a7fde3a +MD5 (mutt-1.4i.tar.gz) = a67bcdf1a1cd53d61ccd3ebf3993ba59 +MD5 (patch-1.4.rr.compressed.1.gz) = 57b241046d0c0bbfe6a4fe7e3ba5f0ec +RMD160 (mutt-1.4i.tar.gz) = 278767ff507c6473b6d45944b761ffe7dfb8c34d +RMD160 (patch-1.4.rr.compressed.1.gz) = 95f04ddb881121fc02daa36e87fdfb6b82aa10ff +SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955 +SHA1 (patch-1.4.rr.compressed.1.gz) = d8c169b53006be682e43f211bacac442931bc712 diff --git a/mail/mutt/stable/patches/gcc-patch-Makefile_in b/mail/mutt/stable/patches/gcc-patch-Makefile_in new file mode 100644 index 00000000000..a96f3228f64 --- /dev/null +++ b/mail/mutt/stable/patches/gcc-patch-Makefile_in @@ -0,0 +1,13 @@ +$OpenBSD: gcc-patch-Makefile_in,v 1.1 2002/06/14 17:43:51 fgsch Exp $ +--- Makefile.in.orig Mon Jun 10 15:48:23 2002 ++++ Makefile.in Mon Jun 10 15:49:05 2002 +@@ -294,6 +294,9 @@ uninstall-binPROGRAMS: + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + ++sha1.o: ++ $(COMPILE) -O0 -c $< ++ + .c.o: + $(COMPILE) -c $< + diff --git a/mail/mutt/stable/patches/patch-Makefile.in b/mail/mutt/stable/patches/patch-Makefile_in similarity index 63% rename from mail/mutt/stable/patches/patch-Makefile.in rename to mail/mutt/stable/patches/patch-Makefile_in index 3bb38e53c7d..2c59c2abc41 100644 --- a/mail/mutt/stable/patches/patch-Makefile.in +++ b/mail/mutt/stable/patches/patch-Makefile_in @@ -1,6 +1,7 @@ ---- Makefile.in.orig Thu Jul 27 17:55:01 2000 -+++ Makefile.in Thu Jul 27 17:59:45 2000 -@@ -211,7 +211,7 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2002/06/14 17:43:51 fgsch Exp $ +--- Makefile.in.orig Wed May 29 06:31:04 2002 ++++ Makefile.in Mon Jun 10 15:47:14 2002 +@@ -217,7 +217,7 @@ DIST_SUBDIRS = m4 po intl doc contrib i SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS) diff --git a/mail/mutt/stable/patches/patch-browser_c b/mail/mutt/stable/patches/patch-browser_c index 28563425dd3..e594e5d996c 100644 --- a/mail/mutt/stable/patches/patch-browser_c +++ b/mail/mutt/stable/patches/patch-browser_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-browser_c,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ ---- browser.c.orig Mon Jul 10 06:32:54 2000 -+++ browser.c Fri May 25 08:55:40 2001 +$OpenBSD: patch-browser_c,v 1.2 2002/06/14 17:43:51 fgsch Exp $ +--- browser.c.orig Tue Mar 19 06:54:00 2002 ++++ browser.c Mon Jun 10 15:47:14 2002 @@ -22,6 +22,7 @@ #include "buffy.h" #include "mapping.h" @@ -9,7 +9,7 @@ $OpenBSD: patch-browser_c,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ #include "mailbox.h" #include "browser.h" #ifdef USE_IMAP -@@ -350,6 +351,21 @@ static void init_state (struct browser_s +@@ -344,6 +345,21 @@ static void init_state (struct browser_s menu->data = state->entry; } @@ -29,9 +29,9 @@ $OpenBSD: patch-browser_c,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ +} + static int examine_directory (MUTTMENU *menu, struct browser_state *state, - const char *d, const char *prefix) + char *d, const char *prefix) { -@@ -402,6 +418,7 @@ static int examine_directory (MUTTMENU * +@@ -407,6 +423,7 @@ static int examine_directory (MUTTMENU * tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; @@ -39,7 +39,7 @@ $OpenBSD: patch-browser_c,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0); } closedir (dp); -@@ -440,6 +457,7 @@ static int examine_mailboxes (MUTTMENU * +@@ -452,6 +469,7 @@ static int examine_mailboxes (MUTTMENU * strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); mutt_pretty_mailbox (buffer); diff --git a/mail/mutt/stable/patches/patch-configure b/mail/mutt/stable/patches/patch-configure index e2181dd94e1..55fc68495da 100644 --- a/mail/mutt/stable/patches/patch-configure +++ b/mail/mutt/stable/patches/patch-configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ ---- configure.orig Thu Jul 6 19:07:35 2000 -+++ configure Sat Jul 22 13:22:30 2000 -@@ -3819,7 +3819,7 @@ +$OpenBSD: patch-configure,v 1.2 2002/06/14 17:43:51 fgsch Exp $ +--- configure.orig Wed May 29 06:31:03 2002 ++++ configure Mon Jun 10 15:47:15 2002 +@@ -4677,7 +4677,7 @@ docdir=$mutt_cv_docdir if test x$mutt_cv_setgid = xyes; then -- DOTLOCK_GROUP='mail' -+ DOTLOCK_GROUP='wheel' - DOTLOCK_PERMISSION=2755 +- DOTLOCK_GROUP='mail' ++ DOTLOCK_GROUP='wheel' + DOTLOCK_PERMISSION=2755 else - DOTLOCK_GROUP='' + DOTLOCK_GROUP='' diff --git a/mail/mutt/stable/patches/patch-doc-Makefile.in b/mail/mutt/stable/patches/patch-doc-Makefile.in deleted file mode 100644 index 81cd536cd16..00000000000 --- a/mail/mutt/stable/patches/patch-doc-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-doc-Makefile.in,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ ---- doc/Makefile.in.orig Wed Mar 29 06:42:49 2000 -+++ doc/Makefile.in Wed Jun 28 19:53:15 2000 -@@ -58,7 +58,7 @@ - topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ - README NEWS TODO README.SECURITY README.SSL README.UPGRADE - --all: muttrc.man try-html try-txt -+all: muttrc.man - - try-html: ../makedoc - test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ diff --git a/mail/mutt/stable/patches/patch-doc_Makefile_in b/mail/mutt/stable/patches/patch-doc_Makefile_in new file mode 100644 index 00000000000..f1761b32317 --- /dev/null +++ b/mail/mutt/stable/patches/patch-doc_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-doc_Makefile_in,v 1.1 2002/06/14 17:43:51 fgsch Exp $ +--- doc/Makefile.in.orig Tue Nov 6 16:12:31 2001 ++++ doc/Makefile.in Mon Jun 10 15:47:15 2002 +@@ -60,7 +60,7 @@ srcdir_DOCFILES = PGP-Notes.txt applying + topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ + README NEWS TODO README.SECURITY README.SSL + +-all: muttrc.man try-html try-txt ++all: muttrc.man + + try-html: ../makedoc + test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ diff --git a/mail/mutt/stable/patches/patch-mbox_c b/mail/mutt/stable/patches/patch-mbox_c index 50adcc9868a..1daec04c9c2 100644 --- a/mail/mutt/stable/patches/patch-mbox_c +++ b/mail/mutt/stable/patches/patch-mbox_c @@ -1,6 +1,7 @@ ---- mbox.c.orig Wed Jun 21 07:52:20 2000 -+++ mbox.c Thu Jul 27 15:24:33 2000 -@@ -285,7 +285,7 @@ +$OpenBSD: patch-mbox_c,v 1.2 2002/06/14 17:43:51 fgsch Exp $ +--- mbox.c.orig Thu Feb 28 04:58:47 2002 ++++ mbox.c Mon Jun 10 15:47:15 2002 +@@ -288,7 +288,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1)) mutt_message (_("Reading %s... %d (%d%%)"), ctx->path, count, @@ -9,7 +10,7 @@ if (ctx->msgcount == ctx->hdrmax) mx_alloc_memory (ctx); -@@ -791,7 +791,7 @@ +@@ -796,7 +796,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int j++; if (!ctx->quiet && WriteInc && ((i % WriteInc) == 0 || j == 1)) mutt_message (_("Writing messages... %d (%d%%)"), i, diff --git a/mail/mutt/stable/pkg/PLIST b/mail/mutt/stable/pkg/PLIST index 0b2f0561dd6..5411ccf2236 100644 --- a/mail/mutt/stable/pkg/PLIST +++ b/mail/mutt/stable/pkg/PLIST @@ -1,11 +1,15 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ +@comment $OpenBSD: PLIST,v 1.2 2002/06/14 17:43:51 fgsch Exp $ +bin/flea bin/mutt bin/mutt_dotlock bin/muttbug bin/pgpewrap bin/pgpring +man/man1/flea.1 man/man1/mutt.1 man/man1/mutt_dotlock.1 +man/man1/muttbug.1 +man/man5/mbox.5 man/man5/muttrc.5 share/doc/mutt/COPYRIGHT share/doc/mutt/ChangeLog @@ -16,11 +20,9 @@ share/doc/mutt/PGP-Notes.txt share/doc/mutt/README share/doc/mutt/README.SECURITY share/doc/mutt/README.SSL -share/doc/mutt/README.UPGRADE share/doc/mutt/TODO share/doc/mutt/applying-patches.txt share/doc/mutt/devel-notes.txt -share/doc/mutt/manual.txt share/doc/mutt/html/manual-1.html share/doc/mutt/html/manual-2.html share/doc/mutt/html/manual-3.html @@ -29,38 +31,66 @@ share/doc/mutt/html/manual-5.html share/doc/mutt/html/manual-6.html share/doc/mutt/html/manual-7.html share/doc/mutt/html/manual.html -share/doc/mutt/samples/Mush.rc -share/doc/mutt/samples/Pine.rc -share/doc/mutt/samples/Tin.rc -share/doc/mutt/samples/gpg.rc -share/doc/mutt/samples/pgp2.rc -share/doc/mutt/samples/pgp5.rc -share/doc/mutt/samples/pgp6.rc -share/doc/mutt/samples/sample.mailcap -share/doc/mutt/samples/sample.muttrc -share/doc/mutt/samples/sample.muttrc-tlr +share/doc/mutt/manual.txt +share/doc/mutt/patch-notes.txt +share/examples/mutt/Mush.rc share/examples/mutt/Muttrc.sample +share/examples/mutt/Pine.rc +share/examples/mutt/Tin.rc +share/examples/mutt/gpg.rc +share/examples/mutt/iconv/iconv.aix-3.2.5.rc +share/examples/mutt/iconv/iconv.aix-4.1.5.rc +share/examples/mutt/iconv/iconv.aix-4.2.0.rc +share/examples/mutt/iconv/iconv.aix-4.3.2.rc +share/examples/mutt/iconv/iconv.freebsd-3.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.3.rc +share/examples/mutt/iconv/iconv.glibc-2.1.90.rc +share/examples/mutt/iconv/iconv.hpux-10.01.rc +share/examples/mutt/iconv/iconv.hpux-10.20.rc +share/examples/mutt/iconv/iconv.hpux-11.00.rc +share/examples/mutt/iconv/iconv.irix-6.5.rc +share/examples/mutt/iconv/iconv.osf1-4.0a.rc +share/examples/mutt/iconv/iconv.osf1-4.0d.rc +share/examples/mutt/iconv/iconv.solaris-2.4.rc +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/pgp2.rc +share/examples/mutt/pgp5.rc +share/examples/mutt/pgp6.rc +share/examples/mutt/sample.mailcap +share/examples/mutt/sample.muttrc +share/examples/mutt/sample.muttrc-tlr +share/locale/ca/LC_MESSAGES/mutt.mo share/locale/cs/LC_MESSAGES/mutt.mo share/locale/da/LC_MESSAGES/mutt.mo share/locale/de/LC_MESSAGES/mutt.mo share/locale/el/LC_MESSAGES/mutt.mo share/locale/eo/LC_MESSAGES/mutt.mo share/locale/es/LC_MESSAGES/mutt.mo +share/locale/et/LC_MESSAGES/mutt.mo share/locale/fr/LC_MESSAGES/mutt.mo share/locale/gl/LC_MESSAGES/mutt.mo +share/locale/hu/LC_MESSAGES/mutt.mo share/locale/id/LC_MESSAGES/mutt.mo share/locale/it/LC_MESSAGES/mutt.mo +share/locale/ja/LC_MESSAGES/mutt.mo share/locale/ko/LC_MESSAGES/mutt.mo +share/locale/lt/LC_MESSAGES/mutt.mo share/locale/nl/LC_MESSAGES/mutt.mo share/locale/pl/LC_MESSAGES/mutt.mo share/locale/pt_BR/LC_MESSAGES/mutt.mo share/locale/ru/LC_MESSAGES/mutt.mo share/locale/sk/LC_MESSAGES/mutt.mo share/locale/sv/LC_MESSAGES/mutt.mo +share/locale/tr/LC_MESSAGES/mutt.mo share/locale/uk/LC_MESSAGES/mutt.mo -share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo +share/locale/zh_CN/LC_MESSAGES/mutt.mo +share/locale/zh_TW/LC_MESSAGES/mutt.mo +@dirrm share/examples/mutt/iconv +@dirrm share/examples/mutt @dirrm share/doc/mutt/samples @dirrm share/doc/mutt/html @dirrm share/doc/mutt -@dirrm share/examples/mutt diff --git a/mail/mutt/stable/pkg/SECURITY b/mail/mutt/stable/pkg/SECURITY index 6f3cd64ef6b..9ed01b3dd83 100644 --- a/mail/mutt/stable/pkg/SECURITY +++ b/mail/mutt/stable/pkg/SECURITY @@ -1,19 +1,9 @@ -$OpenBSD: SECURITY,v 1.1.1.1 2001/08/20 19:47:33 lebel Exp $ +$OpenBSD: SECURITY,v 1.2 2002/06/14 17:43:51 fgsch Exp $ -Note: in ${WRKDIR}/rfc1524.c the function mutt_adv_mktemp -uses mktemp, but the resulting name is used much later in +Note: in ${WRKDIR}/muttlib.c the function mutt_adv_mktemp +uses mktemp(3), but the resulting name is used much later in a procedure that does an open with O_CREAT | O_EXCL. If the open fails an error is reported and the user can try again. If the open succeeds the fd is used in fdopen to get a FILE. -No security hole that I saw. -If the mktemp is replaced with mkstemp the open will fail as -the named file will exist. In order to use mkstemp the interface -to several functions will have to change so the fd returned by -mkstemp is eventually passed to the function that currently does -the open. - -Remember s/mktemp/mkstemp/g does NOT work as the two functions have -different semantics. - -${WRKDIR}/rfc1524.c: two calls to mktemp. -turan +This use is actually correct.