- Copy stable/10@296371 to releng/10.3 in preparation for 10.3-RC1
builds.
- Update newvers.sh to reflect RC1.
- Update __FreeBSD_version to reflect 10.3.
- Update default pkg(8) configuration to use the quarterly branch.

Approved by: re (implicit)

MFC: Reminder to check tools/build/mk/OptionalObsoleteFiles.inc on new
version imports.

MFC: Update for sendmail 8.15.2 import

Approved by: re (gjb)

MFC: Merge sendmail 8.15.2

Approved by: re (gjb)

MFC: An additional fix for the openssl Weak DH remediation:

The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
below 768 bits. sendmail releases prior to 8.15.2 (not yet released),
defaulted to a 512 bit DH parameter setting for client connections.

The first fix committed last week changed the default to 1024 bits.

This commit fixes the case where the DHParameters option is set to a
file which doesn't exist, which is the case on newer versions of
FreeBSD which enable STARTTLS by default by auto-creating TLS
certificates.

MFC: The import of openssl to address the FreeBSD-SA-15:10.openssl security
advisory includes a change which rejects handshakes with DH parameters
below 768 bits. sendmail releases prior to 8.15.2 (not yet released),
defaulted to a 512 bit DH parameter setting for client connections.
This commit chages that default to 1024 bits. sendmail 8.15.2, when
released well use a default of 2048 bits.

MFC: Update for sendmail 8.14.9 import

MFC: Merge sendmail 8.14.9 to HEAD

MFC: Add missing svn:keywords property to new files

MFC: Update for sendmail 8.14.8 import

MFC: Remove local FreeBSD workaround now that upstream project has a better fix.

MFC: Merge sendmail 8.14.8

MFC: Update link to vendor import instructions

Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.

Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.

The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.

Approved by: re (gjb, implicit)

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

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

Temporarily revert sendmail 8.14.7 change to getipnodebyname() flags to
prevent problems between the resolver and Microsoft DNS servers with
AAAA lookups. The upstream open source project will work on a more
permanent fix for the next release. Issue noted by Pavel Timofeev.

MFC after: 3 days

Update for sendmail 8.14.7

MFC after: 4 days

Merge sendmail 8.14.7 to HEAD

MFC after: 4 days

Merge sendmail 8.14.6 errata issue

MFC after: 3 days

Update import info based on recent experiences and sendmail 8.14.6 import.

MFC after: 4 days

Merge sendmail 8.14.6 to HEAD

MFC after: 4 days

cyrus-sasl 2.1.26 was released. In this version, the type of callback
functions was changed from "unsigned long" to "size_t".

Reviewed by: gshapiro
MFC after: 3 days

Properly define true/false when defining __bool_true_false_are_defined
for filters which pull in mfapi.h before stdbool.h. Issue reported by
Petr Rehor, maintainer of amavisd-milter port.

MFC after: 3 days

Shut up warnings with Cyrus SASL 2.1.25.

Spotted by: ache
Tested by: ache

With retirement of cpumask_t and usage of cpuset_t for representing a
mask of CPUs, pc_other_cpus and pc_cpumask become highly inefficient.

Remove them and replace their usage with custom pc_cpuid magic (as,
atm, pc_cpumask can be easilly represented by (1 << pc_cpuid) and
pc_other_cpus by (all_cpus & ~(1 << pc_cpuid))).

This change is not targeted for MFC because of struct pcpu members
removal and dependency by cpumask_t retirement.

MD review by: marcel, marius, alc
Tested by: pluknet
MD testing by: marcel, marius, gonzo, andreast

Make Sendmail properly set login class and cpumask.

Update notes regarding FreeBSD import

Merge sendmail 8.14.5 to HEAD

MFC after: 4 days

etire the cpumask_t type and replace it with cpuset_t usage.

This is intended to fix the bug where cpu mask objects are
capped to 32. MAXCPU, then, can now arbitrarely bumped to whatever
value. Anyway, as long as several structures in the kernel are
statically allocated and sized as MAXCPU, it is suggested to keep it
as low as possible for the time being.

Technical notes on this commit itself:
- More functions to handle with cpuset_t objects are introduced.
The most notable are cpusetobj_ffs() (which calculates a ffs(3)
for a cpuset_t object), cpusetobj_strprint() (which prepares a string
representing a cpuset_t object) and cpusetobj_strscan() (which
creates a valid cpuset_t starting from a string representation).
- pc_cpumask and pc_other_cpus are target to be removed soon.
With the moving from cpumask_t to cpuset_t they are now inefficient
and not really useful. Anyway, for the time being, please note that
access to pcpu datas is protected by sched_pin() in order to avoid
migrating the CPU while reading more than one (possible) word
- Please note that size of cpuset_t objects may differ between kernel
and userland. While this is not directly related to the patch itself,
it is good to understand that concept and possibly use the patch
as a reference on how to deal with cpuset_t objects in userland, when
accessing kernland members.
- KTR_CPUMASK is changed and now is represented through a string, to be
set as the example reported in NOTES.

Please additively note that no MAXCPU is bumped in this patch, but
private testing has been done until to MAXCPU=128 on a real 8x8x2(htt)
machine (amd64).

Please note that the FreeBSD version is not yet bumped because of
the upcoming pcpu changes. However, note that this patch is not
targeted for MFC.

People to thank for the time spent on this patch:
- sbruno, pluknet and Nicholas Esborn (nick AT desert DOT net) tested
several revision of the patches and really helped in improving
stability of this work.
- marius fixed several bugs in the sparc64 implementation and reviewed
patches related to ktr.
- jeff and jhb discussed the basic approach followed.
- kib and marcel made targeted review on some specific part of the
patch.
- marius, art, nwhitehorn and andreast reviewed MD specific part of
the patch.
- marius, andreast, gonzo, nwhitehorn and jceel tested MD specific
implementations of the patch.
- Other people have made contributions on other patches that have been
already committed and have been listed separately.

Companies that should be mentioned for having participated at several
degrees:
- Yahoo! for having offered the machines used for testing on big
count of CPUs.
- The FreeBSD Foundation for having sponsored my devsummit attendance,
which has been instrumental.
- Sandvine for having offered offices and infrastructure during
development.

(I really hope I didn't forget anyone, if it happened I apologize in
advance).

Remove -mdoc macros from -man page

Neither groff nor mandoc render these when in -man mode.
This was introduced in r38083 as a local change, therefore no commit to
the vendor branch.

Merger of the quota64 project into head.

This joint work of Dag-Erling Smørgrav and myself updates the
FFS quota system to support both traditional 32-bit and new 64-bit
quotas (for those of you who want to put 2+Tb quotas on your users).

By default quotas are not compiled into the kernel. To include them
in your kernel configuration you need to specify:

options QUOTA # Enable FFS quotas

If you are already running with the current 32-bit quotas, they
should continue to work just as they have in the past. If you
wish to convert to using 64-bit quotas, use `quotacheck -c 64';
if you wish to revert from 64-bit quotas back to 32-bit quotas,
use `quotacheck -c 32'.

There is a new library of functions to simplify the use of the
quota system, do `man quotafile' for details. If your application
is currently using the quotactl(2), it is highly recommended that
you convert your application to use the quotafile interface.
Note that existing binaries will continue to work.

Special thanks to John Kozubik of rsync.net for getting me
interested in pursuing 64-bit quota support and for funding
part of my development time on this project.

Update FreeBSD information

MFC after: 4 days

Merge sendmail 8.14.4 to HEAD

MFC after: 4 days

Remove build timestamps from the following files:
/boot/kernel/hptrr.ko
/etc/mail/*.cf
/lib/libcrypto.so.5
/usr/bin/ntpq
/usr/sbin/amd
/usr/sbin/iasl
/usr/sbin/ntpd
/usr/sbin/ntpdate
/usr/sbin/ntpdc

There does not appear to be any purpose to having these timestamps, and
they have the irritating consequence that the aforementioned files will
be different every time they are rebuilt.

After this commit, the only remaining build timestamps are in the kernel,
the boot loaders, /usr/include/osreldate.h (the year in the copyright
notice), and lib*.a (the timestamps on all of the included .o files).

Reviewed by: scottl (hptrr), gshapiro (sendmail), simon (openssl),
roberto (ntp), jkim (acpica)
Approved by: re (kib)

Merge from vendor dist: Bring in a change already in the sendmail
repository that will allow sendmail to be built with the c99 compiler.

Submitted by: rdivacky

Fix an ABI breakage found after the import that will be part of the
next version of sendmail. Putting it in now for the upcoming 7-BETA
and 6-BETA test releases.

Submitted by: Mike Tancsa

Update import/merge instructions for the svn repo

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

Initialize merge records

Update for sendmail 8.14.2

MFC after: 1 week

Resolve conflicts from sendmail 8.14.2 import

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

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

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

Update for sendmail 8.14.1

Resolve conflicts from sendmail 8.14.1 import

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

Update to sendmail 8.13.8

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

Update FreeBSD info regarding sendmail 8.13.7 import

Resolve conflicts from sendmail 8.13.7 import

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

Add a note regarding bumping the freebsd*mc files for mergemaster's sake.

Record sendmail 8.13.6 upgrade

Resolve conflicts from sendmail 8.13.6 import

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

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

Note the sendmail 8.13.4 upgrade

MFC after: 4 days

Resolve conflicts from sendmail 8.13.4 import

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

Merge mci.c change to add mci_close() from the vendor branch.

Problem noted by: marcus

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

Update for sendmail 8.13.3 import

Resolve conflicts from sendmail 8.13.3 import

MFC after: 4 days

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

Update notes after sendmail 8.13.1 import

Resolve conflicts from sendmail 8.13.1 import

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

Fix path to rc.sendmail

Update for 8.12.11 import

MFC after: 7 days

Fix sendmail 8.12.11 import conflicts

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

Cast the NULL to a pointer type for 64 bit architectures

Submitted by: harti
MFC after: 4 days

Adding WorkAroundBrokenAAAA seems a necessity even in the submit.mc given
the number of broken DNS servers out there in the world. Since we are
diverging from the sendmail.org submit.mc, it's time to make our own
freebsd.submit.mc.

PR: conf/57733
Reviewed by: nork
MFC after: 2 weeks

Update for 8.12.10 import

Fix sendmail 8.12.10 import conflicts

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

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

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

sendmail 8.12.9 has been imported

Fix conflicts from sendmail 8.12.9 import

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

sendmail 8.12.8 has been imported

Fix conflicts from sendmail 8.12.8 import

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

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

This local FreeBSD mod isn't needed now that we have the freebsd* ostype
files.

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

Update for sendmail 8.12.7 import

Resolve conflicts from sendmail 8.12.7 import

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

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

MFS: Fix smrsh bypass bug.

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.

Changes for the import of sendmail 8.12.6

Resolve conflicts from sendmail 8.12.6 import

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

Update for the sendmail 8.12.5 import

Resolve conflicts from import of sendmail 8.12.5

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

sendmail 8.12.4 has been imported

Resolve conflicts from sendmail 8.12.4 import

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

Resolve conflicts from import of post-8.12.3 bug fixes.

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

Two more files to keep track of.

A couple more sendmail-related files

Record sendmail 8.12.3 import

Fix conflicts from sendmail 8.12.3 import

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

Found two more files that use the sendmail infrastructure.

Another man page that can change as sendmail requirements change.

Add usr.sbin/mailwrapper/Makefile to the list of changed files as
it contains a list of symlinks to make which are normally symlinks
to the sendmail binary.

Add a list of files sendmail importants may affect. This is mostly
for my own reference so I don't miss things on future imports.

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

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

Update import instructions for sendmail 8.12.2

Resolve conflicts from sendmail 8.12.2 import

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

Update import information

Resolve conflicts from sendmail 8.11.6 import

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

Update FreeBSD import information

Resolve conflicts from import of sendmail 8.11.5

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

This page is in man(7) format.

sendmail 8.11.4 has been imported

Resolve conflicts from 8.11.4 import

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

Forgot to update this README when I imported 8.11.3

setlocale(3) has been fixed to match POSIX standard:
LC_ALL takes precedence over other LC_* envariables.

Repair 8.11.3 merge conflicts

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

Return to the code as distributed by sendmail.org. This eliminates a
warning on Alphas. It is still not the perfect solution for machines
which sizeof(u_long) != sizeof(void *) but it is as close as we are going
to get for now and consistent with the rest of the code. 8.12 has solved
this problem by providing a portable snprintf() which understands %p.

PR: bin/14142

Document the vacation -d and -l options

PR: docs/22875

Update FreeBSD import README

Repair 8.11.2 merge conflicts

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

Return to the stock version of this file as local FreeBSD mods
to it have been made in mdoc(7) format, but now it is again in
man(7) format, and the vendor apparently incorporated our mods.

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.

Update FreeBSD import information after sendmail 8.11.1 import

Fix conflicts from merge of sendmail 8.11.1

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

Remove Build files -- they rely on the devtools system which isn't imported
(or used)

Revert my last change. libutil.h is still required for setusercontext()
and unistd.h is already included.

Requested by: gshapiro

Move setproctitle() from libutil to libc (after a repo-copy)
and bump __FreeBSD_version to 500012 to mark the occasion.

setproctitle() is prototyped in unistd.h as opposed to stdlib.h
where OpenBSD and NetBSD have it.

Reviewed by: peter

Fix syntax for Received: header after conflict resolution.
Problem noted by: Andrey A. Chernov <ache@FreeBSD.ORG>

Add a FREEBSD-upgrade file describing what was done for the import
Remove obsolete files after the 8.11.0 import

Fix conflicts from merge of sendmail 8.11.0.

PR: bin/11552 misc/18512 bin/15088

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

Install sendmail.cf into /etc/mail.

The current offical Sendmail Inc. version uses /var/mail/ and when we upgrade
our repository to that version, we will get the change. It is best to make
the path change in 4.0-R (which may not have the latest Sendmail Inc. version,
than to change in mid-4.x stream when we may upgrade.

Ok'ed by: Peter (quite a while ago)

Change location of temporary file from /tmp to /var/tmp. This is a
repeat of an earlier commit which apparently got lost with the last
import. It helps solve the frequently reported problem

pid 4032 (mail.local), uid 0 on /: file system full

(though there appears to be a lot of space) caused by idiots sending
30 MB mail messages.

Most-recently-reported-by: jahanur <jahanur@jjsoft.com>

Add $FreeBSD$ so that I can check the file back in.

Rejected-by: CVS

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

Remove the standalone buildtools stuff, we don't use it here and it
clutters things up. (Suggested by wollman)

Merge 8.9.2+patches -> 8.9.3 changes into mainline.

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

Merge changes from vendor branch into our version

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

These files were replaced by symlinks in 8.9.2...

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.

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

"Fixed" a printf format error. Use bogus casts to avoid using %p so that
the output doesn't change (unless the old format caused runtime errors).

Fixed printf format errors.

By popular request, mention that mailq responds to the same options as
sendmail(8).

PR: i386/8149

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 original revs 1.2,1.3 - sort xrefs, document new -b and -s flags.

Copy original rev 1.2 - fix usage line to match reality.

Copy original rev 1.2 - path updates for 4.4BSD so smrsh is more useable.

Copy original rev 1.2 - immediate delivery rather than queueing and -Wall.

Copy original revs 1.19,1.15 - setusercontext() support and __FreeBSD__>=2
Copy original revs 1.9,1.8,1.7 - set PS_STRINGS correctly.

Copy original rev 1.3 - fix cosmetic typo in example
Copy original rev 1.2 - sort xrefs

Copy original rev 1.5 - sort/fix xrefs
Copy original rev 1.4 - correct path to /usr/share/misc/sendmail.hf

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

Copy rev 1.2 of usr.sbin/sendmail/cf/sh/makeinfo.sh: Use `LC_TIME=C date`.

Copy across rev 1.2 of usr.sbin/sendmail/cf/ostype/bsd4.4.m4:
Remove the legacy -d option from the arguments to mail.local in 4.4bsd.

Copy across rev 1.2 of usr.sbin/sendmail/cf/m4/cfhead.m4: Record envelope
sender in each Received: header along the way. Great for spammer hunting.

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