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

update to 0.95.1i plus fix securty hole in rfc1524.c

Browse Source
This commit is contained in:
turan 1999-01-12 05:07:16 +00:00
parent b29a4bf277
commit 8dbb6c4d21
5 changed files with 54 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mail/mutt/Makefile
View File

@ -1,47 +1,35 @@
# $OpenBSD: Makefile,v 1.7 1999/01/11 02:40:05 marc Exp $
#
# What port/package will be created
#
DISTNAME= mutt-0.95.1
DISTFILES= ${DISTNAME}i${EXTRACT_SUFX}
# $OpenBSD: Makefile,v 1.8 1999/01/12 05:07:16 turan Exp $
DISTNAME= mutt-0.95.1i
CATEGORIES= mail
WRKSRC= ${WRKDIR}/mutt-0.95.1
MIRROR_DISTFILE= no
#MIRROR_DISTFILE= no
# where to send bitches about this port
#
MAINTAINER= turans@umich.edu
MAINTAINER= turan@cvs.openbsd.org
# where the source files and patches can be fetched
#
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
ftp://ftp.gbnet.net/pub/mutt-international/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/
# build/configuration variables
#
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-pop \
--enable-imap \
--enable-flock \
--disable-fcntl \
--with-slang=${PREFIX} \
--with-docdir=${PREFIX}/share/doc/mutt \
--sysconfdir=/etc
CONFIGURE_ARGS= --prefix=/usr/local \
--with-slang=/usr/local \
--with-docdir=/usr/local/share/doc/mutt \
--with-sharedir=/usr/local/share/mutt \
LIB_DEPENDS= slang.1.22:${PORTSDIR}/devel/libslang
.if !defined(NO_WARNINGS)
pre-fetch:
@${ECHO}
@${ECHO} This software contains cryptography enabling code. It is
@${ECHO} illegal to export outside of the United States. The
@${ECHO} download site is set to Germany. Once you bring it into
@${ECHO} the US, it may not leave again.
@${ECHO}
@${ECHO} '**********************************************************'
@${ECHO} '* This software contains cryptography enabling code. It *'
@${ECHO} '* is illegal to export outside of the United States. *'
@${ECHO} '**********************************************************'
@${ECHO}
.endif

34
mail/mutt/patches/patch-aa
View File

@ -1,23 +1,11 @@
--- Makefile.am.orig Sat Dec 12 03:25:59 1998
+++ Makefile.am Sat Jan 2 20:02:09 1999
@@ -74,18 +74,8 @@
install-data-local:
$(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- -if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
- mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
- elif [ -f $(DESTDIR)$(sharedir)/../Muttrc ] ; then \
- mv $(DESTDIR)$(sharedir)/../Muttrc $(DESTDIR)$(sysconfdir) ; \
- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
- $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
- fi
- -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
- fi
-
+ $(INSTALL_DATA) $(srcdir)/Muttrc $(DESTDIR)$(sharedir)/Muttrc.sample
+ $(INSTALL_DATA) $(srcdir)/mime.types $(DESTDIR)$(sharedir)/mime.types.sample
# Don't make this one ChangeLog - it's intended to be
# used manually.
--- init.h.orig Fri Jun 26 06:31:22 1998
+++ init.h Sat Nov 7 05:52:34 1998
@@ -141,7 +141,7 @@
{ "mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, 0 },
{ "mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, 0 },
{ "mime_fwd", DT_SYN, R_NONE, UL "mime_forward", 0 },
- { "move", DT_QUAD, R_NONE, OPT_MOVE, M_ASKNO },
+ { "move", DT_QUAD, R_NONE, OPT_MOVE, M_NO },
{ "message_format", DT_STR, R_NONE, UL &MsgFmt, UL "%s" },
{ "msg_format", DT_SYN, R_NONE, UL "message_format", 0 },
{ "pager", DT_PATH, R_NONE, UL &Pager, UL "builtin" },

42
mail/mutt/patches/patch-ab
View File

@ -1,22 +1,20 @@
--- Makefile.in.orig Sat Jan 2 20:05:12 1999
+++ Makefile.in Sat Jan 2 20:08:59 1999
@@ -651,17 +651,8 @@
install-data-local:
$(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- -if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
- mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
- elif [ -f $(DESTDIR)$(sharedir)/../Muttrc ] ; then \
- mv $(DESTDIR)$(sharedir)/../Muttrc $(DESTDIR)$(sysconfdir) ; \
- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
- $(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
- fi
- -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
- fi
+ $(INSTALL_DATA) $(srcdir)/Muttrc $(DESTDIR)$(sharedir)/Muttrc.sample
+ $(INSTALL_DATA) $(srcdir)/mime.types $(DESTDIR)$(sharedir)/mime.types.sample
# Don't make this one ChangeLog - it's intended to be
# used manually.
--- rfc1524.c.orig Sat Dec 12 03:07:15 1998
+++ rfc1524.c Mon Jan 11 22:08:58 1999
@@ -436,7 +436,7 @@
if (s[0] == '\0')
{
snprintf (s, l, "%s/muttXXXXXX", buf);
- mktemp (s);
+ if (mkstemp (s) == -1) mutt_error("Can not open temporary file\n");
}
else
{
@@ -447,7 +447,7 @@
if ((period = strrchr (tmp, '.')) != NULL)
*period = 0;
snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
- mktemp (s);
+ if (mkstemp (s) == -1) mutt_error("Can not open temporary file\n");
if (period != NULL)
{
*period = '.';

2
mail/mutt/pkg/DESCR
View File

@ -16,5 +16,5 @@ Other features include:
Port maintained by:
Christopher Turan
turans@umich.edu
turan@cvs.openbsd.org

10
mail/mutt/pkg/PLIST
View File

@ -1,9 +1,11 @@
@cwd /usr/local
@name mutt-0.95
@name mutt-0.95.1i
@pkgdep libslang-1.2.2
bin/mutt
man/man1/mutt.1
man/man1/mutt_dotlock.1
etc/Muttrc
etc/mime.types
share/doc/mutt/manual.txt
share/doc/mutt/PGP-Notes.txt
share/doc/mutt/applying-patches.txt
@ -21,8 +23,7 @@ share/locale/it/LC_MESSAGES/mutt.mo
share/locale/es/LC_MESSAGES/mutt.mo
share/locale/uk/LC_MESSAGES/mutt.mo
share/locale/fr/LC_MESSAGES/mutt.mo
share/mutt/Muttrc.sample
share/mutt/mime.types.sample
share/locale/pl/LC_MESSAGES/mutt.mo
share/mutt/charsets/ansi-x3-110-1983
share/mutt/charsets/ansi-x3-4-1968
share/mutt/charsets/asmo-449
@ -185,6 +186,7 @@ share/mutt/charsets/charsets.alias.dist
share/mutt/charsets/charsets.alias
@dirrm share/mutt/charsets
@dirrm share/mutt
@dirrm share/locale/pl/LC_MESSAGES
@dirrm share/locale/fr/LC_MESSAGES
@dirrm share/locale/uk/LC_MESSAGES
@dirrm share/locale/uk
@ -192,4 +194,6 @@ share/mutt/charsets/charsets.alias
@dirrm share/locale/it/LC_MESSAGES
@dirrm share/locale/ru/LC_MESSAGES
@dirrm share/locale/de/LC_MESSAGES
@dirrm share/locale
@dirrm share/doc/mutt
@dirrm etc