> On Mon, Dec 07, 2015 at 05:40:50AM -0700, Sunil Nimmagadda wrote:
> > CVSROOT: /cvs
> > Module name: www
> > Changes by: su...@cvs.openbsd.org 2015/12/07 05:40:50
> >
> > Modified files:
> > faq : current.html
> >
> > Log message:
> > Document merging of makemap(8) into smtpctl(8).
> >
> > Ok gilles@, jung@
> >
>
> I'm confused:
>
> It says "$ rm -f /usr/libexec/smtpd/makemap", but etc/mail/Makefile
> still contains
>
> MAKEMAP= /usr/libexec/smtpd/makemap
> [...]
> ${MAKEMAP} -t aliases -o ${DESTDIR}/etc/mail/aliases.db \
> ${DESTDIR}/etc/mail/aliases
>
> thus breaking 'make build'.
>
> If I read the source of smtpctl.c correctly, it seems that
> smtpctl/Makefile is missing a LINKS=... line and the above needs to be
> adjusted, no?
>
Thanks for spotting it, I missed this entry in etc/mail/Makefile.
The idea was to remove yet another executable and use smtpctl(8)
for makemap/newaliases. This diff should fix it. Instead of hardcoding
a specific implementation of makemap path, use the standard mailwrapper
makemap path which will call the configured executable in mailer.conf.
Index: Makefile
===================================================================
RCS file: /cvs/src/etc/mail/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 26 May 2015 14:34:59 -0000 1.11
+++ Makefile 8 Dec 2015 07:10:56 -0000
@@ -3,7 +3,7 @@
# Generate the various .db versions from their source files.
DB_FILES= aliases.db
-MAKEMAP= /usr/libexec/smtpd/makemap
+MAKEMAP= /usr/sbin/makemap
all: ${DB_FILES}
