From e8b8add7dbdd914223c3022c4ef49654d9b16cb7 Mon Sep 17 00:00:00 2001 From: Gregory Neil Shapiro Date: Sat, 14 Apr 2007 17:43:48 +0000 Subject: [PATCH] Change build infrastructure over to sendmail 8.14.1. Note that mail filters (aka, milters) compiled against the libmilter included in the base operating system should be recompiled. --- bin/rmail/Makefile | 4 ++-- etc/sendmail/Makefile | 4 ++-- lib/libmilter/Makefile | 8 ++++---- lib/libsm/Makefile | 8 ++++---- lib/libsmdb/Makefile | 4 ++-- lib/libsmutil/Makefile | 4 ++-- libexec/mail.local/Makefile | 4 ++-- libexec/smrsh/Makefile | 4 ++-- libexec/smrsh/patches/smrsh.8.patch | 4 ++-- share/doc/smm/08.sendmailop/Makefile | 4 ++-- share/sendmail/Makefile | 4 ++-- usr.bin/vacation/Makefile | 4 ++-- usr.sbin/editmap/Makefile | 4 ++-- usr.sbin/mailstats/Makefile | 4 ++-- usr.sbin/makemap/Makefile | 4 ++-- usr.sbin/praliases/Makefile | 4 ++-- usr.sbin/sendmail/Makefile | 6 +++--- usr.sbin/sendmail/mci.c.patch | 4 ++-- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index ff09a5398a..d739b5e2bd 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD: src/bin/rmail/Makefile,v 1.8.2.6 2002/03/25 21:31:30 gshapiro Exp $ -# $DragonFly: src/bin/rmail/Makefile,v 1.9 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/bin/rmail/Makefile,v 1.10 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/rmail WARNS?= 0 # XXX Not yet. diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index 4dcfd58fe4..21436a3bae 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -1,13 +1,13 @@ # @(#)Makefile 8.19 (Berkeley) 1/14/97 # $FreeBSD: src/etc/sendmail/Makefile,v 1.31 2004/01/22 17:51:02 ru Exp $ -# $DragonFly: src/etc/sendmail/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/etc/sendmail/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ M4= m4 CHMOD= chmod ROMODE= 444 RM= rm -f -SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail-8.14 SMDIR= ${SENDMAIL_DIR}/sendmail SENDMAIL_CF_DIR?=${SENDMAIL_DIR}/cf diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile index 1e5fcb4b35..20c188b39d 100644 --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libmilter/Makefile,v 1.1.2.2 2002/07/22 14:21:49 ru Exp $ -# $DragonFly: src/lib/libmilter/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/lib/libmilter/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. @@ -17,8 +17,8 @@ INCS= ${SENDMAIL_DIR}/include/libmilter/mfapi.h \ LIB= milter SRCS+= sm_os.h -SRCS+= main.c engine.c listener.c handler.c comm.c smfi.c \ - signal.c sm_gethost.c errstring.c strl.c +SRCS+= main.c engine.c listener.c handler.c comm.c monitor.c smfi.c \ + signal.c sm_gethost.c errstring.c strl.c worker.c CLEANFILES+=sm_os.h sm_os.h: diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index efa0b8af1b..b4f9da9094 100644 --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libsm/Makefile,v 1.1.2.2 2002/07/19 18:46:26 ru Exp $ -# $DragonFly: src/lib/libsm/Makefile,v 1.11 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/lib/libsm/Makefile,v 1.12 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/libsm CFLAGS+= -I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. @@ -22,8 +22,8 @@ SRCS+= assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \ vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c \ wbuf.c wsetup.c string.c stringf.c \ xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c \ - signal.c clock.c config.c shm.c mbdb.c strexit.c cf.c ldap.c \ - niprop.c mpeix.c memstat.c + signal.c clock.c config.c sem.c shm.c mbdb.c strexit.c cf.c ldap.c \ + niprop.c mpeix.c memstat.c util.c CLEANFILES+=sm_os.h INTERNALLIB= true diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile index 8d98fd7705..cc57a7fe0f 100644 --- a/lib/libsmdb/Makefile +++ b/lib/libsmdb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libsmdb/Makefile,v 1.1.2.5 2002/07/19 18:46:26 ru Exp $ -# $DragonFly: src/lib/libsmdb/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/lib/libsmdb/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/libsmdb CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index c30929312d..72b29ac28f 100644 --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libsmutil/Makefile,v 1.1.2.5 2002/07/19 18:46:26 ru Exp $ -# $DragonFly: src/lib/libsmutil/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/lib/libsmutil/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/libsmutil CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index d064baa667..aa39508145 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD: src/libexec/mail.local/Makefile,v 1.10.2.7 2002/03/25 21:31:38 gshapiro Exp $ -# $DragonFly: src/libexec/mail.local/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/libexec/mail.local/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/mail.local PROG= mail.local diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 055e119a7e..df931d578c 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 7/2/95 # $FreeBSD: src/libexec/smrsh/Makefile,v 1.1.6.6 2002/03/25 21:31:40 gshapiro Exp $ -# $DragonFly: src/libexec/smrsh/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/libexec/smrsh/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/smrsh PROG= smrsh diff --git a/libexec/smrsh/patches/smrsh.8.patch b/libexec/smrsh/patches/smrsh.8.patch index 89674a2a94..3b0aa812d5 100644 --- a/libexec/smrsh/patches/smrsh.8.patch +++ b/libexec/smrsh/patches/smrsh.8.patch @@ -1,6 +1,6 @@ -$DragonFly: src/libexec/smrsh/patches/smrsh.8.patch,v 1.2 2006/03/22 18:25:43 gshapiro Exp $ +$DragonFly: src/libexec/smrsh/patches/smrsh.8.patch,v 1.3 2007/04/14 17:43:48 gshapiro Exp $ ---- sendmail-8.13.6/smrsh/smrsh.8 2004-08-05 20:55:35.000000000 -0700 +--- sendmail-8.14/smrsh/smrsh.8 2004-08-05 20:55:35.000000000 -0700 +++ sendmail/smrsh/smrsh.8 2005-02-13 18:39:14.000000000 -0800 @@ -39,7 +39,7 @@ .I smrsh diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile index c9340df95a..339fa809bb 100644 --- a/share/doc/smm/08.sendmailop/Makefile +++ b/share/doc/smm/08.sendmailop/Makefile @@ -1,12 +1,12 @@ # From: @(#)Makefile 8.2 (Berkeley) 2/28/94 # $FreeBSD: src/share/doc/smm/08.sendmailop/Makefile,v 1.5.2.1 2000/10/26 23:05:13 gshapiro Exp $ -# $DragonFly: src/share/doc/smm/08.sendmailop/Makefile,v 1.7 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/share/doc/smm/08.sendmailop/Makefile,v 1.8 2007/04/14 17:43:48 gshapiro Exp $ VOLUME= smm/08.sendmailop SRCS= op.me MACROS= -me -SRCDIR= ${.CURDIR}/../../../../contrib/sendmail-8.13.8/doc/op +SRCDIR= ${.CURDIR}/../../../../contrib/sendmail-8.14/doc/op USE_PIC= yes USE_EQN= yes diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile index bfad3b4540..22036a5f23 100644 --- a/share/sendmail/Makefile +++ b/share/sendmail/Makefile @@ -1,9 +1,9 @@ # $FreeBSD: src/share/sendmail/Makefile,v 1.1.2.7 2003/05/10 17:24:25 gshapiro Exp $ -# $DragonFly: src/share/sendmail/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/share/sendmail/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ # # Doing a make install builds /usr/share/sendmail/ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 CFDIR= cf CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type d -print) CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type f -print) diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile index aaf8618e32..99fc9e4942 100644 --- a/usr.bin/vacation/Makefile +++ b/usr.bin/vacation/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/usr.bin/vacation/Makefile,v 1.6.2.3 2002/03/25 21:31:50 gshapiro Exp $ -# $DragonFly: src/usr.bin/vacation/Makefile,v 1.9 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/usr.bin/vacation/Makefile,v 1.10 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/vacation PROG= vacation diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile index 1eaed384a8..94ac430be8 100644 --- a/usr.sbin/editmap/Makefile +++ b/usr.sbin/editmap/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/usr.sbin/editmap/Makefile,v 1.1.2.1 2002/03/25 21:29:58 gshapiro Exp $ -# $DragonFly: src/usr.sbin/editmap/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/usr.sbin/editmap/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/editmap PROG= editmap diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile index 96aab2515b..16a0893266 100644 --- a/usr.sbin/mailstats/Makefile +++ b/usr.sbin/mailstats/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD: src/usr.sbin/mailstats/Makefile,v 1.1.6.6 2002/03/25 21:31:43 gshapiro Exp $ -# $DragonFly: src/usr.sbin/mailstats/Makefile,v 1.8 2006/08/18 03:06:59 gshapiro Exp $ +# $DragonFly: src/usr.sbin/mailstats/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/mailstats PROG= mailstats diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index 05bd6e60fb..1a39448486 100644 --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.4 (Berkeley) 6/10/97 # $FreeBSD: src/usr.sbin/makemap/Makefile,v 1.2.6.6 2002/03/25 21:31:48 gshapiro Exp $ -# $DragonFly: src/usr.sbin/makemap/Makefile,v 1.8 2006/08/18 03:07:00 gshapiro Exp $ +# $DragonFly: src/usr.sbin/makemap/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/makemap PROG= makemap diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile index 3fcea3885a..2bbc8e8b38 100644 --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD: src/usr.sbin/praliases/Makefile,v 1.1.6.6 2002/03/25 21:31:46 gshapiro Exp $ -# $DragonFly: src/usr.sbin/praliases/Makefile,v 1.8 2006/08/18 03:07:00 gshapiro Exp $ +# $DragonFly: src/usr.sbin/praliases/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 .PATH: ${SENDMAIL_DIR}/praliases PROG= praliases diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 5e5b07905d..c29fb28694 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.8 (Berkeley) 3/28/97 # $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.15.2.13 2002/03/25 21:32:29 gshapiro Exp $ -# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.16 2006/08/18 03:07:00 gshapiro Exp $ +# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.17 2007/04/14 17:43:48 gshapiro Exp $ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.8 +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 SMDIR= ${SENDMAIL_DIR}/sendmail .PATH: ${SMDIR} @@ -66,7 +66,7 @@ CLEANFILES+=sm_os.h !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) # STARTTLS support DISTRIBUTION= crypto -CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL +CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 LDADD+= -lssl -lcrypto DPADD+= ${LIBSSL} ${LIBCRYPTO} .endif diff --git a/usr.sbin/sendmail/mci.c.patch b/usr.sbin/sendmail/mci.c.patch index 0d4dfa86a5..42a69b2bcb 100644 --- a/usr.sbin/sendmail/mci.c.patch +++ b/usr.sbin/sendmail/mci.c.patch @@ -1,4 +1,4 @@ -$DragonFly: src/usr.sbin/sendmail/mci.c.patch,v 1.3 2006/06/14 17:56:12 gshapiro Exp $ +$DragonFly: src/usr.sbin/sendmail/mci.c.patch,v 1.4 2007/04/14 17:43:48 gshapiro Exp $ Index: mci.c =================================================================== @@ -38,7 +38,7 @@ diff -u -r1.1.1.1 mci.c continue; - (void) sm_strlcpy(newptr, e->d_name, -- sizeof newpath - +- sizeof(newpath) - - (newptr - newpath)); + if (sm_strlcpy(newptr, e->d_name, len) >= len) + continue; -- 2.41.0