Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3'

Merge vendor sendmail 8.18.1 into HEAD

Merge commit '28fbd2825d216dafca4d991ad96d05b312f4f9a3'

Merge vendor sendmail 8.17.1 into HEAD

Merge sendmail 8.16.1 to HEAD: See contrib/sendmail/RELEASE_NOTES for details
Includes build infrastructure & config updates required for changes in 8.16.1

MFC after: 5 days

Fix various -Wpointer-compare warnings

This warning (comparing a pointer against a zero character literal
rather than NULL) has existed since GCC 7.1.0, and was recently added to
Clang trunk.

Almost all of these are harmless, except for fwcontrol's str2node, which
needs to both guard against dereferencing a NULL pointer (though in
practice it appears none of the callers will ever pass one in), as well
as ensure it doesn't parse the empty string as node 0 due to strtol's
awkward interface.

Submitted by: James Clarke <jtrc27@jrtc27.com>
Obtained from: CheriBSD
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D21914

Merge sendmail 8.14.9 to HEAD

MFC after: 3 days

Merge sendmail 8.14.8 to HEAD

MFC after: 5 days

Merge sendmail 8.14.3 into HEAD.

Note: As the first merge since the conversion to svn, it includes many
propset changes to get the proper svn:eol-style and svn:mime-type on the
files (as merged from the fixed up vendor/dist area).

MFC after: 3 days

Stage 1 of sendmail dist tree flattening. contrib/sendmail/contrib
prevents doing this in one pass.

Resolve conflicts from sendmail 8.14.1 import

Import sendmail 8.14.1

Resolve conflicts from sendmail 8.13.3 import

MFC after: 4 days

Import sendmail 8.13.3

Resolve conflicts from sendmail 8.13.1 import

Import sendmail 8.13.1

Fix sendmail 8.12.10 import conflicts

Import sendmail 8.12.10

Fix conflicts from sendmail 8.12.9 import

Import sendmail 8.12.9

Fix conflicts from sendmail 8.12.8 import

Import sendmail 8.12.8

Resolve conflicts from sendmail 8.12.7 import

Import sendmail 8.12.7

Even if biff is turned off, we still need to set curoff as the code
uses that if there is an error writing to the mailbox. Note this bug
is only in the FreeBSD code, not the vendor code (which doesn't offer
nobiff).

PR: misc/43392
MFC after: 3 days

Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so
I don't have to manually resolve conflicts on every import. Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.

Resolve conflicts from sendmail 8.12.4 import

Import sendmail 8.12.4

Resolve conflicts from import of post-8.12.3 bug fixes.

Import of post-8.12.3 bug fixes from vendor repository.

These are being imported for the upcoming FreeBSD 4.6 release.

Fix conflicts from sendmail 8.12.3 import

Import sendmail 8.12.3

Fix mail.local build for non-sendmail.org code

Resolve conflicts from sendmail 8.12.2 import

Import sendmail 8.12.2

Resolve conflicts from import of sendmail 8.11.5

Import sendmail 8.11.5

Repair 8.11.3 merge conflicts

Import sendmail 8.11.3

Repair 8.11.2 merge conflicts

Import sendmail 8.11.2

Add FreeBSD-only options to the getopt string

PR: 21544
Submitted by: Peter Jeremy <peter.jeremy@alcatel.com.au>

Add missing FreeBSD-only flag to the usage statement.

Fix conflicts from merge of sendmail 8.11.1

Import of sendmail version 8.11.1 into vendor branch SENDMAIL with
release tag v8_11_1.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/

Fix conflicts from merge of sendmail 8.11.0.

PR: bin/11552 misc/18512 bin/15088

Import of sendmail version 8.11.0 into vendor branch SENDMAIL with
release tag v8_11_0.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/

Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
were submitted back to sendmail.org (stage 1) and were incorporated.

Import sendmail-8.9.2 onto vendor branch (update from 8.9.1)

Obtained from: ftp.sendamil.org

I obviously cannot read. I misread the ifdef in the Makefile - DONT_FSYNC
was not on by default.. Back previous change out.

Invert the sense of the -s flag (local addition). Instead of compiling
in the behavior via the previously default #define DONT_FSYNC, use the
-s flag to turn the fsync() behavior on. This can be configured in
sendmail.cf without recompiling mail.local.

Copy original revs 1.2,1.3 - nofsync/nobiff support, usage update.

Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt.

Import sendmail-8.9.1 (slightly trimmed) onto a fresh branch under
src/contrib as per various discussions. I will copy across our changes
and then point the Makefiles across once the dust has settled..

Merge commit '28fbd2825d216dafca4d991ad96d05b312f4f9a3'

Merge vendor sendmail 8.17.1 into HEAD

Merge sendmail 8.16.1 to HEAD: See contrib/sendmail/RELEASE_NOTES for details
Includes build infrastructure & config updates required for changes in 8.16.1

MFC after: 5 days

Fix various -Wpointer-compare warnings

This warning (comparing a pointer against a zero character literal
rather than NULL) has existed since GCC 7.1.0, and was recently added to
Clang trunk.

Almost all of these are harmless, except for fwcontrol's str2node, which
needs to both guard against dereferencing a NULL pointer (though in
practice it appears none of the callers will ever pass one in), as well
as ensure it doesn't parse the empty string as node 0 due to strtol's
awkward interface.

Submitted by: James Clarke <jtrc27@jrtc27.com>
Obtained from: CheriBSD
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D21914

Merge sendmail 8.14.9 to HEAD

MFC after: 3 days

Merge sendmail 8.14.8 to HEAD

MFC after: 5 days

Merge sendmail 8.14.3 into HEAD.

Note: As the first merge since the conversion to svn, it includes many
propset changes to get the proper svn:eol-style and svn:mime-type on the
files (as merged from the fixed up vendor/dist area).

MFC after: 3 days

Stage 1 of sendmail dist tree flattening. contrib/sendmail/contrib
prevents doing this in one pass.

Resolve conflicts from sendmail 8.14.1 import

Import sendmail 8.14.1

Resolve conflicts from sendmail 8.13.3 import

MFC after: 4 days

Import sendmail 8.13.3

Resolve conflicts from sendmail 8.13.1 import

Import sendmail 8.13.1

Fix sendmail 8.12.10 import conflicts

Import sendmail 8.12.10

Fix conflicts from sendmail 8.12.9 import

Import sendmail 8.12.9

Fix conflicts from sendmail 8.12.8 import

Import sendmail 8.12.8

Resolve conflicts from sendmail 8.12.7 import

Import sendmail 8.12.7

Even if biff is turned off, we still need to set curoff as the code
uses that if there is an error writing to the mailbox. Note this bug
is only in the FreeBSD code, not the vendor code (which doesn't offer
nobiff).

PR: misc/43392
MFC after: 3 days

Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so
I don't have to manually resolve conflicts on every import. Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.

Resolve conflicts from sendmail 8.12.4 import

Import sendmail 8.12.4

Resolve conflicts from import of post-8.12.3 bug fixes.

Import of post-8.12.3 bug fixes from vendor repository.

These are being imported for the upcoming FreeBSD 4.6 release.

Fix conflicts from sendmail 8.12.3 import

Import sendmail 8.12.3

Fix mail.local build for non-sendmail.org code

Resolve conflicts from sendmail 8.12.2 import

Import sendmail 8.12.2

Resolve conflicts from import of sendmail 8.11.5

Import sendmail 8.11.5

Repair 8.11.3 merge conflicts

Import sendmail 8.11.3

Repair 8.11.2 merge conflicts

Import sendmail 8.11.2

Add FreeBSD-only options to the getopt string

PR: 21544
Submitted by: Peter Jeremy <peter.jeremy@alcatel.com.au>

Add missing FreeBSD-only flag to the usage statement.

Fix conflicts from merge of sendmail 8.11.1

Import of sendmail version 8.11.1 into vendor branch SENDMAIL with
release tag v8_11_1.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/

Fix conflicts from merge of sendmail 8.11.0.

PR: bin/11552 misc/18512 bin/15088

Import of sendmail version 8.11.0 into vendor branch SENDMAIL with
release tag v8_11_0.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/

Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
were submitted back to sendmail.org (stage 1) and were incorporated.

Import sendmail-8.9.2 onto vendor branch (update from 8.9.1)

Obtained from: ftp.sendamil.org

I obviously cannot read. I misread the ifdef in the Makefile - DONT_FSYNC
was not on by default.. Back previous change out.

Invert the sense of the -s flag (local addition). Instead of compiling
in the behavior via the previously default #define DONT_FSYNC, use the
-s flag to turn the fsync() behavior on. This can be configured in
sendmail.cf without recompiling mail.local.

Copy original revs 1.2,1.3 - nofsync/nobiff support, usage update.

Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt.

Import sendmail-8.9.1 (slightly trimmed) onto a fresh branch under
src/contrib as per various discussions. I will copy across our changes
and then point the Makefiles across once the dust has settled..

Fix various -Wpointer-compare warnings

This warning (comparing a pointer against a zero character literal
rather than NULL) has existed since GCC 7.1.0, and was recently added to
Clang trunk.

Almost all of these are harmless, except for fwcontrol's str2node, which
needs to both guard against dereferencing a NULL pointer (though in
practice it appears none of the callers will ever pass one in), as well
as ensure it doesn't parse the empty string as node 0 due to strtol's
awkward interface.

Submitted by: James Clarke <jtrc27@jrtc27.com>
Obtained from: CheriBSD
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D21914

A new jail(8) with a configuration file, to replace the work currently done
by /etc/rc.d/jail.

Create the altix project branch. The altix project will add support
for the SGI Altix 350 to FreeBSD/ia64. The hardware used for porting
is a two-module system, consisting of a base compute module and a
CPU expansion module. SGI's NUMAFlex architecture can be an excellent
platform to test CPU affinity and NUMA-aware features in FreeBSD.

- Import the HEAD csup code which is the basis for the cvsmode work.

Resolve conflicts from sendmail 8.14.1 import

Import sendmail 8.14.1

Resolve conflicts from sendmail 8.13.3 import

MFC after: 4 days

Import sendmail 8.13.3

Resolve conflicts from sendmail 8.13.1 import

Import sendmail 8.13.1

Fix sendmail 8.12.10 import conflicts

Import sendmail 8.12.10

Fix conflicts from sendmail 8.12.9 import

Import sendmail 8.12.9

Fix conflicts from sendmail 8.12.8 import

Import sendmail 8.12.8

Resolve conflicts from sendmail 8.12.7 import

Import sendmail 8.12.7

Even if biff is turned off, we still need to set curoff as the code
uses that if there is an error writing to the mailbox. Note this bug
is only in the FreeBSD code, not the vendor code (which doesn't offer
nobiff).

PR: misc/43392
MFC after: 3 days

Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so
I don't have to manually resolve conflicts on every import. Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.

Resolve conflicts from sendmail 8.12.4 import

Import sendmail 8.12.4

Resolve conflicts from import of post-8.12.3 bug fixes.

Import of post-8.12.3 bug fixes from vendor repository.

These are being imported for the upcoming FreeBSD 4.6 release.

Fix conflicts from sendmail 8.12.3 import

Import sendmail 8.12.3

Fix mail.local build for non-sendmail.org code

Resolve conflicts from sendmail 8.12.2 import

Import sendmail 8.12.2

Resolve conflicts from import of sendmail 8.11.5

Import sendmail 8.11.5

Repair 8.11.3 merge conflicts

Import sendmail 8.11.3

Repair 8.11.2 merge conflicts

Import sendmail 8.11.2

Add FreeBSD-only options to the getopt string

PR: 21544
Submitted by: Peter Jeremy <peter.jeremy@alcatel.com.au>

Add missing FreeBSD-only flag to the usage statement.

Fix conflicts from merge of sendmail 8.11.1

Import of sendmail version 8.11.1 into vendor branch SENDMAIL with
release tag v8_11_1.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/

Fix conflicts from merge of sendmail 8.11.0.

PR: bin/11552 misc/18512 bin/15088

Import of sendmail version 8.11.0 into vendor branch SENDMAIL with
release tag v8_11_0.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/

Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
were submitted back to sendmail.org (stage 1) and were incorporated.

Import sendmail-8.9.2 onto vendor branch (update from 8.9.1)

Obtained from: ftp.sendamil.org

I obviously cannot read. I misread the ifdef in the Makefile - DONT_FSYNC
was not on by default.. Back previous change out.

Invert the sense of the -s flag (local addition). Instead of compiling
in the behavior via the previously default #define DONT_FSYNC, use the
-s flag to turn the fsync() behavior on. This can be configured in
sendmail.cf without recompiling mail.local.

Copy original revs 1.2,1.3 - nofsync/nobiff support, usage update.

Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt.

Import sendmail-8.9.1 (slightly trimmed) onto a fresh branch under
src/contrib as per various discussions. I will copy across our changes
and then point the Makefiles across once the dust has settled..