From 46ba0b785287af8bf902aef711c940b640ae9f45 Mon Sep 17 00:00:00 2001 From: John Marino Date: Tue, 10 Mar 2015 00:53:02 +0100 Subject: [PATCH] Remove NO_SENDMAIL and all it masks, except one The next step in the removal of Sendmail is to remove all the components that NO_SENDMAIL masked, and then remove the internal NO_SENDMAIL knob itself. There is one component that got unmasked though: the etc/sendmail dragonfl*.mc files. I think we may need to keep building these, and they require contrib/sendmail-8.14 source files. I'll figure out what needs to have to remove the contrib directory later. --- Makefile.inc1 | 4 -- bin/Makefile | 5 -- bin/rmail/Makefile | 44 -------------- etc/Makefile | 25 -------- etc/defaults/make.conf | 25 -------- etc/mtree/BSD.sendmail.dist | 15 ----- lib/Makefile | 7 --- lib/libmilter/Makefile | 27 --------- lib/libsm/Makefile | 35 ------------ lib/libsmdb/Makefile | 24 -------- lib/libsmutil/Makefile | 25 -------- libexec/Makefile | 4 -- libexec/mail.local/Makefile | 36 ------------ libexec/smrsh/Makefile | 45 --------------- libexec/smrsh/patches/smrsh.8.patch | 42 -------------- share/Makefile | 4 -- share/doc/smm/08.sendmailop/Makefile | 14 ----- share/doc/smm/Makefile | 5 -- share/man/man5/make.conf.5 | 30 +--------- share/mk/bsd.libnames.mk | 3 - share/mk/sys.mk | 7 --- share/sendmail/Makefile | 35 ------------ usr.bin/Makefile | 5 -- usr.bin/vacation/Makefile | 50 ---------------- usr.sbin/Makefile | 8 --- usr.sbin/editmap/Makefile | 51 ----------------- usr.sbin/mailstats/Makefile | 45 --------------- usr.sbin/makemap/Makefile | 52 ----------------- usr.sbin/praliases/Makefile | 52 ----------------- usr.sbin/sendmail/Makefile | 83 --------------------------- usr.sbin/sendmail/main.c.patch | 85 ---------------------------- usr.sbin/sendmail/srvrsmtp.c.patch | 48 ---------------- 32 files changed, 1 insertion(+), 939 deletions(-) delete mode 100644 bin/rmail/Makefile delete mode 100644 etc/mtree/BSD.sendmail.dist delete mode 100644 lib/libmilter/Makefile delete mode 100644 lib/libsm/Makefile delete mode 100644 lib/libsmdb/Makefile delete mode 100644 lib/libsmutil/Makefile delete mode 100644 libexec/mail.local/Makefile delete mode 100644 libexec/smrsh/Makefile delete mode 100644 libexec/smrsh/patches/smrsh.8.patch delete mode 100644 share/doc/smm/08.sendmailop/Makefile delete mode 100644 share/sendmail/Makefile delete mode 100644 usr.bin/vacation/Makefile delete mode 100644 usr.sbin/editmap/Makefile delete mode 100644 usr.sbin/mailstats/Makefile delete mode 100644 usr.sbin/makemap/Makefile delete mode 100644 usr.sbin/praliases/Makefile delete mode 100644 usr.sbin/sendmail/Makefile delete mode 100644 usr.sbin/sendmail/main.c.patch delete mode 100644 usr.sbin/sendmail/srvrsmtp.c.patch diff --git a/Makefile.inc1 b/Makefile.inc1 index 96ab6cc070..b85cbe5f95 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -482,10 +482,6 @@ crossworld: _worldtmp _bootstrap-tools _obj _build-tools _cross-tools # Checks to be sure system is ready for installworld # installcheck: _iwinit -.if !defined(NO_SENDMAIL) - @pw usershow smmsp || (echo "You may need to run 'make preupgrade' first"; /usr/bin/false) - @pw groupshow smmsp || (echo "You may need to run 'make preupgrade' first"; /usr/bin/false) -.endif @pw usershow _pflogd || (echo "You may need to run 'make preupgrade' first"; /usr/bin/false) @pw groupshow authpf || (echo "You may need to run 'make preupgrade' first"; /usr/bin/false) @pw groupshow _pflogd || (echo "You may need to run 'make preupgrade' first"; /usr/bin/false) diff --git a/bin/Makefile b/bin/Makefile index f8648fe5fb..5a0f21f39f 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,6 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD: src/bin/Makefile,v 1.15.2.2 2000/10/31 09:43:57 dougb Exp $ -# $DragonFly: src/bin/Makefile,v 1.10 2008/05/27 17:10:48 dillon Exp $ SUBDIR= cat \ chio \ @@ -38,10 +37,6 @@ SUBDIR= cat \ uuidgen \ varsym -.if !defined(NO_SENDMAIL) -SUBDIR+=rmail -.endif - # maximum parallelism # SUBDIR_ORDERED= diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile deleted file mode 100644 index d739b5e2bd..0000000000 --- a/bin/rmail/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# @(#)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.10 2007/04/14 17:43:48 gshapiro Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/rmail - -WARNS?= 0 # XXX Not yet. - -PROG= rmail -SRCS= rmail.c -MAN= rmail.8 -CFLAGS+=-I${SENDMAIL_DIR}/include -I. - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -# If you want to have your rmail queuing the mail only, uncomment the -# following: -# CFLAGS+= -DQUEUE_ONLY - -# Not much point this being static. It calls a shared sendmail... -NOSHARED?= NO - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/etc/Makefile b/etc/Makefile index cdc5dacbca..9ab29f44c6 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,9 +1,7 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -.if !defined(NO_SENDMAIL) SUBDIR= sendmail -.endif # Files that should be installed read-only (444) # @@ -59,9 +57,6 @@ DEFAULTS= compilers.conf devfs.conf make.conf mkinitrd.conf periodic.conf \ MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \ BSD.var.dist -.if !defined(NO_SENDMAIL) -MTREE+= BSD.sendmail.dist -.endif PPPCNF= ppp.conf @@ -108,14 +103,6 @@ preupgrade: pw -V ${DESTDIR}/etc useradd mail -u 6 -g 6 \ -c "Mail user" \ -d /nonexistent -s /sbin/nologin -.if !defined(NO_SENDMAIL) - (pw -V ${DESTDIR}/etc groupshow smmsp -q > /dev/null) || \ - pw -V ${DESTDIR}/etc groupadd smmsp -g 25 - (pw -V ${DESTDIR}/etc usershow smmsp -q > /dev/null) || \ - pw -V ${DESTDIR}/etc useradd smmsp -u 25 \ - -c "Sendmail Submission User" \ - -d /var/spool/clientmqueue -s /sbin/nologin -.endif (pw -V ${DESTDIR}/etc usershow _pflogd -q > /dev/null) || \ pw -V ${DESTDIR}/etc useradd _pflogd -u 64 \ -c "pflogd privsep user" \ @@ -178,11 +165,6 @@ upgrade_etc: upgrade_check preupgrade remove-obsolete-files ${LN} -fs /usr/share/misc/termcap ${DESTDIR}/etc/termcap # "../usr.sbin/rmt/make etc-rmt" expanded inline here: ${LN} -fs /usr/sbin/rmt ${DESTDIR}/etc/rmt -.if !defined(BINARY_UPGRADE) # XXX not yet handled by binary upgrade -.if !defined(NO_SENDMAIL) - cd ${UPGRADE_SRCDIR}/sendmail; ${MAKE} upgrade -.endif -.endif cd ${UPGRADE_SRCDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree cd ${UPGRADE_SRCDIR}/bluetooth; ${MAKE} install @@ -290,10 +272,6 @@ distribution: cd ${.CURDIR}; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ Makefile.usr ${DESTDIR}/usr/Makefile -.if !defined(NO_SENDMAIL) - cd ${.CURDIR}/sendmail; ${MAKE} obj - cd ${.CURDIR}/sendmail; ${MAKE} distribution -.endif .for dir in ${DIRS} .if exists(${.CURDIR}/../${dir}/Makefile.etc) cd ${.CURDIR}/../${dir}; ${MAKE} -f Makefile.etc obj @@ -376,9 +354,6 @@ distrib-dirs: mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \ -p ${DESTDIR}/usr/include -.if !defined(NO_SENDMAIL) - mtree -deU -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ -.endif cd ${DESTDIR}/; test -e sys || (rm -f sys; ${LN} -s usr/src/sys sys) cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ${LN} -sf ../man* . cd ${DESTDIR}/usr/share/man; \ diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 249b2d4b67..ce738e65d0 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -213,31 +213,6 @@ STATIC_LOCALES=UTF8 # #SENDMAIL_M4_FLAGS= # -# Setting the following variables modifies the build environment for -# sendmail and its related utilities. For example, SASL support can be -# added with settings such as: -# -# with SASLv1: -# SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL -# SENDMAIL_LDFLAGS=-L/usr/local/lib -# SENDMAIL_LDADD=-lsasl -# -# with SASLv2: -# SENDMAIL_CFLAGS=-I/usr/local/include -DSASL=2 -# SENDMAIL_LDFLAGS=-L/usr/local/lib -# SENDMAIL_LDADD=-lsasl2 -# -# Note: If you are using Cyrus SASL with other applications which require -# access to the sasldb file, you should add the following to your -# sendmail.mc file: -# -# define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile') -# -#SENDMAIL_CFLAGS= -#SENDMAIL_LDFLAGS= -#SENDMAIL_LDADD= -#SENDMAIL_DPADD= -# # Setting SENDMAIL_SET_USER_ID will install the sendmail binary as a # set-user-ID root binary instead of a set-group-ID smmsp binary and will # prevent the installation of /etc/mail/submit.cf. diff --git a/etc/mtree/BSD.sendmail.dist b/etc/mtree/BSD.sendmail.dist deleted file mode 100644 index 1e93537c2b..0000000000 --- a/etc/mtree/BSD.sendmail.dist +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD: src/etc/mtree/BSD.sendmail.dist,v 1.1.2.1 2002/04/28 19:57:43 gshapiro Exp $ -# $DragonFly: src/etc/mtree/BSD.sendmail.dist,v 1.2 2003/06/17 04:24:48 dillon Exp $ -# -# Please see the file src/etc/mtree/README before making changes to this file. -# - -/set type=dir uname=root gname=wheel mode=0755 -. nochange - var nochange - spool nochange - clientmqueue uname=smmsp gname=smmsp mode=0770 - .. - .. - .. -.. diff --git a/lib/Makefile b/lib/Makefile index 34e5bfe119..5c7e3ff2f7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -100,13 +100,6 @@ SUBDIR+= compat/${MACHINE_ARCH} _libc_r= libc_r .endif -.if !defined(NO_SENDMAIL) -_libmilter= libmilter -_libsm= libsm -_libsmdb= libsmdb -_libsmutil= libsmutil -.endif - .if defined(WANT_NETGRAPH7) _libnetgraph= libnetgraph7 .else diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile deleted file mode 100644 index 3ded72d704..0000000000 --- a/lib/libmilter/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $FreeBSD: src/lib/libmilter/Makefile,v 1.1.2.2 2002/07/22 14:21:49 ru Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm - -CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNETINET6 -DNOT_SENDMAIL -Dsm_snprintf=snprintf -CFLAGS+=-D_THREAD_SAFE - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} - -INCSDIR=${INCLUDEDIR}/libmilter -INCS= ${SENDMAIL_DIR}/include/libmilter/mfapi.h \ - ${SENDMAIL_DIR}/include/libmilter/mfdef.h -LIB= milter -WARNS?= 2 - -SRCS+= sm_os.h -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: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile deleted file mode 100644 index ff28ffc269..0000000000 --- a/lib/libsm/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $FreeBSD: src/lib/libsm/Makefile,v 1.1.2.2 2002/07/19 18:46:26 ru Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/libsm - -CFLAGS+= -I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNETINET6 -DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} - -LIB= sm -SHLIBDIR?= /lib -WARNS?= 0 - -SRCS+= sm_os.h -SRCS+= assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \ - strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c \ - fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c \ - fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c \ - fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c \ - smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.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 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 - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile deleted file mode 100644 index bd7e5e3bdd..0000000000 --- a/lib/libsmdb/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $FreeBSD: src/lib/libsmdb/Makefile,v 1.1.2.5 2002/07/19 18:46:26 ru Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/libsmdb - -CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNEWDB -DNOT_SENDMAIL - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} - -LIB= smdb - -SRCS+= sm_os.h -SRCS+= smdb.c smdb1.c smdb2.c smndbm.c -CLEANFILES+=sm_os.h -WARNS?= 2 - -INTERNALLIB= true - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile deleted file mode 100644 index 50325b4736..0000000000 --- a/lib/libsmutil/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $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.9 2007/04/14 17:43:48 gshapiro Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/libsmutil - -CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} - -LIB= smutil - -SRCS+= sm_os.h -SRCS+= debug.c err.c lockfile.c safefile.c snprintf.c cf.c -CLEANFILES+=sm_os.h -WARNS?= 2 - -INTERNALLIB= true - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/libexec/Makefile b/libexec/Makefile index 58cfa948ea..b68db90a88 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -31,10 +31,6 @@ SUBDIR= atrun \ utmp_update \ ypxfr -.if !defined(NO_SENDMAIL) -SUBDIR+=mail.local smrsh -.endif - # maximum parallelism # SUBDIR_ORDERED= diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile deleted file mode 100644 index 1661e8b3e4..0000000000 --- a/libexec/mail.local/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# @(#)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.9 2007/04/14 17:43:48 gshapiro Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/mail.local - -PROG= mail.local -SRCS= mail.local.c -MAN= mail.local.8 -CFLAGS+=-I${SENDMAIL_DIR}/include -I. -WARNS?= 2 - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile deleted file mode 100644 index bef7fc51d4..0000000000 --- a/libexec/smrsh/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# @(#)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 $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/smrsh - -PROG= smrsh -SRCS= smrsh.c -MAN= smrsh.8 -WARNS?= 2 - -CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -PATCHES!= echo ${.CURDIR}/patches/*.patch -.for patch in ${PATCHES} -.for file in ${patch:R:T} -CLEANFILES+= ${file} -${file}: ${SENDMAIL_DIR}/smrsh/${file} ${patch} - patch -s -o ${.TARGET} -i ${patch} ${SENDMAIL_DIR}/smrsh/${file} -.endfor -.endfor - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/libexec/smrsh/patches/smrsh.8.patch b/libexec/smrsh/patches/smrsh.8.patch deleted file mode 100644 index 3b0aa812d5..0000000000 --- a/libexec/smrsh/patches/smrsh.8.patch +++ /dev/null @@ -1,42 +0,0 @@ -$DragonFly: src/libexec/smrsh/patches/smrsh.8.patch,v 1.3 2007/04/14 17:43:48 gshapiro Exp $ - ---- 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 - limits programs to be in a single directory, - by default --/usr/adm/sm.bin, -+/usr/libexec/sm.bin, - allowing the system administrator to choose the set of acceptable commands, - and to the shell builtin commands ``exec'', ``exit'', and ``echo''. - It also rejects any commands with the characters -@@ -50,13 +50,12 @@ - ``"|exec /usr/local/bin/filter || exit 75"'' - .PP - Initial pathnames on programs are stripped, --so forwarding to ``/usr/ucb/vacation'', --``/usr/bin/vacation'', -+so forwarding to ``/usr/bin/vacation'', - ``/home/server/mydir/bin/vacation'', - and - ``vacation'' - all actually forward to --``/usr/adm/sm.bin/vacation''. -+``/usr/libexec/sm.bin/vacation''. - .PP - System administrators should be conservative about populating - the sm.bin directory. -@@ -83,10 +82,10 @@ - Compilation should be trivial on most systems. - You may need to use \-DSMRSH_PATH=\e"\fIpath\fP\e" - to adjust the default search path --(defaults to ``/bin:/usr/bin:/usr/ucb'') -+(defaults to ``/bin:/usr/bin'') - and/or \-DSMRSH_CMDDIR=\e"\fIdir\fP\e" - to change the default program directory --(defaults to ``/usr/adm/sm.bin''). -+(defaults to ``/usr/libexec/sm.bin''). - .SH FILES - /usr/adm/sm.bin \- default directory for restricted programs on most OSs - .PP diff --git a/share/Makefile b/share/Makefile index 029f7d0f6d..210109eec3 100644 --- a/share/Makefile +++ b/share/Makefile @@ -7,10 +7,6 @@ SUBDIR= colldef dict doc examples i18n initrd \ man me misc mk mklocale monetdef msgdef \ numericdef skel syscons tabset termcap terminfo timedef zoneinfo -.if !defined(NO_SENDMAIL) -SUBDIR+= sendmail -.endif - .if defined(WANT_INSTALLER) SUBDIR+= installer .endif diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile deleted file mode 100644 index 339fa809bb..0000000000 --- a/share/doc/smm/08.sendmailop/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# 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.8 2007/04/14 17:43:48 gshapiro Exp $ - -VOLUME= smm/08.sendmailop -SRCS= op.me -MACROS= -me - -SRCDIR= ${.CURDIR}/../../../../contrib/sendmail-8.14/doc/op - -USE_PIC= yes -USE_EQN= yes - -.include diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile index 920e484ded..2bb3c367b6 100644 --- a/share/doc/smm/Makefile +++ b/share/doc/smm/Makefile @@ -1,6 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/10/93 # $FreeBSD: src/share/doc/smm/Makefile,v 1.14.2.3 2002/07/07 08:19:19 dougb Exp $ -# $DragonFly: src/share/doc/smm/Makefile,v 1.2 2003/06/17 04:36:57 dillon Exp $ # The following modules do not describe FreeBSD: # 14.uucpimpl, 15.uucpnet @@ -16,8 +15,4 @@ SUBDIR= title contents 01.setup 02.config 03.fsck 04.quotas 05.fastfs \ 06.nfs 11.timedop \ 12.timed 18.net -.if !defined(NO_SENDMAIL) -SUBDIR+=08.sendmailop -.endif - .include diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 285efbce8c..f2a96dd3b4 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ .\" -.Dd November 28, 2014 +.Dd March 9, 2015 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -516,34 +516,6 @@ when building a file from a .Pa .mc file. -.It Va SENDMAIL_CFLAGS -.Pq Vt str -Flags to pass to the compile command when building -.Xr sendmail 8 . -The -.Va SENDMAIL_* -flags can be used to provide SASL support with setting such as: -.Bd -literal -offset indent -SENDMAIL_CFLAGS=-I/usr/local/include -DSASL -SENDMAIL_LDFLAGS=-L/usr/local/lib -SENDMAIL_LDADD=-lsasl -.Ed -.It Va SENDMAIL_LDFLAGS -.Pq Vt str -Flags to pass to the -.Xr ld 1 -command when building -.Xr sendmail 8 . -.It Va SENDMAIL_LDADD -.Pq Vt str -Flags to add to the end of the -.Xr ld 1 -command when building -.Xr sendmail 8 . -.It Va SENDMAIL_DPADD -.Pq Vt str -Extra dependencies to add when building -.Xr sendmail 8 . .It Va SENDMAIL_SET_USER_ID .Pq Vt bool If set, install diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index ff6dc11ae8..837bc9f541 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -55,9 +55,6 @@ LIBMAGIC?= ${DESTDIR}${LIBDIR}/libmagic.a LIBMANDOC?= ${DESTDIR}${LIBDIR}/libmandoc.a LIBMD?= ${DESTDIR}${LIBDIR}/libmd.a LIBMENU?= ${DESTDIR}${LIBDIR}/libmenu.a -.if !defined(NO_SENDMAIL) -LIBMILTER?= ${DESTDIR}${LIBDIR}/libmilter.a -.endif LIBMYTINFO?= "don't use LIBMYTINFO, use LIBNCURSES" LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 8bb42c521c..39968792e7 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -312,13 +312,6 @@ __MAKE_CONF?=/etc/make.conf .include "${__MAKE_CONF}" .endif -# Temporary - hardcode NO_SENDMAIL after make.conf inclusion to ensure -# sendmail will not be built. After verifying sendmail is effectively out -# of base and DMA functions a replacement, sendmail and NO_SENDMAIL will -# be properly removed from code base. - -NO_SENDMAIL= yes - .include .if exists(/etc/make.conf.local) diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile deleted file mode 100644 index 04263a2f33..0000000000 --- a/share/sendmail/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $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.9 2007/04/14 17:43:48 gshapiro Exp $ -# -# Doing a make install builds /usr/share/sendmail/ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -CFDIR= cf -CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} -type d -print) -CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} -type f -print) - -DDIR= ${DESTDIR}/usr/share/sendmail - -NOOBJ= noobj - -# Define SHARED to indicate whether you want symbolic links to the system -# source (``symlinks''), or a separate copy (``copies'') -SHARED?= copies - -all clean cleandir depend lint tags: - -beforeinstall: ${SHARED} - -copies:: - if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi -.for dir in ${CFDIRS} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir} -.endfor -.for file in ${CFFILES} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} -.endfor - -symlinks:: - rm -rf ${DDIR}/${CFDIR}; ${LN} -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR} - -.include diff --git a/usr.bin/Makefile b/usr.bin/Makefile index d727613eb8..4442797f1d 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -256,11 +256,6 @@ SUBDIR+=bc \ dc .endif - -.if !defined(NO_SENDMAIL) -SUBDIR+=vacation -.endif - .if ${MACHINE_ARCH} == "i386" # Things that don't compile on x86_64 or are i386 specific: SUBDIR+=smbutil diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile deleted file mode 100644 index 840aa66e36..0000000000 --- a/usr.bin/vacation/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# $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.11 2007/08/27 16:51:00 pavalos Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/vacation - -PROG= vacation -SRCS= vacation.c -CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNEWDB -DNOT_SENDMAIL -CFLAGS+=-D_FFR_LISTDB -D_FFR_DEBUG -WARNS?= 2 - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -.if exists(${.OBJDIR}/../../lib/libsmdb) -LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb -.else -LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR -.endif -LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a - -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil -.else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR -.endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 6a0430e7cc..b37d8b0df6 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -151,14 +151,6 @@ SUBDIR+=lpr SUBDIR+=nscd .endif -.if !defined(NO_SENDMAIL) -SUBDIR+=editmap \ - mailstats \ - makemap \ - praliases \ - sendmail -.endif - .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" SUBDIR+=apm \ apmd \ diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile deleted file mode 100644 index 94b7736a90..0000000000 --- a/usr.sbin/editmap/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# $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.9 2007/04/14 17:43:48 gshapiro Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/editmap - -PROG= editmap -SRCS= editmap.c -MAN= editmap.8 -WARNS?= 2 - -CFLAGS+= -I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+= -DNEWDB -DNOT_SENDMAIL - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -.if exists(${.OBJDIR}/../../lib/libsmdb) -LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb -.else -LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR -.endif -LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a - -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil -.else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR -.endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile deleted file mode 100644 index 608fee4c6a..0000000000 --- a/usr.sbin/mailstats/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# @(#)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.9 2007/04/14 17:43:48 gshapiro Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/mailstats - -PROG= mailstats -SRCS= mailstats.c -MAN= mailstats.8 -WARNS?= 2 - -CFLAGS+= -I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+= -DNOT_SENDMAIL - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil -.else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR -.endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMUTIL} ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile deleted file mode 100644 index 28fc59be97..0000000000 --- a/usr.sbin/makemap/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# @(#)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.9 2007/04/14 17:43:48 gshapiro Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/makemap - -PROG= makemap -SRCS= makemap.c -MAN= makemap.8 -WARNS?= 2 - -CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNEWDB -DNOT_SENDMAIL - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -.if exists(${.OBJDIR}/../../lib/libsmdb) -LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb -.else -LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR -.endif -LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a - -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil -.else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR -.endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile deleted file mode 100644 index d78466406c..0000000000 --- a/usr.sbin/praliases/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# @(#)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.9 2007/04/14 17:43:48 gshapiro Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -.PATH: ${SENDMAIL_DIR}/praliases - -PROG= praliases -SRCS= praliases.c -MAN= praliases.8 -WARNS?= 2 - -CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I. -CFLAGS+=-DNEWDB -DNOT_SENDMAIL - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -.if exists(${.OBJDIR}/../../lib/libsmdb) -LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb -.else -LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR -.endif -LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a - -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil -.else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR -.endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a - -DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} -LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile deleted file mode 100644 index 9b8d8d8774..0000000000 --- a/usr.sbin/sendmail/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# @(#)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.19 2008/03/04 19:23:05 dillon Exp $ - -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14 -SMDIR= ${SENDMAIL_DIR}/sendmail -.PATH: ${SMDIR} - -CONTRIBDIR= ${SMDIR} -PATCHES= main.c.patch srvrsmtp.c.patch - -BINDIR= /usr/libexec/sendmail - -PROG= sendmail -MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 -MLINKS+=sendmail.8 hoststat.8 -MLINKS+=sendmail.8 purgestat.8 -SRCS= alias.c arpadate.c bf.c collect.c conf.c control.c \ - convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \ - macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \ - ratectrl.c readcf.c recipient.c savemail.c sasl.c sfsasl.c \ - shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c \ - timers.c tls.c trace.c udb.c usersmtp.c util.c version.c ${PATCHES} -WARNS?= 0 -BINOWN= root -BINGRP= smmsp -.ifdef SENDMAIL_SET_USER_ID -BINMODE=4555 -.else -BINMODE=2555 -.endif - -# Define the database format to use for aliases et al. -DBMDEF= -DNEWDB -# If you don't want NIS alias/map support, comment out this line -NIS= -DNIS -# Map extensions -MAPS= -DMAP_REGEX -DDNSMAP - -CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I. -CFLAGS+= ${DBMDEF} ${NIS} -DMILTER -DNETINET6 -DTCPWRAPPERS ${MAPS} - -DPADD= ${LIBUTIL} ${LIBWRAP} -LDADD= -lutil -lwrap - -.if exists(${.OBJDIR}/../../lib/libsm) -LIBSMDIR:= ${.OBJDIR}/../../lib/libsm -.else -LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR -.endif -LIBSM:= ${LIBSMDIR}/libsm.a - -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil -.else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR -.endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a - -DPADD+= ${LIBSMUTIL} ${LIBSM} -LDADD+= ${LIBSMUTIL} ${LIBSM} - -SRCS+= sm_os.h -CLEANFILES+=sm_os.h - -.if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT) && \ - !defined(NO_OPENSSL) -# STARTTLS support -CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 -LDADD+= -lssl -lcrypto -DPADD+= ${LIBSSL} ${LIBCRYPTO} -.endif - -# User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} - -sm_os.h: - ${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_dragonfly.h sm_os.h - -.include diff --git a/usr.sbin/sendmail/main.c.patch b/usr.sbin/sendmail/main.c.patch deleted file mode 100644 index 2e03a64e1c..0000000000 --- a/usr.sbin/sendmail/main.c.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- main.c 2014-08-20 09:45:52.585530000 -0700 -+++ main.c 2014-08-22 11:29:54.792973000 -0700 -@@ -169,6 +169,7 @@ - char warn_f_flag = '\0'; - bool run_in_foreground = false; /* -bD mode */ - bool queuerun = false, debug = false; -+ bool queueintvl = false; - struct passwd *pw; - struct hostent *hp; - char *nullserver = NULL; -@@ -482,6 +483,8 @@ - case 'q': - /* just check if it is there */ - queuerun = true; -+ if (optarg[0]) -+ queueintvl = true; - break; - } - } -@@ -707,6 +710,25 @@ - /* version */ - macdefine(&BlankEnvelope.e_macro, A_PERM, 'v', Version); - -+ /* -+ * We have to fork early if starting as a daemon to -+ * prevent resolver lookup problems (e.g. no net available) -+ * from stalling the rc boot. -+ */ -+ if (OpMode == MD_DAEMON || queueintvl == true) { -+ /* put us in background */ -+ i = fork(); -+ if (i < 0) -+ syserr("daemon: cannot fork"); -+ if (i != 0) -+ { -+ finis(false, true, EX_OK); -+ /* NOTREACHED */ -+ } -+ disconnect(2, CurEnv); -+ CurrentPid = getpid(); -+ } -+ - /* hostname */ - hp = myhostname(jbuf, sizeof(jbuf)); - if (jbuf[0] != '\0') -@@ -2305,6 +2327,7 @@ - ** doing it in background. - ** We check for any errors that might have happened - ** during startup. -+ ** We have ALREADY forked if a daemon. - */ - - if (OpMode == MD_DAEMON || QueueIntvl > 0) -@@ -2315,6 +2338,7 @@ - DaemonPid = 0; - if (!run_in_foreground && !tTd(99, 100)) - { -+#if 0 - /* put us in background */ - i = fork(); - if (i < 0) -@@ -2324,6 +2348,7 @@ - finis(false, true, EX_OK); - /* NOTREACHED */ - } -+#endif - - /* - ** Initialize exception stack and default exception -@@ -2563,9 +2588,12 @@ - macdefine(&BlankEnvelope.e_macro, A_TEMP, '_', authinfo); - - /* at this point we are in a child: reset state */ -- sm_rpool_free(MainEnvelope.e_rpool); -- (void) newenvelope(&MainEnvelope, &MainEnvelope, -- sm_rpool_new_x(NULL)); -+ { -+ SM_RPOOL_T *opool = MainEnvelope.e_rpool; -+ (void) newenvelope(&MainEnvelope, &MainEnvelope, -+ sm_rpool_new_x(NULL)); -+ sm_rpool_free(opool); -+ } - } - - if (LogLevel > 9) diff --git a/usr.sbin/sendmail/srvrsmtp.c.patch b/usr.sbin/sendmail/srvrsmtp.c.patch deleted file mode 100644 index a482f502dc..0000000000 --- a/usr.sbin/sendmail/srvrsmtp.c.patch +++ /dev/null @@ -1,48 +0,0 @@ -$DragonFly: src/usr.sbin/sendmail/srvrsmtp.c.patch,v 1.2 2008/03/04 19:23:05 dillon Exp $ - -Index: srvrsmtp.c -=================================================================== -RCS file: /cvs/src/contrib/sendmail-8.14/sendmail/srvrsmtp.c,v -retrieving revision 1.1.1.2 -diff -u -p -r1.1.1.2 srvrsmtp.c ---- srvrsmtp.c 5 Nov 2007 01:37:48 -0000 1.1.1.2 -+++ srvrsmtp.c 4 Mar 2008 19:17:35 -0000 -@@ -465,6 +465,8 @@ /* clear all SMTP state (for HELO/EHLO/R - #define CLEAR_STATE(cmd) \ - do \ - { \ -+ SM_RPOOL_T *orpool; \ -+ \ - /* abort milter filters */ \ - MILTER_ABORT(e); \ - \ -@@ -490,8 +489,9 @@ /* clean up a bit */ \ - smtp.sm_gotmail = false; \ - SuprErrs = true; \ - (void) dropenvelope(e, true, false); \ -- sm_rpool_free(e->e_rpool); \ -+ orpool = e->e_rpool; \ - e = newenvelope(e, CurEnv, sm_rpool_new_x(NULL)); \ -+ sm_rpool_free(orpool); \ - CurEnv = e; \ - e->e_features = features; \ - \ -@@ -3345,6 +3288,7 @@ char *id; - char *oldid; - unsigned int features; - char buf[32]; -+ SM_RPOOL_T *orpool; - - SmtpPhase = "server DATA"; - if (!smtp->sm_gotmail) -@@ -3863,8 +3863,9 @@ - - CurEnv = e; - features = e->e_features; -- sm_rpool_free(e->e_rpool); -+ orpool = e->e_rpool; - newenvelope(e, e, sm_rpool_new_x(NULL)); -+ sm_rpool_free(orpool); - e->e_flags = BlankEnvelope.e_flags; - e->e_features = features; - -- 2.41.0