diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-03-16 14:26:26 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-03-16 14:26:26 +0000 |
| commit | 2c34d09c93e28b4a984aec52b13174a5e2519b51 (patch) | |
| tree | 22ce0b2d6b59dc9d2328e137daea6b4b8cec40cc | |
| parent | d2df23ef7f71c70cc115afa1e03e2a208313709a (diff) | |
run makemap through mailwrapper(8), to avoid conflict between
sendmail and smtpd.
ok gilles@, "Go go go!" todd@
| -rw-r--r-- | etc/mailer.conf | 3 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/makemap/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/mailwrapper/Makefile | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/etc/mailer.conf b/etc/mailer.conf index 994e6c75508..8f6d12be20e 100644 --- a/etc/mailer.conf +++ b/etc/mailer.conf @@ -1,10 +1,11 @@ -# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $ +# $OpenBSD: mailer.conf,v 1.4 2009/03/16 14:26:22 jacekm Exp $ # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # sendmail /usr/libexec/sendmail/sendmail send-mail /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail +makemap /usr/libexec/sendmail/makemap newaliases /usr/libexec/sendmail/sendmail hoststat /usr/libexec/sendmail/sendmail purgestat /usr/libexec/sendmail/sendmail diff --git a/gnu/usr.sbin/sendmail/makemap/Makefile b/gnu/usr.sbin/sendmail/makemap/Makefile index 54323ca86fb..79b287b8ffb 100644 --- a/gnu/usr.sbin/sendmail/makemap/Makefile +++ b/gnu/usr.sbin/sendmail/makemap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/09/11 19:02:49 millert Exp $ +# $OpenBSD: Makefile,v 1.5 2009/03/16 14:26:24 jacekm Exp $ PROG= makemap MAN= makemap.8 @@ -9,4 +9,7 @@ WANT_LIBSMDB=1 WANT_LIBSMUTIL=1 .include "../../Makefile.inc" + +BINDIR=/usr/libexec/sendmail + .include <bsd.prog.mk> diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index 8c45d6b60fa..434675223a0 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2000/04/06 01:05:38 millert Exp $ +# $OpenBSD: Makefile,v 1.4 2009/03/16 14:26:25 jacekm Exp $ PROG= mailwrapper MAN= mailwrapper.8 mailer.conf.5 @@ -10,6 +10,7 @@ afterinstall: ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/sbin/sendmail ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/newaliases ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/mailq + ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/makemap ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/hoststat ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/purgestat |