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

MFV r351553:

Fix a problem which prevented -OServerSSLOptions or -OClientSSLOptions
specified in the command-line option from working.

This patch has been accepted by the upstream.

Reviewed by and discussed with: gshapiro

Merge sendmail 8.15.2 to HEAD

MFC after: 3 days

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.7 to HEAD

MFC after: 4 days

Merge sendmail 8.14.6 to HEAD

MFC after: 4 days

Merge sendmail 8.14.5 to HEAD

MFC after: 4 days

Merge sendmail 8.14.4 to HEAD

MFC after: 4 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.2 import

Import sendmail 8.14.2

Resolve conflicts from sendmail 8.14.1 import

Import sendmail 8.14.1

Resolve conflicts from sendmail 8.13.7 import

Import sendmail 8.13.7

Security: FreeBSD-SA-06:17.sendmail

Resolve conflicts from sendmail 8.13.6 import

Import sendmail 8.13.6

Security: FreeBSD-SA-06:13.sendmail

Resolve conflicts from sendmail 8.13.4 import

Import sendmail 8.13.4

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.11 import conflicts

Import sendmail 8.12.11

Fix sendmail 8.12.10 import conflicts

Import sendmail 8.12.10

Follow the (good) trend of returning import files to vendor versions
where possible for easier future imports.

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

Follow the (good) trend of returning import files to vendor versions
where possible for easier future imports.

Resolve conflicts from sendmail 8.12.7 import

Import sendmail 8.12.7

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.6 import

Import sendmail 8.12.6

Resolve conflicts from import of sendmail 8.12.5

Import sendmail 8.12.5

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

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

Resolve conflicts from 8.11.4 import

Import sendmail 8.11.4

Repair 8.11.3 merge conflicts

Import sendmail 8.11.3

Repair 8.11.2 merge conflicts

Import sendmail 8.11.2

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 8.9.2+patches -> 8.9.3 changes into mainline.

Import sendmail 8.9.3 onto vendor branch, replacing previous interim
8.9.2 + patches version.

Obtained from: ftp.sendmail.org

Merge changes from vendor branch into our version

Check the patch obtained from sendmail.org for the header denial-of-service
attack into the vendor branch. It is a little unusual doing it this way
but it will eliminate (or minimize anyway) conflicts when 8.9.3 comes out.

Obtained from: sendmail.org (as posted on bugtraq, but without broken tabs)

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

Fixed printf format errors.

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

MFV r351553:

Fix a problem which prevented -OServerSSLOptions or -OClientSSLOptions
specified in the command-line option from working.

This patch has been accepted by the upstream.

Reviewed by and discussed with: gshapiro

Merge sendmail 8.15.2 to HEAD

MFC after: 3 days

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.7 to HEAD

MFC after: 4 days

Merge sendmail 8.14.6 to HEAD

MFC after: 4 days

Merge sendmail 8.14.5 to HEAD

MFC after: 4 days

Merge sendmail 8.14.4 to HEAD

MFC after: 4 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.2 import

Import sendmail 8.14.2

Resolve conflicts from sendmail 8.14.1 import

Import sendmail 8.14.1

Resolve conflicts from sendmail 8.13.7 import

Import sendmail 8.13.7

Security: FreeBSD-SA-06:17.sendmail

Resolve conflicts from sendmail 8.13.6 import

Import sendmail 8.13.6

Security: FreeBSD-SA-06:13.sendmail

Resolve conflicts from sendmail 8.13.4 import

Import sendmail 8.13.4

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.11 import conflicts

Import sendmail 8.12.11

Fix sendmail 8.12.10 import conflicts

Import sendmail 8.12.10

Follow the (good) trend of returning import files to vendor versions
where possible for easier future imports.

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

Follow the (good) trend of returning import files to vendor versions
where possible for easier future imports.

Resolve conflicts from sendmail 8.12.7 import

Import sendmail 8.12.7

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.6 import

Import sendmail 8.12.6

Resolve conflicts from import of sendmail 8.12.5

Import sendmail 8.12.5

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

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

Resolve conflicts from 8.11.4 import

Import sendmail 8.11.4

Repair 8.11.3 merge conflicts

Import sendmail 8.11.3

Repair 8.11.2 merge conflicts

Import sendmail 8.11.2

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 8.9.2+patches -> 8.9.3 changes into mainline.

Import sendmail 8.9.3 onto vendor branch, replacing previous interim
8.9.2 + patches version.

Obtained from: ftp.sendmail.org

Merge changes from vendor branch into our version

Check the patch obtained from sendmail.org for the header denial-of-service
attack into the vendor branch. It is a little unusual doing it this way
but it will eliminate (or minimize anyway) conflicts when 8.9.3 comes out.

Obtained from: sendmail.org (as posted on bugtraq, but without broken tabs)

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

Fixed printf format errors.

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..

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.

MFC: Merge sendmail 8.14.4

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

Resolve conflicts from sendmail 8.14.2 import

Import sendmail 8.14.2

Resolve conflicts from sendmail 8.14.1 import

Import sendmail 8.14.1

Resolve conflicts from sendmail 8.13.7 import

Import sendmail 8.13.7

Security: FreeBSD-SA-06:17.sendmail

Resolve conflicts from sendmail 8.13.6 import

Import sendmail 8.13.6

Security: FreeBSD-SA-06:13.sendmail

Resolve conflicts from sendmail 8.13.4 import

Import sendmail 8.13.4

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.11 import conflicts

Import sendmail 8.12.11

Fix sendmail 8.12.10 import conflicts

Import sendmail 8.12.10

Follow the (good) trend of returning import files to vendor versions
where possible for easier future imports.

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

Follow the (good) trend of returning import files to vendor versions
where possible for easier future imports.

Resolve conflicts from sendmail 8.12.7 import

Import sendmail 8.12.7

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.6 import

Import sendmail 8.12.6

Resolve conflicts from import of sendmail 8.12.5

Import sendmail 8.12.5

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

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

Resolve conflicts from 8.11.4 import

Import sendmail 8.11.4

Repair 8.11.3 merge conflicts

Import sendmail 8.11.3

Repair 8.11.2 merge conflicts

Import sendmail 8.11.2

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 8.9.2+patches -> 8.9.3 changes into mainline.

Import sendmail 8.9.3 onto vendor branch, replacing previous interim
8.9.2 + patches version.

Obtained from: ftp.sendmail.org

Merge changes from vendor branch into our version

Check the patch obtained from sendmail.org for the header denial-of-service
attack into the vendor branch. It is a little unusual doing it this way
but it will eliminate (or minimize anyway) conflicts when 8.9.3 comes out.

Obtained from: sendmail.org (as posted on bugtraq, but without broken tabs)

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

Fixed printf format errors.

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..