Page MenuHomeFreeBSD
Files F148719384

D17290.1788249732.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D17290.1788249732.diff
View Options

Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -24,13 +24,8 @@
.if ${MK_SENDMAIL} != "no"
BIN1+= rc.sendmail
-.endif
-
-.if ${MK_SENDMAIL} == "no"
-ETCMAIL=mailer.conf aliases
-.else
-ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
- mailertable.sample aliases
+ETCMAIL=Makefile README access.sample virtusertable.sample \
+ mailertable.sample
.endif
# Special top level files for FreeBSD
@@ -100,10 +95,6 @@
.if ${MK_MAIL} != "no"
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${ETCMAIL} ${DESTDIR}/etc/mail
- if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
- ! -f ${DESTDIR}/etc/aliases ]; then \
- ${INSTALL_SYMLINK} mail/aliases ${DESTDIR}/etc/aliases; \
- fi
.endif
.if ${MK_LOCATE} != "no"
${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
Index: etc/mail/aliases
===================================================================
--- etc/mail/aliases
+++ etc/mail/aliases
@@ -1,79 +0,0 @@
-# $FreeBSD$
-# @(#)aliases 5.3 (Berkeley) 5/24/90
-#
-# Aliases in this file will NOT be expanded in the header from
-# Mail, but WILL be visible over networks.
-#
-# >>>>>>>>>> The program "newaliases" must be run after
-# >> NOTE >> this file is updated for any changes to
-# >>>>>>>>>> show through to sendmail.
-#
-#
-# See also RFC 2142, `MAILBOX NAMES FOR COMMON SERVICES, ROLES
-# AND FUNCTIONS', May 1997
-# http://tools.ietf.org/html/rfc2142
-
-# Pretty much everything else in this file points to "root", so
-# you would do well in either reading root's mailbox or forwarding
-# root's email from here.
-
-# root: me@my.domain
-
-# Basic system aliases -- these MUST be present
-MAILER-DAEMON: postmaster
-postmaster: root
-
-# General redirections for pseudo accounts
-_dhcp: root
-_pflogd: root
-auditdistd: root
-bin: root
-bind: root
-daemon: root
-games: root
-hast: root
-kmem: root
-mailnull: postmaster
-man: root
-news: root
-nobody: root
-operator: root
-pop: root
-proxy: root
-smmsp: postmaster
-sshd: root
-system: root
-toor: root
-tty: root
-usenet: news
-uucp: root
-
-# Well-known aliases -- these should be filled in!
-# manager:
-# dumper:
-
-# BUSINESS-RELATED MAILBOX NAMES
-# info:
-# marketing:
-# sales:
-# support:
-
-# NETWORK OPERATIONS MAILBOX NAMES
-abuse: root
-# noc: root
-security: root
-
-# SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES
-ftp: root
-ftp-bugs: ftp
-# hostmaster: root
-# webmaster: root
-# www: webmaster
-
-# NOTE: /var/msgs and /var/msgs/bounds must be owned by sendmail's
-# DefaultUser (defaults to mailnull) for the msgs alias to work.
-#
-# msgs: "| /usr/bin/msgs -s"
-
-# bit-bucket: /dev/null
-# dev-null: bit-bucket
Index: etc/mail/mailer.conf
===================================================================
--- etc/mail/mailer.conf
+++ etc/mail/mailer.conf
@@ -1,9 +0,0 @@
-# $FreeBSD$
-#
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
-#
-sendmail /usr/libexec/sendmail/sendmail
-mailq /usr/libexec/sendmail/sendmail
-newaliases /usr/libexec/sendmail/sendmail
-hoststat /usr/libexec/sendmail/sendmail
-purgestat /usr/libexec/sendmail/sendmail
Index: usr.sbin/mailwrapper/Makefile
===================================================================
--- usr.sbin/mailwrapper/Makefile
+++ usr.sbin/mailwrapper/Makefile
@@ -19,6 +19,12 @@
.if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no"
SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper
.endif
+
+CONFS= aliases
+CONFSDIR= /etc/mail
+
+afterinstallconfig:
+ ${INSTALL_SYMLINK} ${TAG_ARGS} mail/aliases ${DESTDIR}/etc/aliases
.endif
.if ${MK_MAILWRAPPER} != "no" && ${MK_SENDMAIL} == "no"
@@ -26,11 +32,7 @@
.endif
.if ${MK_MAILWRAPPER} != "no"
-.if !exists(${DESTDIR}/etc/mail/mailer.conf)
-FILES= ${SRCTOP}/etc/mail/mailer.conf
-FILESDIR= /etc/mail
-FILESMODE= 644
-.endif
+CONFS+= mailer.conf
.endif
.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 8:02 AM (18 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29496335
Default Alt Text
D17290.1788249732.diff (3 KB)

Event Timeline