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

- Upgrade to 1.0.3 and fix the security problem.

Browse Source 
- Mark unbroken.
- Update the MASTER_SITES.
This commit is contained in:
kevlo 2000-03-08 05:11:35 +00:00
parent 273faf8cad
commit e6a3c04669
11 changed files with 97 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/nmh/Makefile
View File

@ -1,8 +1,6 @@
# $OpenBSD: Makefile,v 1.9 2000/03/01 16:16:27 turan Exp $
# $OpenBSD: Makefile,v 1.10 2000/03/08 05:11:35 kevlo Exp $
BROKEN= security problems. needs to be fixed.
DISTNAME= nmh-1.0
DISTNAME= nmh-1.0.3
CATEGORIES= mail
MAINTAINER= ports@openbsd.org
@ -13,7 +11,7 @@ PERMIT_PACKAGE_FTP= YES
PERMIT_DISTFILES_CDROM= YES
PERMIT_DISTFILES_FTP= YES
MASTER_SITES= ftp://ftp.math.gatech.edu/pub/nmh/
MASTER_SITES= ftp://ftp.math.gatech.edu/pub/nmh/
SYSCONFDIR= ${PREFIX}/lib/nmh
GNU_CONFIGURE= yes

6
mail/nmh/files/md5
View File

@ -1,3 +1,3 @@
SHA1 (nmh-1.0.tar.gz) = 7f3373f21b856c1360a905907f032482e83984bd
RMD160 (nmh-1.0.tar.gz) = a920603c7ae59c74927a918236ac766bfe76a95c
MD5 (nmh-1.0.tar.gz) = 712f93d485ab77a7b28e5abaa7341034
MD5 (nmh-1.0.3.tar.gz) = 02519bf8f7ff8590ecfbee9f9500ea07
RMD160 (nmh-1.0.3.tar.gz) = fec8a14da9e2541a1f6c3e2cccf7a8301aa387bb
SHA1 (nmh-1.0.3.tar.gz) = 49e9920e4a1e8cd4de22e5b9cff1fe3eb2738ee2

19
mail/nmh/patches/patch-aa
View File

@ -1,19 +1,6 @@
--- ./config.h.in.orig Sat Mar 20 15:30:51 1999
+++ ./config.h.in Sat Mar 20 15:32:37 1999
@@ -37,9 +37,9 @@
* OpenBSD 2.x
* BSD/OS 2.x
*/
-/* #define BIND 1 */
-/* #define BSD42 1 */
-/* #define BSD44 1 */
+#define BIND 1
+#define BSD42 1
+#define BSD44 1
/*
* SCO 4.x
@@ -72,8 +72,8 @@
--- config.h.in.~1~ Sun Feb 6 04:40:21 2000
+++ config.h.in Tue Feb 29 19:06:41 2000
@@ -23,8 +23,8 @@
* other programs which may modify your maildrops.
* Currently you can only use one type.
*/

37
mail/nmh/patches/patch-ab
View File

@ -1,18 +1,29 @@
--- ./sbr/m_scratch.c.orig Sat Mar 20 15:33:22 1999
+++ ./sbr/m_scratch.c Sat Mar 20 16:17:33 1999
@@ -13,9 +13,14 @@
{
char *cp;
--- sbr/m_scratch.c.orig Sat Jan 29 10:52:43 2000
+++ sbr/m_scratch.c Tue Feb 29 17:58:33 2000
@@ -15,16 +15,20 @@
static char buffer[BUFSIZ], tmpfil[BUFSIZ];
+ int fd;
snprintf (tmpfil, sizeof(tmpfil), "%sXXXXXX", template);
- mktemp (tmpfil);
+ fd = mkstemp (tmpfil);
+ if (fd == -1)
+ return 0;
+ close (fd);
+ unlink (tmpfil);
-/*
- Mkstemp work postponed until later -Doug
#ifdef HAVE_MKSTEMP
- mkstemp (tmpfil);
+ {
+ int fd;
+
+ fd = mkstemp (tmpfil);
+ if (fd == -1)
+ return 0;
+ close (fd);
+ unlink (tmpfil);
+ }
#else
-*/
mktemp (tmpfil);
-/*
#endif
-*/
+
/* nasty - this really means: if there is no '/' in the path */
if ((cp = r1bindex (file, '/')) == file)
strncpy (buffer, tmpfil, sizeof(buffer));
else

35
mail/nmh/patches/patch-ac
View File

@ -1,18 +1,27 @@
--- ./sbr/m_tmpfil.c.orig Thu Jul 9 13:52:24 1998
+++ ./sbr/m_tmpfil.c Sat Mar 20 17:09:20 1999
@@ -12,9 +12,14 @@
m_tmpfil (char *template)
{
--- sbr/m_tmpfil.c.orig Thu Sep 9 22:22:41 1999
+++ sbr/m_tmpfil.c Tue Feb 29 18:06:52 2000
@@ -14,15 +14,18 @@
static char tmpfil[BUFSIZ];
+ int fd;
snprintf (tmpfil, sizeof(tmpfil), "/tmp/%sXXXXXX", template);
- unlink(mktemp(tmpfil));
+ fd = mkstemp (tmpfil);
+ if (fd == -1)
+ return 0;
+ close (fd);
+ unlink (tmpfil);
-/*
- Mkstemp work postponed until later -Doug
#ifdef HAVE_MKSTEMP
- unlink(mkstemp(tmpfil));
+ {
+ int fd;
+
+ fd = mkstemp (tmpfil);
+ if (fd == -1)
+ return 0;
+ close (fd);
+ unlink (tmpfil);
+ }
#else
-*/
unlink(mktemp(tmpfil));
-/*
#endif
-*/
return tmpfil;
}

17
mail/nmh/patches/patch-ad
View File

@ -1,12 +1,21 @@
--- ./uip/mshcmds.c.orig Sat Mar 20 15:41:58 1999
+++ ./uip/mshcmds.c Sat Mar 20 15:42:22 1999
@@ -932,7 +932,8 @@
--- uip/mshcmds.c.orig Sun Feb 6 04:40:55 2000
+++ uip/mshcmds.c Tue Feb 29 18:08:49 2000
@@ -935,16 +935,12 @@
/* foil search of .mh_profile */
snprintf (buf, sizeof(buf), "%sXXXXXX", invo_name);
- vec[0] = (char *)mktemp (buf);
-/*
- Mkstemp work postponed until later -Doug
#ifdef HAVE_MKSTEMP
- vec[0] = (char *)mkstemp (buf);
+ close (mkstemp (buf));
+ vec[0] = buf;
#else
-*/
vec[0] = (char *)mktemp (buf);
-/*
#endif
-*/
vec[vecp++] = "-file";
vec[vecp] = NULL;
if (!msgp)

14
mail/nmh/patches/patch-ae
View File

@ -1,14 +0,0 @@
--- ./uip/rcvtty.c.orig Sat Mar 20 15:43:23 1999
+++ ./uip/rcvtty.c Sat Mar 20 15:44:27 1999
@@ -189,8 +189,9 @@
char tmpfil[BUFSIZ];
struct stat st;
- unlink (mktemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
- if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
+ strcpy (tmpfil, "/tmp/rcvttyXXXXX");
+ fd = mkstemp (tmpfil);
+ if (fd == -1)
return header_fd ();
unlink (tmpfil);

17
mail/nmh/patches/patch-af
View File

@ -1,17 +1,6 @@
--- ./uip/spost.c.orig Sat Mar 20 15:45:06 1999
+++ ./uip/spost.c Sat Mar 20 16:45:37 1999
@@ -339,8 +339,8 @@
out = stdout;
}
else {
- mktemp (tmpfil);
- if ((out = fopen (tmpfil, "w")) == NULL)
+ int fd = mkstemp (tmpfil);
+ if ((fd == -1) || ((out = fdopen (fd, "w")) == NULL))
adios (tmpfil, "unable to create");
chmod (tmpfil, 0600);
}
@@ -700,8 +700,8 @@
--- uip/spost.c.orig Sun Feb 6 04:41:00 2000
+++ uip/spost.c Tue Feb 29 17:52:41 2000
@@ -727,8 +727,8 @@
char *vec[6];
FILE * in, *out;

40
mail/nmh/patches/patch-ag
View File

@ -1,23 +1,27 @@
--- ./sbr/lock_file.c.orig Sat Mar 20 15:55:07 1999
+++ ./sbr/lock_file.c Sat Mar 20 16:00:47 1999
@@ -401,7 +401,7 @@
static void
lockname (char *file, struct lockinfo *li, int isnewlock)
{
- int bplen, tmplen;
+ int bplen, tmplen, lockfd;
char *bp, *cp;
#if 0
@@ -452,7 +452,10 @@
--- sbr/lock_file.c.orig Sun Sep 12 06:50:12 1999
+++ sbr/lock_file.c Tue Feb 29 18:11:50 2000
@@ -463,16 +463,18 @@
else
snprintf (li->tmplock, sizeof(li->tmplock), "%.*s,LCK.XXXXXX",
cp - li->curlock, li->curlock);
- mktemp (li->tmplock);
+ lockfd = mkstemp (li->tmplock);
+ if (lockfd == -1)
+ return -1;
+ close (lockfd);
-/*
- Mkstemp work postponed until later -Doug
#ifdef HAVE_MKSTEMP
- mkstemp (li->tmplock);
+ {
+ int lockfd;
+
+ lockfd = mkstemp (li->tmplock);
+ if (lockfd == -1)
+ return;
+ close (lockfd);
+ }
#else
-*/
mktemp (li->tmplock);
-/*
#endif
-*/
unlink (li->tmplock); /* remove any stray */
}
}

21
mail/nmh/patches/patch-ah
View File

@ -1,21 +0,0 @@
--- ./mts/smtp/smtp.c.orig Sat Mar 20 16:02:43 1999
+++ ./mts/smtp/smtp.c Sat Mar 20 16:11:46 1999
@@ -244,12 +244,16 @@
for (ap = arguments; *ap; ap++)
if (**ap == '/') {
char *dp;
+ int fd;
if ((dp = strrchr(*ap, '/')) && *++dp == NULL)
*--dp = NULL;
snprintf (sm_tmpfil, sizeof(sm_tmpfil), "%s/smtpXXXXXX", *ap);
- mktemp (sm_tmpfil);
-
+ fd = mkstemp (sm_tmpfil);
+ if (fd == -1)
+ return NOTOK;
+ close (fd);
+ unlink (sm_tmpfil);
if ((sd = creat (sm_tmpfil, 0600)) != NOTOK) {
sm_ispool = 1;
break;

6
mail/nmh/pkg/PLIST
View File

@ -16,7 +16,6 @@ bin/mhparam
bin/mhpath
bin/mhshow
bin/mhstore
bin/mhtest
bin/msgchk
bin/msh
bin/packf
@ -28,6 +27,7 @@ bin/rmf
bin/rmm
bin/scan
bin/send
bin/sendfiles
bin/show
bin/sortm
bin/viamail
@ -55,6 +55,7 @@ lib/nmh/digestcomps
lib/nmh/distcomps
lib/nmh/forwcomps
lib/nmh/rcvdistcomps
lib/nmh/rcvdistcomps.outbox
lib/nmh/replcomps
lib/nmh/replgroupcomps
lib/nmh/MailAliases
@ -67,6 +68,7 @@ libexec/dp
libexec/fmtdump
libexec/install-mh
libexec/mhl
libexec/mhtest
libexec/post
libexec/rcvdist
libexec/rcvpack
@ -74,7 +76,6 @@ libexec/rcvstore
libexec/rcvtty
libexec/slocal
libexec/spost
libexec/sendfiles
man/man1/ali.1
man/man1/anno.1
man/man1/burst.1
@ -127,6 +128,7 @@ man/man5/mh-mail.5
man/man5/mh-profile.5
man/man5/mh-sequence.5
man/man5/mh-tailor.5
man/man5/mh_profile.5
man/man8/ap.8
man/man8/conflict.8
man/man8/dp.8