- 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

Bring /etc/protocols up to date.

PR: conf/175397
Submitted by: ak

Update /etc/protocols with IANA list updated 2007-02-12

Gotcha: Number 48 (mhrp) is replaced with dsr.

Submitted by: edwin
PR: config/112732
MFC after: 2 weeks

White space fixes only: replace spaces with tabs.

Add CARP (Common Address Redundancy Protocol), which allows multiple
hosts to share an IP address, providing high availability and load
balancing.

Original work on CARP done by Michael Shalayeff, with many
additions by Marco Pfatschbacher and Ryan McBride.

FreeBSD port done solely by Max Laier.

Patch by: mlaier
Obtained from: OpenBSD (mickey, mcbride)

Link pf to the build and install:
This adds the former ports registered groups: proxy and authpf as well as
the proxy user. Make sure to run mergemaster -p in oder to complete make
installworld without errors.

This also provides the passive OS fingerprints from OpenBSD (pf.os) and an
example pf.conf.

For those who want to go without pf; it provides a NO_PF knob to make.conf.

__FreeBSD_version will be bumped soon to reflect this and to be able to
change ports accordingly.

Approved by: bms(mentor)

Renumber divert.

Forgotten by: fenner
Approved by: re (murray)

Consistancy, file system > filesystem

crdup(9) is not a protocol.

PR: 34624
Submitted by: John Nielsen <nielsenj@cs.byu.edu>,
Hiten Pandya <hiten@uk.FreeBSD.org>

Update reference URL.

MFC after: 3 days

Do IANA update maintenance: list synched up to the latest version.

Document that 254 (divert) is not IANA assigned.

$Id$ -> $FreeBSD$

solve name conflict
the old STREAM protocol has been obsoleted by "ST2" (RFC 1819)

Detected by: Andre Albsmeier <andre.albsmeier@mchp.siemens.de>
Suggested by: Matt Crawford <crawdad@fnal.gov>

Since FreeBSD can be used as sniffer, update the /etc/protocols file
after demand of two people and no objections:
- included all registered protocols, so it's now a useful reference as well
- renamed title to reflect new content
(deleted word "IP", since all registered internet protocols are included now)
- corrected URL (file isn't hosted by iana.org anymore)

Add the GRE protocol
Generic Routing Encapsulation (RFC 1702)

Add an entry for SKIP, and update the pointer to the new reference source.

obey internet-draft "draft-stevens-advanced-api-04.txt" for ipv6 defs.

added icmp6 and ip6. they are becoming common.
Source: ftp://ftp.isi.edu/in-notes/iana/assignments/protocol-numbers

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Adding changes to ipfw and the kernel to support ip packet diversion..
This stuff should not be too destructive if the IPDIVERT is not compiled in..
be aware that this changes the size of the ip_fw struct
so ipfw needs to be recompiled to use it.. more changes coming to clean this up.

Add official protocol and port numbers for RSVP.

Added a whole bunch of common protocols and ports from the latest edition of
Assigned Numbers.

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

Initial import of 386BSD 0.1 othersrc/etc