- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Merge a number of changes required to hook up OpenBSM 1.2-alpha2's
auditdistd (distributed audit daemon) to the build:

- Manual cross references
- Makefile for auditdistd
- rc.d script, rc.conf entrie
- New group and user for auditdistd; associated aliases, etc.

The audit trail distribution daemon provides reliable,
cryptographically protected (and sandboxed) delivery of audit tails
from live clients to audit server hosts in order to both allow
centralised analysis, and improve resilience in the event of client
compromises: clients are not permitted to change trail contents
after submission.

Submitted by: pjd
Sponsored by: The FreeBSD Foundation (auditdistd)

o Add user 'hast'.

Add the URL for RFC2142

PR: conf/127510

Use better examples (and comment them out for safety).

PR: 118837
Submitted by: Matthew Seaman
MFC after: 1 week

Finish adding _dhcp user.

Add user _pflogd.

Remove trailing space.

Submitted by: jens

o Add user proxy.

Bow to popular demand and default SENDMAIL_SUBMIT_MC to
`hostname`.submit.mc which is templated from freebsd.submit.mc if the
default file does not exist. This makes the building of the submit.cf
behavior identical to that of the the sendmail.cf.

PR: 44256
Submitted by: Matt Emmerton <matt@gsicomp.on.ca>
MFC after: 5 days

Style fixes: tab after a dependency operator should be a single space
second level indent of tab should be four spaces

Submitted by: ru
MFC after: 3 days

xten isn't needed after tw is gone.

Approved by: re@ (scottl)

Fix formatting (spaces -> tab)

MFC after: 1 week

Allow multiple aliases files to be rebuilt

PR: bin/40540
Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net>
MFC after: 3 days

Add a comment regarding the use of the msgs alias with sendmail to help
users who want to enable it.

PR: misc/39951

Drop support for COPY, -c has been the default mode of install(1)
for a long time now.

Approved by: bde

s/${INSTALL} -c/${INSTALL} ${COPY}/

Trim EOL spaces.

Reviewed by: gshapiro

Add an alias for sshd.

Add a new make.conf knob, SENDMAIL_MAP_PERMS, which specifies the
permissions to use for alias and map database files built by
/etc/mail/Makefile. The default is 0640 to assist users in avoiding
a file locking local denial of service.

MFC after: 1 day
pending RE approval

Add a warning regarding localhost-only listening daemons inside jails.
Apparently binding only to 127.0.0.1 inside of a jail actually binds
to the jail IP address as well (in effect, bind to all available
interfaces in the jail).

Submitted by: Helge Oldach <test-smtp@oldach.net>
MFC after: 1 day
pending RE approval

Fix typo.

Submitted by: Marius Strom <marius@marius.org>
MFC after: 1 day
and RE approval

sys.mk no longer includes bsd.own.mk so I need to include it here for
the definition of SHAREMODE.

Submitted by: Udo Schweigert <Udo.Schweigert@siemens.com>

Fix up submit.cf alternation instructions in light of new SENDMAIL_SUBMIT_MC
make.conf knob.

MFC after: 1 week

Provide a new make.conf knob, SENDMAIL_SUBMIT_MC to allow users to pick
the .mc file used for /etc/mail/submit.cf. By default,
/etc/mail/freebsd.submit.mc is installed and used.

Requested by: fenner
Submitted by: ume
MFC after: 1 week

Add the missing hoststat and purgestat commands. These are normally
symlinks to the sendmail binary but in FreeBSD's case, they are
symlinks to mailwrapper.

Submitted by: tisco
MFC after: 4 days

Quoting Peter Wemm, "At great personal risk, touch the sendmail startup
again."

As an alternative to sendmail_enable=NONE, solve the boot time problem
for non-sendmail users completely by moving all of the sendmail startup
code from /etc/rc to /etc/rc.sendmail. The source for that script will
be kept in src/etc/sendmail/rc.sendmail so make.conf's NO_SENDMAIL will
prevent it from being installed. A new rc.conf variable,
mta_start_script specifies the script to run to start the user's
preferred MTA. For backward compatibility, it will default to
/etc/rc.sendmail. The specified script is called out of /etc/rc after
checking to make sure it exists. A new rc.sendmail.8 man page has also
been added which now houses the sendmail_* variable descriptions
formerly in rc.conf.5.

Use /etc/rc.sendmail in /etc/mail/Makefile to reduce code duplication.

Reviewed by: -current, -stable, obrien, peter, ru
MFC after: 1 week

Back out last commit. (This file is installed under /etc/mail.)

Requested by: gshapiro

Use a relative path to contrib/sendmail/cf.

Update the /etc/mail/Makefile "start" target code to match the new startup
logic and added a new set of targets for controlling the MSP queue runner
(start-mspq, stop-mspq, and restart-mspq).

Reminded by: Mark Santcroos <marks@ripe.net>
MFC after: 1 week

Use the proper terminology.

Fixed a few typos.

Add information about how the new sendmail set-group-ID mail submission
works and ways to work around common problems people might have.
Include information on reverting to a set-user-ID root sendmail binary in
case anyone really needs to do this.

Don't build a submit.cf file if SENDMAIL_SET_USER_ID is set

Grammar fix for comment

Add aliases pointing to postmaster for the two new mail related accounts.

Reminded by: sheldonh
MFC after: 3 days

Handle the sendmail_outbound_enable knob in the start target.

PR: 32033
MFC after: 3 days

Do not clobber users hostname.mc file if freebsd.mc changes (likely after an
installworld).

Submitted by: Steve Watt <steve@Watt.COM>
MFC after: 2 days

Revert change to always include _FFR_TLS_O_T as it requires FEATURE(access_db)

Problem found by: nsayer

If the user sets SENDMAIL_MC to /etc/mail/sendmail.mc, install is told to
install /etc/mail/sendmail.cf to /etc/mail/sendmail.cf and exits with an
error:

===> etc/sendmail
install -c -o root -g wheel -m 644 /etc/mail/sendmail.cf /etc/mail/sendmail.cf
install: /etc/mail/sendmail.cf and /etc/mail/sendmail.cf are the same file
*** Error code 64

Catch this in the Makefile and don't call install if the source and target
are the same file.

Reported by: Alexandr Listopad <laa@reis.zp.ua>
MFC after: 1 week

New make knob, SENDMAIL_M4_FLAGS, modifies the flags passed to m4 when
building a .cf file from a .mc file.

Include -D_FFR_TLS_O_T to enable tls policy control since the sendmail binary
build enables that FFR as well.

PR: conf/28361
MFC after: 1 week

Allow users to add local Makefile targets.

Submitted by: dinoex
MFC after: 7 days

Make the default .mc file be `hostname`.mc if SENDMAIL_MC make.conf knob
is not set. This allows admins to create a per-machine configuration file
while leaving the freebsd.mc template pristine. Provide a rule to create
`hostname`.mc from freebsd.mc if it doesn't exist.

PR: misc/26299
MFC after: 8 days

Allow users to override the default map type used for building maps.

The userdb database is different from the rest of the databases. It *must*
be a btree.

PR: bin/26149

Read information from local rc.conf file(s) to get proper settings for
'make start'.

PR: conf/25639
Submitted by: Esa Karkkainen <ejk@pp.htv.fi>

Fix dependencies and use a better variable name

Revamp /etc/mail/Makefile:

+ Add support for the new SENDMAIL_MC make.conf knob
+ Add the ability to build .cf files from .mc files
+ Generalize map rebuilding
+ Add the ability to rebuild the aliases file
+ Add the ability to stop, start, and restart sendmail

PR: bin/13759, bin/19897, bin/24397

Add the remaining pseudo-users as aliases to root

PR: conf/23105
Submitted by: Matthew West, mwest@uct.ac.za

Grammar fix

Submitted by: asmodai

/etc/mail/sendmail.cw is /etc/mail/local-host-names, now.

PR: misc/22261
Submitted by: Michael Bryan <fbsd-security@ursine.com>

/etc/mail/sendmail.cw is /etc/mail/local-host-names, now.

PR: misc/22262
Submitted by: Michael Bryan <fbsd-security@ursine.com>

Install the sendmail cf building tools (contrib/sendmail/cf) in
/usr/share/sendmail/cf.

PR: 19790

The rest of the changes needed to support the new version of sendmail (8.11.0).
Beyond changes to the build system, this includes fixing up the sample
freebsd.mc configuration for changes in defaults and syntax, removing
outdated documentation, and updating the release notes.

Correct $FreeBSD tags to include the (missing) ``:'', restoring the tags
to a useful condition.

Add sample databases for sendmail (access, mailertable, virtusertable),
as well as rename access.txt back to the standard access. Also modify
the Makefile to know how to build hashes for each of these databases.
If one of the databases is missing when Make is run, use a commented
out version of the sample.

Reviewed by: peter
Approved by: jkh

Add $FreeBSD$

This commit was generated by cvs2svn to compensate for changes in r54816,
which included commits to RCS files with non-trunk default branches.

$Id$ -> $FreeBSD$

update spam countermeasures
add examples of using an access_db
update .mc files to match recommendations on
http://www.sendmail.org/m4/anti-spam.html

(grrr.....should have been one commit
did the last commit from a subdirectory)

Update this file to no longer list the outdated information about gulf.net

Ignored-for-too-long-by: jmb

Redirect mail to pseudo-user pop to root.

PR: conf/9555
Submitted by: Ruslan Ermilov <ru@ucb.crimea.ua>

Do not try to fetch anti-spam files from gulf.net.
They nolonger provide a list of spam domains and
spam ip address ranges.

Missing word. (in comments, non-destructive bug)

Move the "root" entry up so people can see it.

Gasp ! Bitten by the wonders of diff/patch ! Now's your chance to
say ``I told you so'' Andrey !
Move the Id keyword to the right Makefile

Add Id keywords

Enter absolute path for the makemap command (which lives under /usr/sbin)
This makes it possible to run make from cron, i.e.:
root's crontab:
( cd /etc/mail; make all install )
without the error:
makemap hash /etc/mail/spamsites < /etc/mail/block_domains.txt
makemap: not found
*** Error code 127
If this solution is widely accepted, I'd like to merge it into -STABLE

accidently omitted two file declarations.
so i added them.

Submitted by: Scot Elliott (scot@poptart.org)

replaced check_rcpt ruleset with one
recommended by Gary Palmer <gpalmer@freebsd.org>
Obtained from: http://www.informatik.uni-kiel.de/%7Eca/email/check.html#check_rcpt

use extended error codes as noted in rfc1893.

retain additional message in check_relay ruleset,
the message is written into the maillog.
this is useful to a site's postmaster.
Reviewed by: jmb
Submitted by: Ruslan Ermilov ru@ucb.crimea.ua

fix a type in the rulesets
same fix as recorded in misc/5924
that problem report was filed against the stable branch
but that's not a reason not to fix it here as well ;)
Reviewed by: jmb
Submitted by: Ruslan Ermilov <ru@ucb.crimea.ua>

added two new files: allowed_domains.txt and allowed_ips.txt.
domains/ips listed in these files are *NOT* filtered,
even if listed in domains.txt or ips.txt.

someone added netcom.com to the domains.txt file,
resulting in all mail from netcom.com being blocked.

Ask spammers to mail postmaster@$m, not postmaster@FreeBSD.ORG.

- Fix some very minor typos.

correct an error that i made in check_relay.

check_relay cannot return temporary errors.
The temporary error is logged in the sendmail log, but on the SMTP
protocol level, sendmail returns '550 Access Denied'.
Reviewed by: jmb
Submitted by: Tor Egge <Tor.Egge@idi.ntnu.no>

improve anti-spam rulesets: check_relay, check_mail, check_rcpt.
break each ruleset into identified sections. (called groups).
note which groups can be reordered.
each group accepts and returns the same strings,
as much as possible.
reactivate Paul Vixie's RBL (in check_mail)
add rules to limit mail relaying to a list of hosts and domains
in the R class (check_rcpt, not active on hub.freebsd.org)
Submitted by: jmb

anti-spam filter used by the FreeBSD mailing lists.

Undo last commit.

Uncomment abuse, security, and ftp aliases.

Add aliases ftp-bugs -> ftp. ftp-bugs is the default email address
which print our ftp daemon if a user type the command 'rhelp'.

Reviewed by: joerg

Add aliases for hostmaster, webmaster & abuse, all point to root.

Delete old comment about /bin/mail. We don't have a /bin/mail.

Sync with /etc/master.passwd and RFC 2142. In detail:
added:
man, news, operator, usenet (->news), xten
deleted:
ingres
added as comment:
info, marketing, sales, support, abuse, noc, security,
ftp, hostmaster, webmaster, www, bit-bucket, dev-null

Add commented out msgs alias

Removed all Berkeley aliases information since it is way out of date.
General cleanup.. from NetBSD.

This commit was generated by cvs2svn to compensate for changes in r37,
which included commits to RCS files with non-trunk default branches.