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

- On FreeBSD, com_err.h is installed into /usr/include, not /usr/include/krb5.
Reflect that in the manpage.

PR: bin/167986
Reported by: truckman@

- Update FreeBSD Heimdal distribution to version 1.5.1. This also brings
several new kerberos related libraries and applications to FreeBSD:
o kgetcred(1) allows one to manually get a ticket for a particular service.
o kf(1) securily forwards ticket to another host through an authenticated
and encrypted stream.
o kcc(1) is an umbrella program around klist(1), kswitch(1), kgetcred(1)
and other user kerberos operations. klist and kswitch are just symlinks
to kcc(1) now.
o kswitch(1) allows you to easily switch between kerberos credentials if
you're running KCM.
o hxtool(1) is a certificate management tool to use with PKINIT.
o string2key(1) maps a password into key.
o kdigest(8) is a userland tool to access the KDC's digest interface.
o kimpersonate(8) creates a "fake" ticket for a service.

We also now install manpages for some lirbaries that were not installed
before, libheimntlm and libhx509.

- The new HEIMDAL version no longer supports Kerberos 4. All users are
recommended to switch to Kerberos 5.

- Weak ciphers are now disabled by default. To enable DES support (used
by telnet(8)), use "allow_weak_crypto" option in krb5.conf.

- libtelnet, pam_ksu and pam_krb5 are now compiled with error on warnings
disabled due to the function they use (krb5_get_err_text(3)) being
deprecated. I plan to work on this next.

- Heimdal's KDC now require sqlite to operate. We use the bundled version
and install it as libheimsqlite. If some other FreeBSD components will
require it in the future we can rename it to libbsdsqlite and use for these
components as well.

- This is not a latest Heimdal version, the new one was released while I was
working on the update. I will update it to 1.5.2 soon, as it fixes some
important bugs and security issues.

- Bootstrap merge history for contrib/com_err.

mdoc: order prologue macros consistently by Dd/Dt/Os

Although groff_mdoc(7) gives another impression, this is the ordering
most widely used and also required by mdocml/mandoc.

Reviewed by: ru
Approved by: philip, ed (mentors)

Merge from the vendor branch and resolve conflicts.

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

Sort sections.

Markup fixes.

Approved by: re (blanket)

Resolve conflicts after import of Heimdal 0.6.1 libcom_err.

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

Add #include <stdlib.h> so that "s->strings = realloc(...)" doesn't segfault
on ia64. (This file isn't vendor branched)

SEE ALSO is the special name, and should not be taken in quotes,
since -mdoc checks for the "SEE" word only to set its variables.
In the SEE ALSO section, -mdoc automatically emits an empty line
before each new reference.

Prepare for mdoc(7)NG.

Fixed bitrot in K&R support (3 missing __P(())'s defeated the point of 7
non-missing ones in <com_err.h> which includes this file).

Fixed bitrot in K&R support (1 missing __P(()) defeated the point of 7
non-missing ones).

Removed private declaration of __P(()) while I'm here. Include
<sys/cdefs.h> to get the system definition. The privation declaration
would break the system definition if it were different.

Fix up this for the build; some compatibility files have been added -
these will be submitted back to KTH for inclusion.

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