Permalink
Browse files

Retire sendmail in favour of OpenSMTPD.

ok oga@, general giddiness in the hackroom@
  • Loading branch information...
Thordur Bjornsson
Thordur Bjornsson committed Jun 20, 2012
1 parent a8c2695 commit 1ac1b57f62844b0419a359f4b040e7c99f68b9ce
Showing 576 changed files with 10 additions and 195,812 deletions.
View
@@ -52,7 +52,7 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
ftpd ftpproxy hostapd hotplugd identd ifstated iked \
inetd isakmpd ldapd ldattach ldpd lpd mopd mrouted named nginx \
nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd relayd ripd \
route6d rtadvd rtsold rwhod sasyncd sendmail sensorsd smtpd \
route6d rtadvd rtsold rwhod sasyncd sensorsd smtpd \
snmpd spamd sshd syslogd watchdogd wsmoused xdm ypbind ypldap \
yppasswdd ypserv kdc kadmind kpasswdd nfsd mountd lockd statd \
spamlogd sndiod popa3d tftpd
@@ -241,15 +241,12 @@ distribution-etc-root-var: distrib-dirs
${DESTDIR}/var/log/messages
${INSTALL} -c -o ${BINOWN} -g wheel -m 600 /dev/null \
${DESTDIR}/var/log/secure
${INSTALL} -c -o ${BINOWN} -g wheel -m 664 /dev/null \
${DESTDIR}/var/log/sendmail.st
${INSTALL} -c -o ${BINOWN} -g wheel -m 644 /dev/null \
${DESTDIR}/var/log/wtmp
${INSTALL} -c -o ${BINOWN} -g wheel -m 640 /dev/null \
${DESTDIR}/var/log/xferlog
${INSTALL} -c -o ${BINOWN} -g utmp -m 664 /dev/null \
${DESTDIR}/var/run/utmp
cd ../gnu/usr.sbin/sendmail/cf/cf && exec ${MAKE} distribution
cd ../usr.sbin/ypserv/ypinit && exec ${MAKE} distribution
cd ../usr.bin/ssh && exec ${MAKE} distribution
cd ../lib/libssl && exec ${MAKE} distribution
View
@@ -67,7 +67,6 @@
/etc/mail/mailertable
/etc/mail/relay-domains
+/etc/mail/secrets
/etc/mail/sendmail.cf
/etc/mail/smtpd.conf
/etc/mail/spamd.conf
/etc/mail/submit.cf
View
@@ -8,8 +8,6 @@ HOME=/var/log
#
#minute hour mday month wday command
#
# sendmail clientmqueue runner
*/30 * * * * /usr/sbin/sendmail -L sm-msp-queue -Ac -q
#
# rotate log files every hour, if necessary
0 * * * * /usr/bin/newsyslog
View
@@ -1,79 +1,13 @@
# $OpenBSD: Makefile,v 1.7 2009/04/02 10:21:08 jacekm Exp $
#
# Generate the various .db versions from their source files.
# The sendmail .mc files are not built here. They live in
# /usr/share/sendmail/cf and have their own Makefile.
#
SENDMAIL= /usr/libexec/sendmail/sendmail
MAKEMAP= /usr/libexec/sendmail/makemap
.for DB in access aliases genericstable mailertable virtusertable userdb
. if exists(${DB})
DB_FILES+= ${DB}.db
. endif
.endfor
all: ${DB_FILES}
clean:
rm -f ${DB_FILES}
distribution:
${INSTALL} -c -o root -g wheel -m 644 Makefile \
${DESTDIR}/etc/mail/Makefile
${INSTALL} -c -o root -g wheel -m 644 README \
${DESTDIR}/etc/mail/README
${INSTALL} -c -o root -g wheel -m 644 access \
${DESTDIR}/etc/mail/access
${MAKEMAP} hash ${DESTDIR}/etc/mail/access < access
${INSTALL} -c -o root -g wheel -m 644 aliases \
${DESTDIR}/etc/mail/aliases
${SENDMAIL} -C${DESTDIR}/etc/mail/sendmail.cf \
-bi -O AliasFile=${DESTDIR}/etc/mail/aliases \
-O DontBlameSendmail=mapinunsafedirpath
${INSTALL} -c -o root -g wheel -m 644 local-host-names \
${DESTDIR}/etc/mail/local-host-names
${INSTALL} -c -o root -g wheel -m 644 genericstable \
${DESTDIR}/etc/mail/genericstable
${MAKEMAP} hash ${DESTDIR}/etc/mail/genericstable < genericstable
${INSTALL} -c -o root -g wheel -m 644 mailertable \
${DESTDIR}/etc/mail/mailertable
${MAKEMAP} hash ${DESTDIR}/etc/mail/mailertable < mailertable
${INSTALL} -c -o root -g wheel -m 644 relay-domains \
${DESTDIR}/etc/mail/relay-domains
${INSTALL} -c -o root -g wheel -m 644 trusted-users \
${DESTDIR}/etc/mail/trusted-users
${INSTALL} -c -o root -g wheel -m 644 virtusertable \
${DESTDIR}/etc/mail/virtusertable
${INSTALL} -c -o root -g wheel -m 644 spamd.conf \
${DESTDIR}/etc/mail/spamd.conf
${INSTALL} -c -o root -g wheel -m 644 smtpd.conf \
${DESTDIR}/etc/mail/smtpd.conf
${MAKEMAP} hash ${DESTDIR}/etc/mail/virtusertable < virtusertable
@for db in access.db aliases.db genericstable.db mailertable.db \
virtusertable.db; do \
chmod 644 ${DESTDIR}/etc/mail/$$db; \
done
access.db: access
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
aliases.db: aliases
${SENDMAIL} -bi
genericstable.db: genericstable
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
mailertable.db: mailertable
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
virtusertable.db: virtusertable
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
userdb.db: userdb
${MAKEMAP} btree ${.ALLSRC} < ${.ALLSRC}
.PHONY: distribution
.PHONY: all
.include <bsd.own.mk>
.include <bsd.sys.mk>
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View
@@ -1,11 +1,5 @@
# $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
sendmail /usr/sbin/smtpctl
send-mail /usr/sbin/smtpctl
mailq /usr/sbin/smtpctl
makemap /usr/libexec/smtpd/makemap
newaliases /usr/libexec/smtpd/makemap
Oops, something went wrong.

0 comments on commit 1ac1b57

Please sign in to comment.