Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

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

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)

Revise the man->mdoc conversion of the amd manpages.

Put stock 6.1.5 file into HEAD.

2005-03-05 Ion Badulescu <ionut@moisil.badula.org>
* amd/amfs_inherit.c: removed, dead code

Merge rev. 1.7 (change mounting directory to match traditional FreeBSD
/etc/defaults/rc.conf) into 6.1.5.

Merge the 6.0.10p1 -> 6.1.5 changes into our manpages.

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

Update URL and email address.

Approved by: trhodes (mentor)
20 day timeout: mbr (did not reply, mentor approved commit)

Apply a series of scripts to automatically fix some markup bugs.

Approved by: re (blanket)

Check if `dirmask' is a member of `pcfs_args_t'.

A diff to the autoconf aux-files has been submitted to
the amd people.

PR: 57401
Submitted by: Andre Albsmeier <andre.albsmeier@siemens.com>

Resolve conflicts for am-utils-6.0-10p1 (am-utils-6.0-20040513)
import:

- Fix typo in amd/nfs_prot_svc.c
- Manpage change in scripts/amd.conf.5
- Remove unneeded configure files
- Remove unneeded m4/macros

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

Apparently these slipped through the import procedure.
Kill them again.

Resolve conflicts.

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

Uniformly refer to a file system as "file system".

Approved by: re

Add the am-utils homepage to SEE ALSO

Submitted by: ru

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

We are returning to the stock (6.0.7) file now.
My "nfsv2" mount option hack was added to the vendor sources.

We are returning to the stock (6.0.7) file now.
The vendor sources are now POSIX [me harder] compliant.

We are returning to the stock (6.0.7) file now.
The bufov vulnerability was fixed in the vendor sources.

Merge rev 1.7 (mount directory change) into Am-utils 6.0.7.

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

mdoc(7) police: s/BSD/.Bx/ where appropriate.

mdoc(7) police:

Avoid using parenthesis enclosure macros (.Pq and .Po/.Pc) with plain text.
Not only this slows down the mdoc(7) processing significantly, but it also
has an undesired (in this case) effect of disabling hyphenation within the
entire enclosed block.

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

Catch a left over reference to "/a".

Document change to the default mount dir.

Since this is off the vendor branch, might as well change the default
mounting directory to what we always specify in /etc/defaults/rc.conf.

Mention "amd -H" in the synopsis so that references to the "first form
listed", etc, make sense.

PR: 18592
Submitted by: Patrick Gosling <jpmg@eng.cam.ac.uk>

Fix miscellaneous mdoc macro argument limit infringements.

PR: 18465
Reported by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>

Don't refer to non-existent automount(8).

Submitted by: Alexey M. Zelkin <phantom@cris.net>

Fix errors in .Xr usage.

PR: docs/17057
Submitted by: Submitted by: Udo Erdelhoff <ue@nathan.ruhr.de>

Merge vendor changes into our version of this.

Fix conflicts.

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

Fix conflicts.

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

MFS: amd mount disabling and overflow protection.

Reported by: gallatin@freebsd.org

Fix conflicts.

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

Clean up conflicts.

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

Support our "nfsv2" option. (originally added to old amd/amd/host_opts.c
rev 1.5)
The "nfsv2" option is equivant to "proto=udp,vers=2". It is debatable
whether NFS v2 should force "proto=udp" but I figure that is what most people
will expect. Note, I can get the new Amd to mount a 2.2-STABLE box with
"proto=tcp,vers=2". RFC 1094 does not disallow such behavior.

Merge our older Amd manpages with the new am-utils manpages.
The am-utils manpages were un-mandocafied, un4.4BSD'ed with CSRG
copyrights regressed to 1989.

This work was done by Brian Handy who I am very greatful to.
(only a few minor tweaks by me)

Submitted by: Brian Handy <handy@lambic.physics.montana.edu>

compare getopt() with -1, not EOF

MFO rev 1.4 - sort cross references

Don't assume that time_t is long.
(from rev 1.4 by bde of old AMD)

* Check getopt()'s return with -1, not EOF
* protect a few potential buffer overflows

Obtained from: NetBSD

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