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

update to 1.2 and add sasl flavor; from William Yodlowsky

Browse Source
This commit is contained in:
naddy 2007-09-06 18:57:34 +00:00
parent e614ac1797
commit f661044863
10 changed files with 38 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mail/nmh/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.24 2005/01/02 12:56:05 alek Exp $
# $OpenBSD: Makefile,v 1.25 2007/09/06 18:57:34 naddy Exp $
COMMENT= "new MH mail handling program"
COMMENT= new MH mail handling program
DISTNAME= nmh-1.0.4
PKGNAME= ${DISTNAME}p1
DISTNAME= nmh-1.2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mhost.com/pub/nmh/
MASTER_SITES= http://download.savannah.nongnu.org/releases/nmh/
HOMEPAGE= http://www.nongnu.org/nmh/
PERMIT_PACKAGE_CDROM= Yes
@ -14,10 +13,23 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c termcap
CONFIGURE_STYLE= gnu dest old
SYSCONFDIR= ${PREFIX}/lib/nmh
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --libdir='$${exec_prefix}/libexec' \
--enable-nmh-pop \
--sysconfdir='$${${DESTDIRNAME}}${PREFIX}/lib/nmh'
--enable-apop \
--with-locking=fcntl
FLAVORS= sasl
FLAVOR?=
CONFIGURE_ENV+= ac_cv_header_db_h=no
USE_GMAKE= Yes
.if ${FLAVOR:L:Msasl}
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
CPPFLAGS+= -I${LOCALBASE}/include/sasl
CONFIGURE_ARGS+= --with-cyrus-sasl=${PREFIX}
.endif
NO_REGRESS= Yes

9
mail/nmh/distinfo
View File

@ -1,5 +1,4 @@
MD5 (nmh-1.0.4.tar.gz) = /Q3FyE9nz7zf3BGWpSmORw==
RMD160 (nmh-1.0.4.tar.gz) = MvCgy3qnb31+/FnZm25a7upRkDc=
SHA1 (nmh-1.0.4.tar.gz) = cUQaiE2JjbL9kYSpLmY2glNkJfU=
SHA256 (nmh-1.0.4.tar.gz) = go3pRh9fxt1w6rLbIPlXYfZjUeqRQlwNP9TpbL2jo1A=
SIZE (nmh-1.0.4.tar.gz) = 683215
MD5 (nmh-1.2.tar.gz) = aeebb9bef9ede7232f52c3a3b693eccc
RMD160 (nmh-1.2.tar.gz) = c1f79fae4708b21d6e9483bdbfa1d59cc6de8d97
SHA1 (nmh-1.2.tar.gz) = 4e02c07ace7e530095c3d29e6d074a285ed156c8
SIZE (nmh-1.2.tar.gz) = 851247

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

@ -1,14 +0,0 @@
$OpenBSD: patch-config_h_in,v 1.1 2002/09/30 00:29:02 pvalchev Exp $
--- config.h.in.orig Fri Mar 17 13:19:43 2000
+++ config.h.in Mon Sep 30 18:22:06 2002
@@ -23,8 +23,8 @@
* other programs which may modify your maildrops.
* Currently you can only use one type.
*/
-#define DOT_LOCKING 1
-/* #define FCNTL_LOCKING 1 */
+/* #define DOT_LOCKING 1 */
+#define FCNTL_LOCKING 1
/* #define LOCKF_LOCKING 1 */
/* #define FLOCK_LOCKING 1 */

28
mail/nmh/patches/patch-sbr_lock_file_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-sbr_lock_file_c,v 1.1 2002/09/30 00:29:02 pvalchev Exp $
--- sbr/lock_file.c.orig Sun Sep 12 07:50:12 1999
+++ sbr/lock_file.c Mon Sep 30 18:22:06 2002
@@ -463,16 +463,18 @@ lockname (char *file, struct lockinfo *l
else
snprintf (li->tmplock, sizeof(li->tmplock), "%.*s,LCK.XXXXXX",
cp - li->curlock, li->curlock);
-/*
- 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 */
}

30
mail/nmh/patches/patch-sbr_m_scratch_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-sbr_m_scratch_c,v 1.1 2002/09/30 00:29:02 pvalchev Exp $
--- sbr/m_scratch.c.orig Fri Jan 28 16:30:17 2000
+++ sbr/m_scratch.c Mon Sep 30 18:22:06 2002
@@ -15,16 +15,20 @@ m_scratch (char *file, char *template)
static char buffer[BUFSIZ], tmpfil[BUFSIZ];
snprintf (tmpfil, sizeof(tmpfil), "%sXXXXXX", template);
-/*
- 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));

28
mail/nmh/patches/patch-sbr_m_tmpfil_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-sbr_m_tmpfil_c,v 1.1 2002/09/30 00:29:02 pvalchev Exp $
--- sbr/m_tmpfil.c.orig Thu Sep 9 23:22:41 1999
+++ sbr/m_tmpfil.c Mon Sep 30 18:22:06 2002
@@ -14,15 +14,18 @@ m_tmpfil (char *template)
static char tmpfil[BUFSIZ];
snprintf (tmpfil, sizeof(tmpfil), "/tmp/%sXXXXXX", template);
-/*
- 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;
}

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

@ -1,16 +1,16 @@
$OpenBSD: patch-uip_Makefile_in,v 1.1 2002/09/30 00:48:42 pvalchev Exp $
--- uip/Makefile.in.orig Thu Jan 6 14:30:07 2000
+++ uip/Makefile.in Mon Sep 30 18:38:02 2002
@@ -273,11 +273,7 @@ install-misc:
$OpenBSD: patch-uip_Makefile_in,v 1.2 2007/09/06 18:57:34 naddy Exp $
--- uip/Makefile.in.orig Sun Nov 13 14:38:32 2005
+++ uip/Makefile.in Sun Aug 6 17:55:30 2006
@@ -281,11 +281,7 @@ install-misc:
# install commands with special installation needs (thus no $(SCMDS) use here)
install-scmds:
- if test x$(SETGID_MAIL) != x; then \
- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \
- else \
- $(INSTALL_PROGRAM) inc $(bindir)/$$cmd; \
- $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd; \
- fi
+ $(INSTALL_PROGRAM) inc $(bindir)/$$cmd; \
+ $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd; \
uninstall:
for cmd in $(CMDS); do \

22
mail/nmh/patches/patch-uip_mshcmds_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-uip_mshcmds_c,v 1.1 2002/09/30 00:29:02 pvalchev Exp $
--- uip/mshcmds.c.orig Fri Feb 4 13:28:24 2000
+++ uip/mshcmds.c Mon Sep 30 18:22:06 2002
@@ -935,16 +935,12 @@ forwcmd (char **args)
/* foil search of .mh_profile */
snprintf (buf, sizeof(buf), "%sXXXXXX", invo_name);
-/*
- 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-uip_spost_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-uip_spost_c,v 1.1 2002/09/30 00:29:02 pvalchev Exp $
--- uip/spost.c.orig Fri Feb 4 13:28:24 2000
+++ uip/spost.c Mon Sep 30 18:22:06 2002
@@ -727,8 +727,8 @@ make_bcc_file (void)
char *vec[6];
FILE * in, *out;
- mktemp (bccfil);
- if ((out = fopen (bccfil, "w")) == NULL)
+ fd = mkstemp (bccfil);
+ if ((fd == -1) || ((out = fdopen (fd, "w")) == NULL))
adios (bccfil, "unable to create");
chmod (bccfil, 0600);

13
mail/nmh/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2004/09/15 09:09:43 espie Exp $
@comment $OpenBSD: PLIST,v 1.8 2007/09/06 18:57:34 naddy Exp $
bin/ali
bin/anno
bin/burst
@ -10,6 +10,7 @@ bin/folder
bin/folders
bin/forw
bin/inc
bin/install-mh
bin/mark
bin/mhbuild
bin/mhlist
@ -35,7 +36,6 @@ bin/send
bin/sendfiles
bin/show
bin/sortm
bin/viamail
bin/whatnow
bin/whom
lib/nmh/
@ -65,12 +65,10 @@ lib/nmh/scan.size
lib/nmh/scan.time
lib/nmh/scan.timely
lib/nmh/scan.unseen
lib/nmh/tmac.h
libexec/ap
libexec/conflict
libexec/dp
libexec/fmtdump
libexec/install-mh
libexec/mhl
libexec/mhtest
libexec/post
@ -80,15 +78,19 @@ libexec/rcvstore
libexec/rcvtty
libexec/slocal
libexec/spost
libexec/viamail
@man man/man1/ali.1
@man man/man1/anno.1
@man man/man1/burst.1
@man man/man1/comp.1
@man man/man1/dist.1
@man man/man1/flist.1
@man man/man1/flists.1
@man man/man1/folder.1
@man man/man1/folders.1
@man man/man1/forw.1
@man man/man1/inc.1
@man man/man1/install-mh.1
@man man/man1/mark.1
@man man/man1/mh-chart.1
@man man/man1/mhbuild.1
@ -122,7 +124,6 @@ libexec/spost
@man man/man1/show.1
@man man/man1/slocal.1
@man man/man1/sortm.1
@man man/man1/vmh.1
@man man/man1/whatnow.1
@man man/man1/whom.1
@man man/man5/mh-alias.5
@ -133,10 +134,10 @@ libexec/spost
@man man/man5/mh-sequence.5
@man man/man5/mh-tailor.5
@man man/man5/mh_profile.5
@man man/man5/mts.conf.5
@man man/man8/ap.8
@man man/man8/conflict.8
@man man/man8/dp.8
@man man/man8/fmtdump.8
@man man/man8/install-mh.8
@man man/man8/mh-mts.8
@man man/man8/post.8