mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
- Update to new release 8.11.3
- filters has been removed, will reappear in a seperate port - install additional headers and libs for SENDMAIL_WITH_MILTER=yes - pkh-commed reduced to make portlint happy Reviewed by: gshapiro
This commit is contained in:
parent
3050542564
commit
be24244bf1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=39468
32 changed files with 232 additions and 448 deletions
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= sendmail
|
PORTNAME= sendmail
|
||||||
PORTVERSION= 8.11.2
|
PORTVERSION= 8.11.3
|
||||||
CATEGORIES= mail ipv6
|
CATEGORIES= mail ipv6
|
||||||
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
||||||
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
||||||
|
@ -61,8 +61,7 @@ MAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
|
||||||
pre-install:
|
pre-install:
|
||||||
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
@${ECHO} "libexec/sample" >>${PLIST}
|
@${CAT} ${FILESDIR}/pkg-milter >${PLIST}
|
||||||
@${ECHO} "libexec/vbsfilter-1.3" >>${PLIST}
|
|
||||||
.endif
|
.endif
|
||||||
.if !defined(NOPORTDOCS)
|
.if !defined(NOPORTDOCS)
|
||||||
@cd ${WRKSRC} && find cf -type f | \
|
@cd ${WRKSRC} && find cf -type f | \
|
||||||
|
@ -72,11 +71,30 @@ pre-install:
|
||||||
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
post-configure:
|
||||||
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
|
post-build:
|
||||||
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
|
.endif
|
||||||
|
|
||||||
# We want mail.local and rmail for our system.
|
# We want mail.local and rmail for our system.
|
||||||
# the build install catmans only, we have to fix this.
|
# the build install catmans only, we have to fix this.
|
||||||
post-install:
|
post-install:
|
||||||
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
||||||
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
${MKDIR} ${PREFIX}/include/libmilter
|
||||||
|
${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
|
||||||
|
${PREFIX}/include/libmilter/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsmutil/libsmutil.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
.endif
|
||||||
.for i in ${MAN8}
|
.for i in ${MAN8}
|
||||||
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
||||||
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
||||||
|
@ -94,10 +112,6 @@ post-install:
|
||||||
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
||||||
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
||||||
.endif
|
.endif
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/sample ${PREFIX}/libexec
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-1.3 ${PREFIX}/libexec
|
|
||||||
.endif
|
|
||||||
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
||||||
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
||||||
|
|
||||||
|
@ -112,26 +126,11 @@ mailer.conf:
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
MASTER_SITES+= http://aeschi.ch.eu.org/milter/
|
|
||||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} vbsfilter-1.3.c
|
|
||||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
|
||||||
|
|
||||||
post-extract:
|
|
||||||
@${CP} ${_DISTDIR}vbsfilter-1.3.c ${WRKSRC}
|
|
||||||
@${SED} -e '1,184d' -e '417,419d' ${WRKSRC}/libmilter/README \
|
|
||||||
> ${WRKSRC}/sample.c
|
|
||||||
|
|
||||||
post-patch:
|
|
||||||
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/vbsfilter-1.3.c.patch
|
|
||||||
|
|
||||||
post-configure:
|
post-configure:
|
||||||
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
post-build:
|
post-build:
|
||||||
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
( cd ${WRKSRC} && \
|
|
||||||
${MAKE} -f ${FILESDIR}/Makefile.milter SENDMAIL_SOURCE=${WRKSRC} \
|
|
||||||
SENDMAIL_OBJECT=${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A` )
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c
|
MD5 (sendmail.8.11.3.tar.gz) = 77fa841497507b59f388bf59f0e14592
|
||||||
MD5 (vbsfilter-1.3.c) = da70a84416927d0ba0a0c4e69cc4532e
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
# Generic Makefile for libmilter filters
|
|
||||||
CC = gcc -Wall
|
|
||||||
|
|
||||||
# point this at your sendmail source tree
|
|
||||||
# SENDMAIL_SOURCE = /usr/local/src/sendmail-8.11.1
|
|
||||||
|
|
||||||
IFLAGS+= -I$(SENDMAIL_SOURCE)/sendmail -I$(SENDMAIL_SOURCE)/include
|
|
||||||
FLAGS+= -pthread
|
|
||||||
LDFLAGS+= -L$(SENDMAIL_OBJECT)/libmilter -L$(SENDMAIL_OBJECT)/libsmutil
|
|
||||||
LIBS+= -lmilter -lsmutil
|
|
||||||
|
|
||||||
TARGETS?= sample vbsfilter-1.3
|
|
||||||
|
|
||||||
all: $(TARGETS)
|
|
||||||
|
|
||||||
.for i in ${TARGETS}
|
|
||||||
${i}:
|
|
||||||
$(CC) $(IFLAGS) $(LDFLAGS) -o ${i} ${i}.c $(LIBS) $(FLAGS)
|
|
||||||
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(TARGETS)
|
|
||||||
|
|
||||||
install:
|
|
||||||
$(INSTALL) -c $(TARGETS) $(DEST)
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4
|
||||||
# forth in the LICENSE file which can be found at the top level of
|
# forth in the LICENSE file which can be found at the top level of
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
@ -27,7 +27,7 @@ diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
-#
|
-#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
divert(0)
|
divert(0)
|
||||||
|
@ -43,7 +43,7 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
|
||||||
#
|
#
|
||||||
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+#
|
+#
|
||||||
|
|
||||||
usewhoami=0
|
usewhoami=0
|
||||||
|
@ -64,7 +64,7 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
@ -112,18 +112,18 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
getservbyname(3),
|
getservbyname(3),
|
||||||
comsat(8),
|
comsat(8),
|
||||||
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
--- mail.local/mail.local.c Fri Sep 22 18:30:09 2000
|
--- mail.local/mail.local.c Sun Feb 11 21:08:20 2001
|
||||||
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Nov 6 11:23:42 2000
|
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Mar 5 21:48:22 2001
|
||||||
@@ -22,6 +22,8 @@
|
@@ -22,6 +22,8 @@
|
||||||
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.37 2000/09/22 00:49:10 doug Exp $";
|
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.57 2001/02/11 20:08:20 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
** This is not intended to work on System V derived systems
|
** This is not intended to work on System V derived systems
|
||||||
** such as Solaris or HP-UX, since they use a totally different
|
** such as Solaris or HP-UX, since they use a totally different
|
||||||
@@ -170,7 +172,7 @@
|
@@ -154,7 +156,7 @@
|
||||||
|
|
||||||
# if defined(BSD4_4) || defined(__GLIBC__)
|
# if defined(BSD4_4) || defined(__GLIBC__)
|
||||||
# include <paths.h>
|
# include <paths.h>
|
||||||
|
@ -132,7 +132,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
||||||
|
|
||||||
# ifdef BSD4_4
|
# ifdef BSD4_4
|
||||||
@@ -229,7 +231,7 @@
|
@@ -215,7 +217,7 @@
|
||||||
# endif /* USE_SETRESUID */
|
# endif /* USE_SETRESUID */
|
||||||
|
|
||||||
# ifndef _PATH_LOCTMP
|
# ifndef _PATH_LOCTMP
|
||||||
|
@ -141,16 +141,16 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* ! _PATH_LOCTMP */
|
# endif /* ! _PATH_LOCTMP */
|
||||||
# ifndef _PATH_MAILDIR
|
# ifndef _PATH_MAILDIR
|
||||||
# define _PATH_MAILDIR "/var/spool/mail"
|
# define _PATH_MAILDIR "/var/spool/mail"
|
||||||
@@ -264,6 +266,8 @@
|
@@ -252,6 +254,8 @@
|
||||||
int ExitVal = EX_OK; /* sysexits.h error value. */
|
bool HoldErrs = FALSE; /* Hold errors in ErrBuf */
|
||||||
bool LMTPMode = FALSE;
|
bool LMTPMode = FALSE;
|
||||||
bool bouncequota = FALSE; /* permanent error when over quota */
|
bool BounceQuota = FALSE; /* permanent error when over quota */
|
||||||
+bool nobiff = FALSE;
|
+bool nobiff = FALSE;
|
||||||
+bool nofsync = FALSE;
|
+bool nofsync = FALSE;
|
||||||
|
|
||||||
void deliver __P((int, char *, bool));
|
void deliver __P((int, char *));
|
||||||
int e_to_sys __P((int));
|
int e_to_sys __P((int));
|
||||||
@@ -304,7 +308,7 @@
|
@@ -291,7 +295,7 @@
|
||||||
# endif /* LOG_MAIL */
|
# endif /* LOG_MAIL */
|
||||||
|
|
||||||
from = NULL;
|
from = NULL;
|
||||||
|
@ -159,7 +159,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
switch(ch)
|
switch(ch)
|
||||||
{
|
{
|
||||||
@@ -312,6 +316,10 @@
|
@@ -299,6 +303,10 @@
|
||||||
EightBitMime = FALSE;
|
EightBitMime = FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -168,9 +168,9 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ break;
|
+ break;
|
||||||
+
|
+
|
||||||
case 'b': /* bounce mail when over quota. */
|
case 'b': /* bounce mail when over quota. */
|
||||||
bouncequota = TRUE;
|
BounceQuota = TRUE;
|
||||||
break;
|
break;
|
||||||
@@ -333,6 +341,10 @@
|
@@ -320,6 +328,10 @@
|
||||||
LMTPMode = TRUE;
|
LMTPMode = TRUE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
case '?':
|
case '?':
|
||||||
default:
|
default:
|
||||||
usage();
|
usage();
|
||||||
@@ -342,7 +354,8 @@
|
@@ -329,7 +341,8 @@
|
||||||
argv += optind;
|
argv += optind;
|
||||||
|
|
||||||
/* initialize biff structures */
|
/* initialize biff structures */
|
||||||
|
@ -190,13 +190,13 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ notifybiff(NULL);
|
+ notifybiff(NULL);
|
||||||
|
|
||||||
if (LMTPMode)
|
if (LMTPMode)
|
||||||
dolmtp(bouncequota);
|
{
|
||||||
@@ -1127,14 +1140,17 @@
|
@@ -1135,14 +1148,17 @@
|
||||||
goto err1;
|
goto err1;
|
||||||
}
|
}
|
||||||
|
|
||||||
- /* Get the starting offset of the new message for biff. */
|
- /* Get the starting offset of the new message for biff. */
|
||||||
- curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
- curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
- if (sizeof curoff > sizeof(long))
|
- if (sizeof curoff > sizeof(long))
|
||||||
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
- name, quad_to_string(curoff));
|
- name, quad_to_string(curoff));
|
||||||
|
@ -206,7 +206,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ if (!nobiff)
|
+ if (!nobiff)
|
||||||
+ {
|
+ {
|
||||||
+ /* Get the starting offset of the new message for biff. */
|
+ /* Get the starting offset of the new message for biff. */
|
||||||
+ curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
+ curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
+ if (sizeof curoff > sizeof(long))
|
+ if (sizeof curoff > sizeof(long))
|
||||||
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
+ name, quad_to_string(curoff));
|
+ name, quad_to_string(curoff));
|
||||||
|
@ -216,8 +216,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
/* Copy the message into the file. */
|
/* Copy the message into the file. */
|
||||||
if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1)
|
if (lseek(fd, (off_t) 0, SEEK_SET) == (off_t) -1)
|
||||||
@@ -1196,7 +1212,7 @@
|
@@ -1203,7 +1219,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Flush to disk, don't wait for update. */
|
/* Flush to disk, don't wait for update. */
|
||||||
|
@ -226,8 +226,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
||||||
err3:
|
err3:
|
||||||
@@ -1230,7 +1246,7 @@
|
@@ -1229,7 +1245,7 @@
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr(errcode, "%s: %s", path, errstring(errno));
|
||||||
(void) truncate(path, curoff);
|
(void) truncate(path, curoff);
|
||||||
}
|
}
|
||||||
- else
|
- else
|
||||||
|
@ -235,7 +235,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
notifybiff(biffmsg);
|
notifybiff(biffmsg);
|
||||||
|
|
||||||
if (setreuid(0, 0) < 0)
|
if (setreuid(0, 0) < 0)
|
||||||
@@ -1409,7 +1425,7 @@
|
@@ -1408,7 +1424,7 @@
|
||||||
usage()
|
usage()
|
||||||
{
|
{
|
||||||
ExitVal = EX_USAGE;
|
ExitVal = EX_USAGE;
|
||||||
|
@ -251,7 +251,7 @@ diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
|
||||||
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
* RMAIL -- UUCP mail server.
|
* RMAIL -- UUCP mail server.
|
||||||
|
@ -275,7 +275,7 @@ diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
|
4
mail/sendmail-old/files/pkg-milter
Normal file
4
mail/sendmail-old/files/pkg-milter
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
include/libmilter/mfapi.h
|
||||||
|
lib/libmilter.a
|
||||||
|
lib/libsmutil.a
|
||||||
|
@dirrm include/libmilter
|
|
@ -1,30 +0,0 @@
|
||||||
--- vbsfilter-1.3.c.neu.orig Wed Feb 14 10:45:06 2001
|
|
||||||
+++ vbsfilter-1.3.c Wed Feb 14 12:40:38 2001
|
|
||||||
@@ -2,6 +2,10 @@
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sysexits.h>
|
|
||||||
+#include <ctype.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <netdb.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
#include "libmilter/mfapi.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -172,7 +176,7 @@
|
|
||||||
sfsistat mlfi_body(SMFICTX *ctx, u_char *bodyp, size_t bodylen) {
|
|
||||||
struct mlfiPriv *priv = MLFIPRIV;
|
|
||||||
|
|
||||||
- priv->body = (char *) realloc(priv->body, priv->len + bodylen);
|
|
||||||
+ priv->body = (char *) realloc(priv->body, priv->len + bodylen + 1);
|
|
||||||
|
|
||||||
if (!priv->body) {
|
|
||||||
/* can't accept this message right now */
|
|
||||||
@@ -181,6 +185,7 @@
|
|
||||||
|
|
||||||
memcpy((u_char*)(priv->body+priv->len), bodyp, bodylen);
|
|
||||||
priv->len += bodylen;
|
|
||||||
+ priv->body[priv->len] = 0;
|
|
||||||
|
|
||||||
/* continue processing */
|
|
||||||
return SMFIS_CONTINUE;
|
|
|
@ -1 +1 @@
|
||||||
Reliable, highly configurable mail transfer agent with associated utilities
|
Reliable, highly configurable mail transfer agent with utilities
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail-old/Attic/pkg-plist,v 1.2 2001-03-10 20:49:31 dinoex Exp $
|
||||||
bin/hoststat
|
bin/hoststat
|
||||||
bin/mailq
|
bin/mailq
|
||||||
bin/newaliases
|
bin/newaliases
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= sendmail
|
PORTNAME= sendmail
|
||||||
PORTVERSION= 8.11.2
|
PORTVERSION= 8.11.3
|
||||||
CATEGORIES= mail ipv6
|
CATEGORIES= mail ipv6
|
||||||
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
||||||
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
||||||
|
@ -61,8 +61,7 @@ MAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
|
||||||
pre-install:
|
pre-install:
|
||||||
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
@${ECHO} "libexec/sample" >>${PLIST}
|
@${CAT} ${FILESDIR}/pkg-milter >${PLIST}
|
||||||
@${ECHO} "libexec/vbsfilter-1.3" >>${PLIST}
|
|
||||||
.endif
|
.endif
|
||||||
.if !defined(NOPORTDOCS)
|
.if !defined(NOPORTDOCS)
|
||||||
@cd ${WRKSRC} && find cf -type f | \
|
@cd ${WRKSRC} && find cf -type f | \
|
||||||
|
@ -72,11 +71,30 @@ pre-install:
|
||||||
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
post-configure:
|
||||||
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
|
post-build:
|
||||||
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
|
.endif
|
||||||
|
|
||||||
# We want mail.local and rmail for our system.
|
# We want mail.local and rmail for our system.
|
||||||
# the build install catmans only, we have to fix this.
|
# the build install catmans only, we have to fix this.
|
||||||
post-install:
|
post-install:
|
||||||
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
||||||
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
${MKDIR} ${PREFIX}/include/libmilter
|
||||||
|
${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
|
||||||
|
${PREFIX}/include/libmilter/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsmutil/libsmutil.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
.endif
|
||||||
.for i in ${MAN8}
|
.for i in ${MAN8}
|
||||||
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
||||||
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
||||||
|
@ -94,10 +112,6 @@ post-install:
|
||||||
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
||||||
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
||||||
.endif
|
.endif
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/sample ${PREFIX}/libexec
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-1.3 ${PREFIX}/libexec
|
|
||||||
.endif
|
|
||||||
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
||||||
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
||||||
|
|
||||||
|
@ -112,26 +126,11 @@ mailer.conf:
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
MASTER_SITES+= http://aeschi.ch.eu.org/milter/
|
|
||||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} vbsfilter-1.3.c
|
|
||||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
|
||||||
|
|
||||||
post-extract:
|
|
||||||
@${CP} ${_DISTDIR}vbsfilter-1.3.c ${WRKSRC}
|
|
||||||
@${SED} -e '1,184d' -e '417,419d' ${WRKSRC}/libmilter/README \
|
|
||||||
> ${WRKSRC}/sample.c
|
|
||||||
|
|
||||||
post-patch:
|
|
||||||
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/vbsfilter-1.3.c.patch
|
|
||||||
|
|
||||||
post-configure:
|
post-configure:
|
||||||
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
post-build:
|
post-build:
|
||||||
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
( cd ${WRKSRC} && \
|
|
||||||
${MAKE} -f ${FILESDIR}/Makefile.milter SENDMAIL_SOURCE=${WRKSRC} \
|
|
||||||
SENDMAIL_OBJECT=${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A` )
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c
|
MD5 (sendmail.8.11.3.tar.gz) = 77fa841497507b59f388bf59f0e14592
|
||||||
MD5 (vbsfilter-1.3.c) = da70a84416927d0ba0a0c4e69cc4532e
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
# Generic Makefile for libmilter filters
|
|
||||||
CC = gcc -Wall
|
|
||||||
|
|
||||||
# point this at your sendmail source tree
|
|
||||||
# SENDMAIL_SOURCE = /usr/local/src/sendmail-8.11.1
|
|
||||||
|
|
||||||
IFLAGS+= -I$(SENDMAIL_SOURCE)/sendmail -I$(SENDMAIL_SOURCE)/include
|
|
||||||
FLAGS+= -pthread
|
|
||||||
LDFLAGS+= -L$(SENDMAIL_OBJECT)/libmilter -L$(SENDMAIL_OBJECT)/libsmutil
|
|
||||||
LIBS+= -lmilter -lsmutil
|
|
||||||
|
|
||||||
TARGETS?= sample vbsfilter-1.3
|
|
||||||
|
|
||||||
all: $(TARGETS)
|
|
||||||
|
|
||||||
.for i in ${TARGETS}
|
|
||||||
${i}:
|
|
||||||
$(CC) $(IFLAGS) $(LDFLAGS) -o ${i} ${i}.c $(LIBS) $(FLAGS)
|
|
||||||
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(TARGETS)
|
|
||||||
|
|
||||||
install:
|
|
||||||
$(INSTALL) -c $(TARGETS) $(DEST)
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4
|
||||||
# forth in the LICENSE file which can be found at the top level of
|
# forth in the LICENSE file which can be found at the top level of
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
@ -27,7 +27,7 @@ diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
-#
|
-#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
divert(0)
|
divert(0)
|
||||||
|
@ -43,7 +43,7 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
|
||||||
#
|
#
|
||||||
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+#
|
+#
|
||||||
|
|
||||||
usewhoami=0
|
usewhoami=0
|
||||||
|
@ -64,7 +64,7 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
@ -112,18 +112,18 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
getservbyname(3),
|
getservbyname(3),
|
||||||
comsat(8),
|
comsat(8),
|
||||||
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
--- mail.local/mail.local.c Fri Sep 22 18:30:09 2000
|
--- mail.local/mail.local.c Sun Feb 11 21:08:20 2001
|
||||||
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Nov 6 11:23:42 2000
|
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Mar 5 21:48:22 2001
|
||||||
@@ -22,6 +22,8 @@
|
@@ -22,6 +22,8 @@
|
||||||
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.37 2000/09/22 00:49:10 doug Exp $";
|
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.57 2001/02/11 20:08:20 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
** This is not intended to work on System V derived systems
|
** This is not intended to work on System V derived systems
|
||||||
** such as Solaris or HP-UX, since they use a totally different
|
** such as Solaris or HP-UX, since they use a totally different
|
||||||
@@ -170,7 +172,7 @@
|
@@ -154,7 +156,7 @@
|
||||||
|
|
||||||
# if defined(BSD4_4) || defined(__GLIBC__)
|
# if defined(BSD4_4) || defined(__GLIBC__)
|
||||||
# include <paths.h>
|
# include <paths.h>
|
||||||
|
@ -132,7 +132,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
||||||
|
|
||||||
# ifdef BSD4_4
|
# ifdef BSD4_4
|
||||||
@@ -229,7 +231,7 @@
|
@@ -215,7 +217,7 @@
|
||||||
# endif /* USE_SETRESUID */
|
# endif /* USE_SETRESUID */
|
||||||
|
|
||||||
# ifndef _PATH_LOCTMP
|
# ifndef _PATH_LOCTMP
|
||||||
|
@ -141,16 +141,16 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* ! _PATH_LOCTMP */
|
# endif /* ! _PATH_LOCTMP */
|
||||||
# ifndef _PATH_MAILDIR
|
# ifndef _PATH_MAILDIR
|
||||||
# define _PATH_MAILDIR "/var/spool/mail"
|
# define _PATH_MAILDIR "/var/spool/mail"
|
||||||
@@ -264,6 +266,8 @@
|
@@ -252,6 +254,8 @@
|
||||||
int ExitVal = EX_OK; /* sysexits.h error value. */
|
bool HoldErrs = FALSE; /* Hold errors in ErrBuf */
|
||||||
bool LMTPMode = FALSE;
|
bool LMTPMode = FALSE;
|
||||||
bool bouncequota = FALSE; /* permanent error when over quota */
|
bool BounceQuota = FALSE; /* permanent error when over quota */
|
||||||
+bool nobiff = FALSE;
|
+bool nobiff = FALSE;
|
||||||
+bool nofsync = FALSE;
|
+bool nofsync = FALSE;
|
||||||
|
|
||||||
void deliver __P((int, char *, bool));
|
void deliver __P((int, char *));
|
||||||
int e_to_sys __P((int));
|
int e_to_sys __P((int));
|
||||||
@@ -304,7 +308,7 @@
|
@@ -291,7 +295,7 @@
|
||||||
# endif /* LOG_MAIL */
|
# endif /* LOG_MAIL */
|
||||||
|
|
||||||
from = NULL;
|
from = NULL;
|
||||||
|
@ -159,7 +159,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
switch(ch)
|
switch(ch)
|
||||||
{
|
{
|
||||||
@@ -312,6 +316,10 @@
|
@@ -299,6 +303,10 @@
|
||||||
EightBitMime = FALSE;
|
EightBitMime = FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -168,9 +168,9 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ break;
|
+ break;
|
||||||
+
|
+
|
||||||
case 'b': /* bounce mail when over quota. */
|
case 'b': /* bounce mail when over quota. */
|
||||||
bouncequota = TRUE;
|
BounceQuota = TRUE;
|
||||||
break;
|
break;
|
||||||
@@ -333,6 +341,10 @@
|
@@ -320,6 +328,10 @@
|
||||||
LMTPMode = TRUE;
|
LMTPMode = TRUE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
case '?':
|
case '?':
|
||||||
default:
|
default:
|
||||||
usage();
|
usage();
|
||||||
@@ -342,7 +354,8 @@
|
@@ -329,7 +341,8 @@
|
||||||
argv += optind;
|
argv += optind;
|
||||||
|
|
||||||
/* initialize biff structures */
|
/* initialize biff structures */
|
||||||
|
@ -190,13 +190,13 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ notifybiff(NULL);
|
+ notifybiff(NULL);
|
||||||
|
|
||||||
if (LMTPMode)
|
if (LMTPMode)
|
||||||
dolmtp(bouncequota);
|
{
|
||||||
@@ -1127,14 +1140,17 @@
|
@@ -1135,14 +1148,17 @@
|
||||||
goto err1;
|
goto err1;
|
||||||
}
|
}
|
||||||
|
|
||||||
- /* Get the starting offset of the new message for biff. */
|
- /* Get the starting offset of the new message for biff. */
|
||||||
- curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
- curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
- if (sizeof curoff > sizeof(long))
|
- if (sizeof curoff > sizeof(long))
|
||||||
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
- name, quad_to_string(curoff));
|
- name, quad_to_string(curoff));
|
||||||
|
@ -206,7 +206,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ if (!nobiff)
|
+ if (!nobiff)
|
||||||
+ {
|
+ {
|
||||||
+ /* Get the starting offset of the new message for biff. */
|
+ /* Get the starting offset of the new message for biff. */
|
||||||
+ curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
+ curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
+ if (sizeof curoff > sizeof(long))
|
+ if (sizeof curoff > sizeof(long))
|
||||||
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
+ name, quad_to_string(curoff));
|
+ name, quad_to_string(curoff));
|
||||||
|
@ -216,8 +216,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
/* Copy the message into the file. */
|
/* Copy the message into the file. */
|
||||||
if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1)
|
if (lseek(fd, (off_t) 0, SEEK_SET) == (off_t) -1)
|
||||||
@@ -1196,7 +1212,7 @@
|
@@ -1203,7 +1219,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Flush to disk, don't wait for update. */
|
/* Flush to disk, don't wait for update. */
|
||||||
|
@ -226,8 +226,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
||||||
err3:
|
err3:
|
||||||
@@ -1230,7 +1246,7 @@
|
@@ -1229,7 +1245,7 @@
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr(errcode, "%s: %s", path, errstring(errno));
|
||||||
(void) truncate(path, curoff);
|
(void) truncate(path, curoff);
|
||||||
}
|
}
|
||||||
- else
|
- else
|
||||||
|
@ -235,7 +235,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
notifybiff(biffmsg);
|
notifybiff(biffmsg);
|
||||||
|
|
||||||
if (setreuid(0, 0) < 0)
|
if (setreuid(0, 0) < 0)
|
||||||
@@ -1409,7 +1425,7 @@
|
@@ -1408,7 +1424,7 @@
|
||||||
usage()
|
usage()
|
||||||
{
|
{
|
||||||
ExitVal = EX_USAGE;
|
ExitVal = EX_USAGE;
|
||||||
|
@ -251,7 +251,7 @@ diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
|
||||||
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
* RMAIL -- UUCP mail server.
|
* RMAIL -- UUCP mail server.
|
||||||
|
@ -275,7 +275,7 @@ diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
|
4
mail/sendmail/files/pkg-milter
Normal file
4
mail/sendmail/files/pkg-milter
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
include/libmilter/mfapi.h
|
||||||
|
lib/libmilter.a
|
||||||
|
lib/libsmutil.a
|
||||||
|
@dirrm include/libmilter
|
|
@ -1,30 +0,0 @@
|
||||||
--- vbsfilter-1.3.c.neu.orig Wed Feb 14 10:45:06 2001
|
|
||||||
+++ vbsfilter-1.3.c Wed Feb 14 12:40:38 2001
|
|
||||||
@@ -2,6 +2,10 @@
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sysexits.h>
|
|
||||||
+#include <ctype.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <netdb.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
#include "libmilter/mfapi.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -172,7 +176,7 @@
|
|
||||||
sfsistat mlfi_body(SMFICTX *ctx, u_char *bodyp, size_t bodylen) {
|
|
||||||
struct mlfiPriv *priv = MLFIPRIV;
|
|
||||||
|
|
||||||
- priv->body = (char *) realloc(priv->body, priv->len + bodylen);
|
|
||||||
+ priv->body = (char *) realloc(priv->body, priv->len + bodylen + 1);
|
|
||||||
|
|
||||||
if (!priv->body) {
|
|
||||||
/* can't accept this message right now */
|
|
||||||
@@ -181,6 +185,7 @@
|
|
||||||
|
|
||||||
memcpy((u_char*)(priv->body+priv->len), bodyp, bodylen);
|
|
||||||
priv->len += bodylen;
|
|
||||||
+ priv->body[priv->len] = 0;
|
|
||||||
|
|
||||||
/* continue processing */
|
|
||||||
return SMFIS_CONTINUE;
|
|
|
@ -1 +1 @@
|
||||||
Reliable, highly configurable mail transfer agent with associated utilities
|
Reliable, highly configurable mail transfer agent with utilities
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail/pkg-plist,v 1.2 2001-03-10 20:49:31 dinoex Exp $
|
||||||
bin/hoststat
|
bin/hoststat
|
||||||
bin/mailq
|
bin/mailq
|
||||||
bin/newaliases
|
bin/newaliases
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= sendmail
|
PORTNAME= sendmail
|
||||||
PORTVERSION= 8.11.2
|
PORTVERSION= 8.11.3
|
||||||
CATEGORIES= mail ipv6
|
CATEGORIES= mail ipv6
|
||||||
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
||||||
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
||||||
|
@ -61,8 +61,7 @@ MAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
|
||||||
pre-install:
|
pre-install:
|
||||||
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
@${ECHO} "libexec/sample" >>${PLIST}
|
@${CAT} ${FILESDIR}/pkg-milter >${PLIST}
|
||||||
@${ECHO} "libexec/vbsfilter-1.3" >>${PLIST}
|
|
||||||
.endif
|
.endif
|
||||||
.if !defined(NOPORTDOCS)
|
.if !defined(NOPORTDOCS)
|
||||||
@cd ${WRKSRC} && find cf -type f | \
|
@cd ${WRKSRC} && find cf -type f | \
|
||||||
|
@ -72,11 +71,30 @@ pre-install:
|
||||||
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
post-configure:
|
||||||
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
|
post-build:
|
||||||
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
|
.endif
|
||||||
|
|
||||||
# We want mail.local and rmail for our system.
|
# We want mail.local and rmail for our system.
|
||||||
# the build install catmans only, we have to fix this.
|
# the build install catmans only, we have to fix this.
|
||||||
post-install:
|
post-install:
|
||||||
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
||||||
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
${MKDIR} ${PREFIX}/include/libmilter
|
||||||
|
${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
|
||||||
|
${PREFIX}/include/libmilter/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsmutil/libsmutil.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
.endif
|
||||||
.for i in ${MAN8}
|
.for i in ${MAN8}
|
||||||
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
||||||
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
||||||
|
@ -94,10 +112,6 @@ post-install:
|
||||||
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
||||||
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
||||||
.endif
|
.endif
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/sample ${PREFIX}/libexec
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-1.3 ${PREFIX}/libexec
|
|
||||||
.endif
|
|
||||||
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
||||||
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
||||||
|
|
||||||
|
@ -112,26 +126,11 @@ mailer.conf:
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
MASTER_SITES+= http://aeschi.ch.eu.org/milter/
|
|
||||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} vbsfilter-1.3.c
|
|
||||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
|
||||||
|
|
||||||
post-extract:
|
|
||||||
@${CP} ${_DISTDIR}vbsfilter-1.3.c ${WRKSRC}
|
|
||||||
@${SED} -e '1,184d' -e '417,419d' ${WRKSRC}/libmilter/README \
|
|
||||||
> ${WRKSRC}/sample.c
|
|
||||||
|
|
||||||
post-patch:
|
|
||||||
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/vbsfilter-1.3.c.patch
|
|
||||||
|
|
||||||
post-configure:
|
post-configure:
|
||||||
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
post-build:
|
post-build:
|
||||||
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
( cd ${WRKSRC} && \
|
|
||||||
${MAKE} -f ${FILESDIR}/Makefile.milter SENDMAIL_SOURCE=${WRKSRC} \
|
|
||||||
SENDMAIL_OBJECT=${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A` )
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c
|
MD5 (sendmail.8.11.3.tar.gz) = 77fa841497507b59f388bf59f0e14592
|
||||||
MD5 (vbsfilter-1.3.c) = da70a84416927d0ba0a0c4e69cc4532e
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
# Generic Makefile for libmilter filters
|
|
||||||
CC = gcc -Wall
|
|
||||||
|
|
||||||
# point this at your sendmail source tree
|
|
||||||
# SENDMAIL_SOURCE = /usr/local/src/sendmail-8.11.1
|
|
||||||
|
|
||||||
IFLAGS+= -I$(SENDMAIL_SOURCE)/sendmail -I$(SENDMAIL_SOURCE)/include
|
|
||||||
FLAGS+= -pthread
|
|
||||||
LDFLAGS+= -L$(SENDMAIL_OBJECT)/libmilter -L$(SENDMAIL_OBJECT)/libsmutil
|
|
||||||
LIBS+= -lmilter -lsmutil
|
|
||||||
|
|
||||||
TARGETS?= sample vbsfilter-1.3
|
|
||||||
|
|
||||||
all: $(TARGETS)
|
|
||||||
|
|
||||||
.for i in ${TARGETS}
|
|
||||||
${i}:
|
|
||||||
$(CC) $(IFLAGS) $(LDFLAGS) -o ${i} ${i}.c $(LIBS) $(FLAGS)
|
|
||||||
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(TARGETS)
|
|
||||||
|
|
||||||
install:
|
|
||||||
$(INSTALL) -c $(TARGETS) $(DEST)
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4
|
||||||
# forth in the LICENSE file which can be found at the top level of
|
# forth in the LICENSE file which can be found at the top level of
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
@ -27,7 +27,7 @@ diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
-#
|
-#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
divert(0)
|
divert(0)
|
||||||
|
@ -43,7 +43,7 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
|
||||||
#
|
#
|
||||||
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+#
|
+#
|
||||||
|
|
||||||
usewhoami=0
|
usewhoami=0
|
||||||
|
@ -64,7 +64,7 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
@ -112,18 +112,18 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
getservbyname(3),
|
getservbyname(3),
|
||||||
comsat(8),
|
comsat(8),
|
||||||
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
--- mail.local/mail.local.c Fri Sep 22 18:30:09 2000
|
--- mail.local/mail.local.c Sun Feb 11 21:08:20 2001
|
||||||
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Nov 6 11:23:42 2000
|
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Mar 5 21:48:22 2001
|
||||||
@@ -22,6 +22,8 @@
|
@@ -22,6 +22,8 @@
|
||||||
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.37 2000/09/22 00:49:10 doug Exp $";
|
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.57 2001/02/11 20:08:20 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
** This is not intended to work on System V derived systems
|
** This is not intended to work on System V derived systems
|
||||||
** such as Solaris or HP-UX, since they use a totally different
|
** such as Solaris or HP-UX, since they use a totally different
|
||||||
@@ -170,7 +172,7 @@
|
@@ -154,7 +156,7 @@
|
||||||
|
|
||||||
# if defined(BSD4_4) || defined(__GLIBC__)
|
# if defined(BSD4_4) || defined(__GLIBC__)
|
||||||
# include <paths.h>
|
# include <paths.h>
|
||||||
|
@ -132,7 +132,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
||||||
|
|
||||||
# ifdef BSD4_4
|
# ifdef BSD4_4
|
||||||
@@ -229,7 +231,7 @@
|
@@ -215,7 +217,7 @@
|
||||||
# endif /* USE_SETRESUID */
|
# endif /* USE_SETRESUID */
|
||||||
|
|
||||||
# ifndef _PATH_LOCTMP
|
# ifndef _PATH_LOCTMP
|
||||||
|
@ -141,16 +141,16 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* ! _PATH_LOCTMP */
|
# endif /* ! _PATH_LOCTMP */
|
||||||
# ifndef _PATH_MAILDIR
|
# ifndef _PATH_MAILDIR
|
||||||
# define _PATH_MAILDIR "/var/spool/mail"
|
# define _PATH_MAILDIR "/var/spool/mail"
|
||||||
@@ -264,6 +266,8 @@
|
@@ -252,6 +254,8 @@
|
||||||
int ExitVal = EX_OK; /* sysexits.h error value. */
|
bool HoldErrs = FALSE; /* Hold errors in ErrBuf */
|
||||||
bool LMTPMode = FALSE;
|
bool LMTPMode = FALSE;
|
||||||
bool bouncequota = FALSE; /* permanent error when over quota */
|
bool BounceQuota = FALSE; /* permanent error when over quota */
|
||||||
+bool nobiff = FALSE;
|
+bool nobiff = FALSE;
|
||||||
+bool nofsync = FALSE;
|
+bool nofsync = FALSE;
|
||||||
|
|
||||||
void deliver __P((int, char *, bool));
|
void deliver __P((int, char *));
|
||||||
int e_to_sys __P((int));
|
int e_to_sys __P((int));
|
||||||
@@ -304,7 +308,7 @@
|
@@ -291,7 +295,7 @@
|
||||||
# endif /* LOG_MAIL */
|
# endif /* LOG_MAIL */
|
||||||
|
|
||||||
from = NULL;
|
from = NULL;
|
||||||
|
@ -159,7 +159,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
switch(ch)
|
switch(ch)
|
||||||
{
|
{
|
||||||
@@ -312,6 +316,10 @@
|
@@ -299,6 +303,10 @@
|
||||||
EightBitMime = FALSE;
|
EightBitMime = FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -168,9 +168,9 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ break;
|
+ break;
|
||||||
+
|
+
|
||||||
case 'b': /* bounce mail when over quota. */
|
case 'b': /* bounce mail when over quota. */
|
||||||
bouncequota = TRUE;
|
BounceQuota = TRUE;
|
||||||
break;
|
break;
|
||||||
@@ -333,6 +341,10 @@
|
@@ -320,6 +328,10 @@
|
||||||
LMTPMode = TRUE;
|
LMTPMode = TRUE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
case '?':
|
case '?':
|
||||||
default:
|
default:
|
||||||
usage();
|
usage();
|
||||||
@@ -342,7 +354,8 @@
|
@@ -329,7 +341,8 @@
|
||||||
argv += optind;
|
argv += optind;
|
||||||
|
|
||||||
/* initialize biff structures */
|
/* initialize biff structures */
|
||||||
|
@ -190,13 +190,13 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ notifybiff(NULL);
|
+ notifybiff(NULL);
|
||||||
|
|
||||||
if (LMTPMode)
|
if (LMTPMode)
|
||||||
dolmtp(bouncequota);
|
{
|
||||||
@@ -1127,14 +1140,17 @@
|
@@ -1135,14 +1148,17 @@
|
||||||
goto err1;
|
goto err1;
|
||||||
}
|
}
|
||||||
|
|
||||||
- /* Get the starting offset of the new message for biff. */
|
- /* Get the starting offset of the new message for biff. */
|
||||||
- curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
- curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
- if (sizeof curoff > sizeof(long))
|
- if (sizeof curoff > sizeof(long))
|
||||||
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
- name, quad_to_string(curoff));
|
- name, quad_to_string(curoff));
|
||||||
|
@ -206,7 +206,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ if (!nobiff)
|
+ if (!nobiff)
|
||||||
+ {
|
+ {
|
||||||
+ /* Get the starting offset of the new message for biff. */
|
+ /* Get the starting offset of the new message for biff. */
|
||||||
+ curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
+ curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
+ if (sizeof curoff > sizeof(long))
|
+ if (sizeof curoff > sizeof(long))
|
||||||
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
+ name, quad_to_string(curoff));
|
+ name, quad_to_string(curoff));
|
||||||
|
@ -216,8 +216,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
/* Copy the message into the file. */
|
/* Copy the message into the file. */
|
||||||
if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1)
|
if (lseek(fd, (off_t) 0, SEEK_SET) == (off_t) -1)
|
||||||
@@ -1196,7 +1212,7 @@
|
@@ -1203,7 +1219,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Flush to disk, don't wait for update. */
|
/* Flush to disk, don't wait for update. */
|
||||||
|
@ -226,8 +226,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
||||||
err3:
|
err3:
|
||||||
@@ -1230,7 +1246,7 @@
|
@@ -1229,7 +1245,7 @@
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr(errcode, "%s: %s", path, errstring(errno));
|
||||||
(void) truncate(path, curoff);
|
(void) truncate(path, curoff);
|
||||||
}
|
}
|
||||||
- else
|
- else
|
||||||
|
@ -235,7 +235,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
notifybiff(biffmsg);
|
notifybiff(biffmsg);
|
||||||
|
|
||||||
if (setreuid(0, 0) < 0)
|
if (setreuid(0, 0) < 0)
|
||||||
@@ -1409,7 +1425,7 @@
|
@@ -1408,7 +1424,7 @@
|
||||||
usage()
|
usage()
|
||||||
{
|
{
|
||||||
ExitVal = EX_USAGE;
|
ExitVal = EX_USAGE;
|
||||||
|
@ -251,7 +251,7 @@ diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
|
||||||
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
* RMAIL -- UUCP mail server.
|
* RMAIL -- UUCP mail server.
|
||||||
|
@ -275,7 +275,7 @@ diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
|
4
mail/sendmail811/files/pkg-milter
Normal file
4
mail/sendmail811/files/pkg-milter
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
include/libmilter/mfapi.h
|
||||||
|
lib/libmilter.a
|
||||||
|
lib/libsmutil.a
|
||||||
|
@dirrm include/libmilter
|
|
@ -1,30 +0,0 @@
|
||||||
--- vbsfilter-1.3.c.neu.orig Wed Feb 14 10:45:06 2001
|
|
||||||
+++ vbsfilter-1.3.c Wed Feb 14 12:40:38 2001
|
|
||||||
@@ -2,6 +2,10 @@
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sysexits.h>
|
|
||||||
+#include <ctype.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <netdb.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
#include "libmilter/mfapi.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -172,7 +176,7 @@
|
|
||||||
sfsistat mlfi_body(SMFICTX *ctx, u_char *bodyp, size_t bodylen) {
|
|
||||||
struct mlfiPriv *priv = MLFIPRIV;
|
|
||||||
|
|
||||||
- priv->body = (char *) realloc(priv->body, priv->len + bodylen);
|
|
||||||
+ priv->body = (char *) realloc(priv->body, priv->len + bodylen + 1);
|
|
||||||
|
|
||||||
if (!priv->body) {
|
|
||||||
/* can't accept this message right now */
|
|
||||||
@@ -181,6 +185,7 @@
|
|
||||||
|
|
||||||
memcpy((u_char*)(priv->body+priv->len), bodyp, bodylen);
|
|
||||||
priv->len += bodylen;
|
|
||||||
+ priv->body[priv->len] = 0;
|
|
||||||
|
|
||||||
/* continue processing */
|
|
||||||
return SMFIS_CONTINUE;
|
|
|
@ -1 +1 @@
|
||||||
Reliable, highly configurable mail transfer agent with associated utilities
|
Reliable, highly configurable mail transfer agent with utilities
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/Attic/pkg-plist,v 1.2 2001-03-10 20:49:31 dinoex Exp $
|
||||||
bin/hoststat
|
bin/hoststat
|
||||||
bin/mailq
|
bin/mailq
|
||||||
bin/newaliases
|
bin/newaliases
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= sendmail
|
PORTNAME= sendmail
|
||||||
PORTVERSION= 8.11.2
|
PORTVERSION= 8.11.3
|
||||||
CATEGORIES= mail ipv6
|
CATEGORIES= mail ipv6
|
||||||
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
|
||||||
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
DISTNAME= ${PORTNAME}.${PORTVERSION}
|
||||||
|
@ -61,8 +61,7 @@ MAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
|
||||||
pre-install:
|
pre-install:
|
||||||
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
@${ECHO} "libexec/sample" >>${PLIST}
|
@${CAT} ${FILESDIR}/pkg-milter >${PLIST}
|
||||||
@${ECHO} "libexec/vbsfilter-1.3" >>${PLIST}
|
|
||||||
.endif
|
.endif
|
||||||
.if !defined(NOPORTDOCS)
|
.if !defined(NOPORTDOCS)
|
||||||
@cd ${WRKSRC} && find cf -type f | \
|
@cd ${WRKSRC} && find cf -type f | \
|
||||||
|
@ -72,11 +71,30 @@ pre-install:
|
||||||
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
@${ECHO} "@dirrm share/sendmail" >>${PLIST}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
post-configure:
|
||||||
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
|
post-build:
|
||||||
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
|
.endif
|
||||||
|
|
||||||
# We want mail.local and rmail for our system.
|
# We want mail.local and rmail for our system.
|
||||||
# the build install catmans only, we have to fix this.
|
# the build install catmans only, we have to fix this.
|
||||||
post-install:
|
post-install:
|
||||||
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
|
||||||
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
|
||||||
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
|
${MKDIR} ${PREFIX}/include/libmilter
|
||||||
|
${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
|
||||||
|
${PREFIX}/include/libmilter/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
${INSTALL_DATA} \
|
||||||
|
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsmutil/libsmutil.a \
|
||||||
|
${PREFIX}/lib/
|
||||||
|
.endif
|
||||||
.for i in ${MAN8}
|
.for i in ${MAN8}
|
||||||
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
|
||||||
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
|
||||||
|
@ -94,10 +112,6 @@ post-install:
|
||||||
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
@cd ${WRKSRC}; ${TAR} cf - cf |\
|
||||||
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
|
||||||
.endif
|
.endif
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/sample ${PREFIX}/libexec
|
|
||||||
${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-1.3 ${PREFIX}/libexec
|
|
||||||
.endif
|
|
||||||
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
.if exists(${DESTDIR}/etc/mail/mailer.conf)
|
||||||
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
|
||||||
|
|
||||||
|
@ -112,26 +126,11 @@ mailer.conf:
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(SENDMAIL_WITH_MILTER)
|
.if defined(SENDMAIL_WITH_MILTER)
|
||||||
MASTER_SITES+= http://aeschi.ch.eu.org/milter/
|
|
||||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} vbsfilter-1.3.c
|
|
||||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
|
||||||
|
|
||||||
post-extract:
|
|
||||||
@${CP} ${_DISTDIR}vbsfilter-1.3.c ${WRKSRC}
|
|
||||||
@${SED} -e '1,184d' -e '417,419d' ${WRKSRC}/libmilter/README \
|
|
||||||
> ${WRKSRC}/sample.c
|
|
||||||
|
|
||||||
post-patch:
|
|
||||||
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/vbsfilter-1.3.c.patch
|
|
||||||
|
|
||||||
post-configure:
|
post-configure:
|
||||||
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
|
||||||
|
|
||||||
post-build:
|
post-build:
|
||||||
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
( cd ${WRKSRC}/libmilter && ${MAKE} )
|
||||||
( cd ${WRKSRC} && \
|
|
||||||
${MAKE} -f ${FILESDIR}/Makefile.milter SENDMAIL_SOURCE=${WRKSRC} \
|
|
||||||
SENDMAIL_OBJECT=${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A` )
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c
|
MD5 (sendmail.8.11.3.tar.gz) = 77fa841497507b59f388bf59f0e14592
|
||||||
MD5 (vbsfilter-1.3.c) = da70a84416927d0ba0a0c4e69cc4532e
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
# Generic Makefile for libmilter filters
|
|
||||||
CC = gcc -Wall
|
|
||||||
|
|
||||||
# point this at your sendmail source tree
|
|
||||||
# SENDMAIL_SOURCE = /usr/local/src/sendmail-8.11.1
|
|
||||||
|
|
||||||
IFLAGS+= -I$(SENDMAIL_SOURCE)/sendmail -I$(SENDMAIL_SOURCE)/include
|
|
||||||
FLAGS+= -pthread
|
|
||||||
LDFLAGS+= -L$(SENDMAIL_OBJECT)/libmilter -L$(SENDMAIL_OBJECT)/libsmutil
|
|
||||||
LIBS+= -lmilter -lsmutil
|
|
||||||
|
|
||||||
TARGETS?= sample vbsfilter-1.3
|
|
||||||
|
|
||||||
all: $(TARGETS)
|
|
||||||
|
|
||||||
.for i in ${TARGETS}
|
|
||||||
${i}:
|
|
||||||
$(CC) $(IFLAGS) $(LDFLAGS) -o ${i} ${i}.c $(LIBS) $(FLAGS)
|
|
||||||
|
|
||||||
.endfor
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f $(TARGETS)
|
|
||||||
|
|
||||||
install:
|
|
||||||
$(INSTALL) -c $(TARGETS) $(DEST)
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4
|
||||||
# forth in the LICENSE file which can be found at the top level of
|
# forth in the LICENSE file which can be found at the top level of
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
@ -27,7 +27,7 @@ diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
|
||||||
# the sendmail distribution.
|
# the sendmail distribution.
|
||||||
#
|
#
|
||||||
-#
|
-#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
divert(0)
|
divert(0)
|
||||||
|
@ -43,7 +43,7 @@ diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
|
||||||
#
|
#
|
||||||
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
|
||||||
#
|
#
|
||||||
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+#
|
+#
|
||||||
|
|
||||||
usewhoami=0
|
usewhoami=0
|
||||||
|
@ -64,7 +64,7 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
@ -112,18 +112,18 @@ diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
|
||||||
getservbyname(3),
|
getservbyname(3),
|
||||||
comsat(8),
|
comsat(8),
|
||||||
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
--- mail.local/mail.local.c Fri Sep 22 18:30:09 2000
|
--- mail.local/mail.local.c Sun Feb 11 21:08:20 2001
|
||||||
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Nov 6 11:23:42 2000
|
+++ src/contrib/sendmail/mail.local/mail.local.c Mon Mar 5 21:48:22 2001
|
||||||
@@ -22,6 +22,8 @@
|
@@ -22,6 +22,8 @@
|
||||||
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.37 2000/09/22 00:49:10 doug Exp $";
|
static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.57 2001/02/11 20:08:20 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
** This is not intended to work on System V derived systems
|
** This is not intended to work on System V derived systems
|
||||||
** such as Solaris or HP-UX, since they use a totally different
|
** such as Solaris or HP-UX, since they use a totally different
|
||||||
@@ -170,7 +172,7 @@
|
@@ -154,7 +156,7 @@
|
||||||
|
|
||||||
# if defined(BSD4_4) || defined(__GLIBC__)
|
# if defined(BSD4_4) || defined(__GLIBC__)
|
||||||
# include <paths.h>
|
# include <paths.h>
|
||||||
|
@ -132,7 +132,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
# endif /* defined(BSD4_4) || defined(__GLIBC__) */
|
||||||
|
|
||||||
# ifdef BSD4_4
|
# ifdef BSD4_4
|
||||||
@@ -229,7 +231,7 @@
|
@@ -215,7 +217,7 @@
|
||||||
# endif /* USE_SETRESUID */
|
# endif /* USE_SETRESUID */
|
||||||
|
|
||||||
# ifndef _PATH_LOCTMP
|
# ifndef _PATH_LOCTMP
|
||||||
|
@ -141,16 +141,16 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
# endif /* ! _PATH_LOCTMP */
|
# endif /* ! _PATH_LOCTMP */
|
||||||
# ifndef _PATH_MAILDIR
|
# ifndef _PATH_MAILDIR
|
||||||
# define _PATH_MAILDIR "/var/spool/mail"
|
# define _PATH_MAILDIR "/var/spool/mail"
|
||||||
@@ -264,6 +266,8 @@
|
@@ -252,6 +254,8 @@
|
||||||
int ExitVal = EX_OK; /* sysexits.h error value. */
|
bool HoldErrs = FALSE; /* Hold errors in ErrBuf */
|
||||||
bool LMTPMode = FALSE;
|
bool LMTPMode = FALSE;
|
||||||
bool bouncequota = FALSE; /* permanent error when over quota */
|
bool BounceQuota = FALSE; /* permanent error when over quota */
|
||||||
+bool nobiff = FALSE;
|
+bool nobiff = FALSE;
|
||||||
+bool nofsync = FALSE;
|
+bool nofsync = FALSE;
|
||||||
|
|
||||||
void deliver __P((int, char *, bool));
|
void deliver __P((int, char *));
|
||||||
int e_to_sys __P((int));
|
int e_to_sys __P((int));
|
||||||
@@ -304,7 +308,7 @@
|
@@ -291,7 +295,7 @@
|
||||||
# endif /* LOG_MAIL */
|
# endif /* LOG_MAIL */
|
||||||
|
|
||||||
from = NULL;
|
from = NULL;
|
||||||
|
@ -159,7 +159,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
switch(ch)
|
switch(ch)
|
||||||
{
|
{
|
||||||
@@ -312,6 +316,10 @@
|
@@ -299,6 +303,10 @@
|
||||||
EightBitMime = FALSE;
|
EightBitMime = FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -168,9 +168,9 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ break;
|
+ break;
|
||||||
+
|
+
|
||||||
case 'b': /* bounce mail when over quota. */
|
case 'b': /* bounce mail when over quota. */
|
||||||
bouncequota = TRUE;
|
BounceQuota = TRUE;
|
||||||
break;
|
break;
|
||||||
@@ -333,6 +341,10 @@
|
@@ -320,6 +328,10 @@
|
||||||
LMTPMode = TRUE;
|
LMTPMode = TRUE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
case '?':
|
case '?':
|
||||||
default:
|
default:
|
||||||
usage();
|
usage();
|
||||||
@@ -342,7 +354,8 @@
|
@@ -329,7 +341,8 @@
|
||||||
argv += optind;
|
argv += optind;
|
||||||
|
|
||||||
/* initialize biff structures */
|
/* initialize biff structures */
|
||||||
|
@ -190,13 +190,13 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ notifybiff(NULL);
|
+ notifybiff(NULL);
|
||||||
|
|
||||||
if (LMTPMode)
|
if (LMTPMode)
|
||||||
dolmtp(bouncequota);
|
{
|
||||||
@@ -1127,14 +1140,17 @@
|
@@ -1135,14 +1148,17 @@
|
||||||
goto err1;
|
goto err1;
|
||||||
}
|
}
|
||||||
|
|
||||||
- /* Get the starting offset of the new message for biff. */
|
- /* Get the starting offset of the new message for biff. */
|
||||||
- curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
- curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
- if (sizeof curoff > sizeof(long))
|
- if (sizeof curoff > sizeof(long))
|
||||||
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
- name, quad_to_string(curoff));
|
- name, quad_to_string(curoff));
|
||||||
|
@ -206,7 +206,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ if (!nobiff)
|
+ if (!nobiff)
|
||||||
+ {
|
+ {
|
||||||
+ /* Get the starting offset of the new message for biff. */
|
+ /* Get the starting offset of the new message for biff. */
|
||||||
+ curoff = lseek(mbfd, (off_t)0, SEEK_END);
|
+ curoff = lseek(mbfd, (off_t) 0, SEEK_END);
|
||||||
+ if (sizeof curoff > sizeof(long))
|
+ if (sizeof curoff > sizeof(long))
|
||||||
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
|
||||||
+ name, quad_to_string(curoff));
|
+ name, quad_to_string(curoff));
|
||||||
|
@ -216,8 +216,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
/* Copy the message into the file. */
|
/* Copy the message into the file. */
|
||||||
if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1)
|
if (lseek(fd, (off_t) 0, SEEK_SET) == (off_t) -1)
|
||||||
@@ -1196,7 +1212,7 @@
|
@@ -1203,7 +1219,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Flush to disk, don't wait for update. */
|
/* Flush to disk, don't wait for update. */
|
||||||
|
@ -226,8 +226,8 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
{
|
{
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
||||||
err3:
|
err3:
|
||||||
@@ -1230,7 +1246,7 @@
|
@@ -1229,7 +1245,7 @@
|
||||||
mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
|
mailerr(errcode, "%s: %s", path, errstring(errno));
|
||||||
(void) truncate(path, curoff);
|
(void) truncate(path, curoff);
|
||||||
}
|
}
|
||||||
- else
|
- else
|
||||||
|
@ -235,7 +235,7 @@ diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
|
||||||
notifybiff(biffmsg);
|
notifybiff(biffmsg);
|
||||||
|
|
||||||
if (setreuid(0, 0) < 0)
|
if (setreuid(0, 0) < 0)
|
||||||
@@ -1409,7 +1425,7 @@
|
@@ -1408,7 +1424,7 @@
|
||||||
usage()
|
usage()
|
||||||
{
|
{
|
||||||
ExitVal = EX_USAGE;
|
ExitVal = EX_USAGE;
|
||||||
|
@ -251,7 +251,7 @@ diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
|
||||||
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $";
|
||||||
#endif /* ! lint */
|
#endif /* ! lint */
|
||||||
|
|
||||||
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $ */
|
+/* $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $ */
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
* RMAIL -- UUCP mail server.
|
* RMAIL -- UUCP mail server.
|
||||||
|
@ -275,7 +275,7 @@ diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
.\" $Id: smrsh.8,v 8.11.16.2 2000/12/15 19:50:46 gshapiro Exp $
|
||||||
.\"
|
.\"
|
||||||
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.2 2001-01-05 03:15:41 jeh Exp $
|
+.\" $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/patch-aa,v 1.3 2001-03-10 20:49:42 dinoex Exp $
|
||||||
+.\"
|
+.\"
|
||||||
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
.TH SMRSH 8 "$Date: 2000/12/15 19:50:46 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
|
|
4
mail/sendmail812/files/pkg-milter
Normal file
4
mail/sendmail812/files/pkg-milter
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
include/libmilter/mfapi.h
|
||||||
|
lib/libmilter.a
|
||||||
|
lib/libsmutil.a
|
||||||
|
@dirrm include/libmilter
|
|
@ -1,30 +0,0 @@
|
||||||
--- vbsfilter-1.3.c.neu.orig Wed Feb 14 10:45:06 2001
|
|
||||||
+++ vbsfilter-1.3.c Wed Feb 14 12:40:38 2001
|
|
||||||
@@ -2,6 +2,10 @@
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sysexits.h>
|
|
||||||
+#include <ctype.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <netdb.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
#include "libmilter/mfapi.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -172,7 +176,7 @@
|
|
||||||
sfsistat mlfi_body(SMFICTX *ctx, u_char *bodyp, size_t bodylen) {
|
|
||||||
struct mlfiPriv *priv = MLFIPRIV;
|
|
||||||
|
|
||||||
- priv->body = (char *) realloc(priv->body, priv->len + bodylen);
|
|
||||||
+ priv->body = (char *) realloc(priv->body, priv->len + bodylen + 1);
|
|
||||||
|
|
||||||
if (!priv->body) {
|
|
||||||
/* can't accept this message right now */
|
|
||||||
@@ -181,6 +185,7 @@
|
|
||||||
|
|
||||||
memcpy((u_char*)(priv->body+priv->len), bodyp, bodylen);
|
|
||||||
priv->len += bodylen;
|
|
||||||
+ priv->body[priv->len] = 0;
|
|
||||||
|
|
||||||
/* continue processing */
|
|
||||||
return SMFIS_CONTINUE;
|
|
|
@ -1 +1 @@
|
||||||
Reliable, highly configurable mail transfer agent with associated utilities
|
Reliable, highly configurable mail transfer agent with utilities
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.2 2001-03-10 20:49:31 dinoex Exp $
|
||||||
bin/hoststat
|
bin/hoststat
|
||||||
bin/mailq
|
bin/mailq
|
||||||
bin/newaliases
|
bin/newaliases
|
||||||
|
|
Loading…
Add table
Reference in a new issue