[src/trunk]: src/gnu/usr.sbin/sendmail Enable MILTER support in the in-tree s...

[atatat <atatat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3b6767d24c2d
branches:  trunk
changeset: 549047:3b6767d24c2d
user:      atatat <atatat%NetBSD.org@localhost>
date:      Fri Jul 04 04:52:59 2003 +0000

description:
Enable MILTER support in the in-tree sendmail.  This entails
installing two new libraries (and two lint thingys, but no shared or
pic stuff) and two headers files (into /usr/include/milter).

Shared libraries (etc) could be built, but as I'm currently unsure of
the ABI/API stability, I'm going to examine it more closely before
enabling it, as opposed to finding out later that it's volatile and
disabling it.

NOTE!  We really ought to have a generic rc.d script to start the
milters (before sendmail or any other MTA that you have that uses
them), but I haven't finished it yet.  The milter support here is
being enabled to satisfy current popular demand.  I'll come up with a
script soon.  Unless someone feels like beating me to it.  So until
then, you're on your own.

diffstat:

 gnu/usr.sbin/sendmail/Makefile           |   4 ++--
 gnu/usr.sbin/sendmail/Makefile.inc       |   3 ++-
 gnu/usr.sbin/sendmail/cf/cf/Makefile     |   4 +++-
 gnu/usr.sbin/sendmail/libmilter/Makefile |  27 +++++++++++++++++++++++++++
 gnu/usr.sbin/sendmail/libsm/Makefile     |   4 +---
 gnu/usr.sbin/sendmail/sendmail/Makefile  |   7 ++++++-
 6 files changed, 41 insertions(+), 8 deletions(-)

diffs (120 lines):

diff -r ed4f6c4779d0 -r 3b6767d24c2d gnu/usr.sbin/sendmail/Makefile
--- a/gnu/usr.sbin/sendmail/Makefile    Fri Jul 04 04:46:14 2003 +0000
+++ b/gnu/usr.sbin/sendmail/Makefile    Fri Jul 04 04:52:59 2003 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.5 2003/03/24 15:04:03 atatat Exp $
+#      $NetBSD: Makefile,v 1.6 2003/07/04 04:52:59 atatat Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR=                libsm libsmdb libsmutil .WAIT \
+SUBDIR=                libsm libsmdb libsmutil libmilter .WAIT \
                    sendmail mailstats makemap editmap praliases smrsh
 
 .if ${MKDOC} != "no"
diff -r ed4f6c4779d0 -r 3b6767d24c2d gnu/usr.sbin/sendmail/Makefile.inc
--- a/gnu/usr.sbin/sendmail/Makefile.inc        Fri Jul 04 04:46:14 2003 +0000
+++ b/gnu/usr.sbin/sendmail/Makefile.inc        Fri Jul 04 04:52:59 2003 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile.inc,v 1.7 2003/03/24 15:04:03 atatat Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2003/07/04 04:52:59 atatat Exp $
 
 WARNS?=        0
 
 CPPFLAGS+=     -DNEWDB -DDNSMAP -DIP_SRCROUTE
 CPPFLAGS+=     -DMAP_REGEX -DTCPWRAPPERS -DNETISO
 CPPFLAGS+=     -DNEEDSGETIPNODE -DNETINET6
+CPPFLAGS+=     -DMILTER
 CPPFLAGS+=     -I. -I${.CURDIR}/../include \
                -I${DIST}/sendmail/sendmail -I${DIST}/sendmail/include
 
diff -r ed4f6c4779d0 -r 3b6767d24c2d gnu/usr.sbin/sendmail/cf/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile      Fri Jul 04 04:46:14 2003 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile      Fri Jul 04 04:52:59 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2003/04/03 19:13:31 christos Exp $
+#      $NetBSD: Makefile,v 1.25 2003/07/04 04:52:59 atatat Exp $
 #      install these sources in /usr/share/sendmail/cf
 
 .include <bsd.own.mk>
@@ -39,8 +39,10 @@
 distribution: netbsd-proto.cf netbsd-msp.cf
        ${INSTALL_FILE} -o root -g wheel -m 444 \
            netbsd-proto.cf ${DESTDIR}/etc/mail/sendmail.cf
+.if !defined(SENDMAIL_SUIDROOT) || ${SENDMAIL_SUIDROOT} != "yes"
        ${INSTALL_FILE} -o root -g wheel -m 444 \
            netbsd-msp.cf ${DESTDIR}/etc/mail/submit.cf
+.endif
 
 # this is overkill, but....
 .include <../domain/Makefile.inc>
diff -r ed4f6c4779d0 -r 3b6767d24c2d gnu/usr.sbin/sendmail/libmilter/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/usr.sbin/sendmail/libmilter/Makefile  Fri Jul 04 04:52:59 2003 +0000
@@ -0,0 +1,27 @@
+#      $NetBSD: Makefile,v 1.1 2003/07/04 04:52:59 atatat Exp $
+
+NOPIC=         # defined
+NOPROFILE=     # defined
+
+.include <bsd.own.mk>
+
+DIST=          ${NETBSDSRCDIR}/gnu/dist
+.PATH: ${DIST}/sendmail/libmilter ${DIST}/sendmail/include/libmilter
+
+LIB=           milter
+
+CPPFLAGS+=     -DNOT_SENDMAIL
+
+SRCS=          comm.c engine.c handler.c listener.c main.c signal.c \
+               sm_gethost.c smfi.c
+
+INCS=          mfapi.h mfdef.h
+INCSDIR=       /usr/include/milter
+
+.if ${MKSHARE} != "no"
+FILESDIR=      /usr/share/sendmail
+FILES=         README
+FILESNAME_README=README.milter
+.endif
+
+.include <bsd.lib.mk>
diff -r ed4f6c4779d0 -r 3b6767d24c2d gnu/usr.sbin/sendmail/libsm/Makefile
--- a/gnu/usr.sbin/sendmail/libsm/Makefile      Fri Jul 04 04:46:14 2003 +0000
+++ b/gnu/usr.sbin/sendmail/libsm/Makefile      Fri Jul 04 04:52:59 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2003/03/24 15:04:06 atatat Exp $
+#      $NetBSD: Makefile,v 1.2 2003/07/04 04:52:59 atatat Exp $
 
 NOSHARE=       # defined
 NOPIC=         # defined
@@ -26,6 +26,4 @@
                vfscanf.c vprintf.c vsnprintf.c vsprintf.c vsscanf.c \
                wbuf.c wsetup.c xtrap.c
 
-libinstall::
-
 .include <bsd.lib.mk>
diff -r ed4f6c4779d0 -r 3b6767d24c2d gnu/usr.sbin/sendmail/sendmail/Makefile
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile   Fri Jul 04 04:46:14 2003 +0000
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile   Fri Jul 04 04:52:59 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2003/03/24 15:04:08 atatat Exp $
+#      $NetBSD: Makefile,v 1.11 2003/07/04 04:52:59 atatat Exp $
 
 .include <bsd.own.mk>
 
@@ -9,8 +9,13 @@
 PROG=          sendmail
 
 OBINGRP:=      ${BINGRP}
+.if !defined(SENDMAIL_SUIDROOT) || ${SENDMAIL_SUIDROOT} != "yes"
 BINGRP=                smmsp
 BINMODE=       2555
+.else
+BINOWN=                root
+BINMODE=       4555
+.endif
 
 LIBSMUTILDIR!= cd ${.CURDIR}/../libsmutil && ${PRINTOBJDIR}
 LIBSMDIR!=     cd ${.CURDIR}/../libsm && ${PRINTOBJDIR}