- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

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)

Remove empty directories from the HEAD.

Discussed with: developers, imp

Update for the 6.1.5 import.

More fixes.

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

Put stock 6.1.5 file into HEAD.

Not sure why mbr deleted this file - its useful.

2005-05-28 Erez Zadok <ezk@cs.sunysb.edu>
* libamu/alloca.c: remove file from distro.

2005-10-02 Erez Zadok <ezk@cs.sunysb.edu>
* libamu/strutil.c: rename from util.c to explain better purpose
of file.

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

Include support for FreeBSD's <fs/msdosfs/msdosfsmount.h>.
Also <ufs/ufs/ufsmount.h> is safe to use.

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.

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

Fix -D description to read debug_options

PR: doc/97939
Submitted by: Serg Podtynnyi <n-ice@yandex.ru>
MFC after: 1 week

Remove conflicting extern decralaration for mboxfile variable.
It is defined as static in implementation file.

Correct a typo: In order to make fixmount(8) quite, one should
use -q, not -v.

Update URL and email address.

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

Spell "referred" correctly.

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

Approved by: re (blanket)

Expand *n't contractions.

Use .Xr in place of .I for Xref's.

PR: 71730
Submitted by: Gavin Atkinson <gavin.atkinson@ury.york.ac.uk> (original patch)
Commit ok: mbr (through GNATS PR)

Readd accidently deleted file.

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.

Add some unneeded files to the Xlist in preparation for the new
amd import.

Add a list of all local changed files. All these files have been taken
of the vendor tree.

We don't need these files. Add the to the x-list.

Bring man page back in shape. Many option descriptions lacked the
option name and paramaters they apply to and there was a mix of
formatting methods and styles.

I'm not sure that the description of "nfs_retransmit_counter" is
correct, but it does now at least match what's in -STABLE.

add section number to .Xr directive

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

Add notice about deleting .cvsignore

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

Sync with 6.0.9 import. Add my email.

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.

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

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

Approved by: re

sys_nerr should come from standard headers -- not from a coder's guess
of what is right.

Userland part of nfs client/server split and cleanup.

Add the am-utils homepage to SEE ALSO

Submitted by: ru

Use the native mount and nfs_prot headers.
Also generate nfs_prot_x.c in ANSI-C mode.

TODO is no longer part of Amd, and we do not need, nor use clnt_sperrno.c.

Teak -- we were being a little over agressive.

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

We can use the stock defintion of "MOUNT_NFS3" now.

Reduce diff from vendor source.

Update for 6.0.7.

We are returning to the stock (6.0.7) file now.
+ The bufov vulnerability was fixed in the vendor sources.
+ 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.
+ The vendor sources are now POSIX [me harder] compliant.
+ The db vs. dbm files issue was fixed in the vendor sources.

We are returning to the stock (6.0.7) file now.
The security issues were fixed in the vendor sources.

Merge rev 1.2 (use our native headers for NFSv3), 1.9 (fs header movment)
into Amd 6.0.7.

We are returning to the stock (6.0.7) file now.
+ The bufov vulnerability was fixed in the vendor sources.
+ The vendor sources are now POSIX [me harder] compliant.

Merge our rev 1.2,3 (use or native files for NFSv3 support)
changes into Amd 6.0.7.

We are returning to the stock (6.0.7) file now.
I don't recall why the rev 1.2 hack is needed. It looks like Amd was
already using our local headers. I no longer have a FreeBSD 2.x box to
test this on, and this will never be MFC'ed to RELENG_2_2. So lets just
decrease the maintenance effort.

We are returning to the stock (6.0.7) file now.
+ The rev 1.4 addition was taken from a snapshot previous to 6.0.7, so
it is included in 6.0.7.
+ The vendor sources are now POSIX [me harder] compliant.

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: removed HISTORY info from the .Os call.

Remove this file that slipped thru FREEBSD-Xlist's actions.

- sys/msdosfs moved to sys/fs/msdosfs
- msdos.ko renamed to msdosfs.ko
- /usr/include/msdosfs moved to /usr/include/fs/msdosfs

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

mdoc(7) police: removed leading whitespaces that are not inside
Bd/Ed; these hardly degrade the quality of the produced output.

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.

Remove reference to non-existent manpage (ctl-amd(8)).

PR: 20091
Submitted by: Bruce A. Mah <bmah@cisco.com>
Approved by: nik

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 a couple of mdoc errors.

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.

Update for the 6.0.3s1 import.

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.

Get the tar arguments right.

Fix conflicts.

Version 6.0.2s2 gives us a better fix a buffer overflow problem in
real_plog(). It also gives us a few code cleanups to quiet `gcc -Wall'.

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

Update the support files from the 6.0.1 import.

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.

Add FreeBSD tag.

Don't use -ko any more.

MFS: amd mount disabling and overflow protection.

Reported by: gallatin@freebsd.org

Don't getopt -M option and don't process it unless ENABLE_AMQ_MOUNT is on.

Obtained from: am-utils-6.0.1s11

Fix a bunch of broken cross-references

Bad reference of uname(2) -> uname(3)

Actually describe all of the command line options in fsinfo(8).
Most of the text was take from the fsinfo section in info(1).
Also included a pointer to that information, since there is
so much detail about the format of the configuration files there.

Update this with reality.

Fix ufs mounting support

PR: 10044
Submitted by: Andre Albsmeier <andre.albsmeier@mchp.siemens.de>

Fix logic surrounding the noconn option.
(this should also shutup the warning message everybody sees)

Submitted by: David Wolfskill <dhw@whistle.com>

Didn't get all the mods on the fixup.

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.

".Mn mountd" -> ".Nm mountd" which now makes the instructions accurate.

PR: docs/8525
Submitted by: Norihiro Kumagai <kuma@jp.FreeBSD.org>

Grammer fix and style nits.

PR: docs/8879
Submitted by: Kazuo Horikawa <horikawa@jp.freebsd.org>

xfer typo

PR: docs/8723
Submitted by: Junji SAKAI <sakai@jp.freebsd.org>

amq.8 contains typos

PR: docs/8433
Reviewed by: Kazuo Horikawa <horikawa@jp.freebsd.org>

Not part of AM-UTILS any longer. Should be build from fixrmtab.in.

update for latest vendor import

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.

update to match reality

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>

Fully use our own generated files for NFSv3.

More sorting of references.

MFO: rev 1.3 - correct man page xrefs.

compare getopt() with -1, not EOF

MFO rev 1.4 - sort cross references

With the change to the 4.4Lite2 mount interface we don't need special
conf files.

Don't utilize the pre-4.4Lite2 INITMOUNTNAMES compatibility cruft.
(bde will remove it soon)

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

This is AMD.CONF, not AMQ.CONF

rpcgen our own mount.h, nfs_prot.h, mount_xdr.c, and nfs_prot_x.c
for NFSv3 support

accidently changed some white space

Properly create db files vs. dbm files.

Obtained from: NetBSD

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

Obtained from: NetBSD

more files we don't need.

Two more files FreeBSD doesn't need.

upgrade instructions.

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