MFC r358154 (by delphij)
Bump PROTOMAX: this matches the value on NetBSD and will be necessary for
future updates.

MFC r358448; (--ignore-ancestry due to merge conflicts)
/etc/services: attempt to bring the database to this century.

This is the result of splitting r358153 in two, in order to avoid a build
system bug and being able to merge the change to previous releases..

Document better this file, updating the URL to the IANA registry and closely
match the official services.

For system ports (0 to 1023) we now try to follow the registry closely, noting
some historical differences where applicable.

As a side effect: drop references to unofficial Kerberos IV which was EOL'ed
on Oct 2006[1]. While it is conceivable some people may still use it in some
very old FreeBSD machines that can't be replaced easily, the use of it is
considered a security risk. Also drop the unofficial netatalk, which we
supported long ago in the kernel but was dropped long ago.

Leave for now smtps, even though it conflicts with IANA's submissions.
The change should have very little visibility, if any, but should be a
step closer to the current IANA database.

[1] https://web.mit.edu/kerberos/krb4-end-of-life.html

MFC r337973:

Add Modbus Application Protocol to /etc/services

IANA reassigned ports 502 and 802 on 2014-06-10

PR: 213276
Submitted by: Mark.Martinec@ijs.si

MFC r327438:

Add VXLAN (RFC 7348) port

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

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

Replace all whitespaces between port name and number with tabs,

Add port for IRC over TLS/SSL, as noted in RFC 7194.

PR: 192505
Submitted by: loic.blot@unix-experience.fr
MFC after: 3 days

Add CouchDB ports (5984 TCP/UDP).

PR: 193268
Submitted by: yuri@rawbw.com
MFC after: 1 week

Add VAMI (VMware Appliance Management Interface) port.

Reviewed by: eadler
MFC after: 2 weeks

Add Veritas NetBackup

Obtained From: DragonFly BSD

Add the Short Message Peer-to-Peer protocol

PR: conf/183398
Submitted by: olgeni

Add MySQL port 3306

Obtained from: http://www.iana.org/assignments/port-numbers
MFC after: 1 week

Spelling fixes for etc/

Add for existing protocol entries the missing SCTP port allocations
and add protocol entries for protocols which have SCTP port allocations.
These entries are according to
http://www.iana.org/assignments/port-numbers
as of today. Also add SCTP port allocation entires for the
echo, daytime, and chargen service.
Discussed with rwatson@

MFC after: 3 days.

Remove trailing white space. No functional changes.

Add sane-port (Scanner Access Now Easy) as port 6566.

Obtained from: http://www.iana.org/assignments/port-numbers
MFC after: 3 days

ManageSieve has been added as port 4190:
http://www.iana.org/assignments/port-numbers

Obtained from: http://www.iana.org/assignments/port-numbers
MFC after: 3 day

The Erlang Port Mapper Daemon (from ports/lang/erlang) has been
assigned official port number 4369 by IANA.

PR: conf/113265
Submitted by: Jimmy Olgeni <olgeni@freebsd.org>
Obtained from: http://www.iana.org/assignments/port-numbers
MFC after: 2 days

Git has been added as port 9418:
http://www.iana.org/assignments/port-numbers

PR: conf/143259
Submitted by: Denny Lin <dennylin93@cnmc32.hs.ntnu.edu.tw>
Obtained from: http://www.iana.org/assignments/port-numbers
MFC after: 2 day

Add OpenVPN IANA assigned port number.

Use the udp protocol in favor of the nonexistant upd protocol in the
sge_execd entry.

Reported by: emaste
Pointy hat to: brooks
Approved by: re (kensmith)

Add IANA assigned iscsi-target port as its the default port
according RFC 3720.

Approved by: re (bmah)

Add service entries for Sun Grid Engine's qmaster and execution service
as per IANA assignments to simplify the installation of the sysutils/sge
port.

Approved by: re (bmah)

Forced commit to note that last commit:

PR: conf/112699
MFC after: 2 weeks

Bring the well known ports of /etc/services into sync with the IANA
list.

This is only for the well known known ports (port 1-1023) for tcp and
udp only.

Changes:
- Removed "problems" comments around port 57, 77 and 87
- Removed audionews (port 114)
- Added imap3 (port 220)
- Removed yak-chat (port 258)
- Removed concert (port 786)
- Added a lot of new allocations

Submitted by: edwin

Add SIP-related ports.

Obtained from: IANA list of reserved ports.
Reviewed by: edwin@

White space tidy-up.

- Add IANA-assigned ports for HP status & services daemon and I/O backend
daemon. The FreeBSD port print/hplip currently provides these services.

PR: conf/99593
Submitted by: Anish Mistry <amistry@am-productions.biz>
Approved by: maxim
MFC after: 1 week

- Add IANA assigned port for amanda server control over tcp. The
current misc/amanda-server code uses it.

PR: conf/111050
Submitted by: Charles Sprickman<spork@bway.net>
Approved by: maxim
MFC after: 1 week

- Sync service names with IANA (http://www.iana.org/assignments/port-numbers).
The registration names for 5222(tcp,udp) and 5269(tcp,udp) was changed to
xmpp-client and xmpp-server correspondingly.

This inconsistency causes problems to applications developed on other
systems, as they tries to use port numbers from /etc/services as fallback.

PR: conf/100606
Submitted by: Ralph Meijer <freebsd-gnats2@ralphm.ik.nu>
Approved by: maxim
MFC after: 1 week

o Add IANA assigned InterBase Database Remote Protocol 3050/tcp/udp.

PR: conf/92319
Submitted by: skv
MFC after: 1 week

Add 3653/tcp and 3653/udp, since they were specifically requested.

PR: conf/63907
Submitted by: Marc Blanchet
MFC after: 3 days

Whitespace cleanup. This will simplify a future merge from
IANA's official list of port assignments.

Sort entries correctly.

Add ftp-proxy 8021/tcp in order to make the inetd.conf entry actually work.

Submitted-by: brueffer
Approved-by: bms(mentor)

Correct definition for 1000/tcp and 1000/udp, sync with
<URL:http://www.iana.org/assignments/port-numbers>.

Submitted by: Roman Newhauser <roman@bellavista.cz>

Add port assignment for Subversion, as per
<URL:http://www.iana.org/assignments/port-numbers>.

PR: conf/54371
Submitted by: Roman Newhauser <roman@bellavista.cz>
MFC after: 1 week

Fix typo, tdp -> tcp

PR: conf/56939
Submitted by: Alain Kalker <miki@dds.nl>

Microsoft Remote Desktop Protocol uses 3389/tcp.

RFC 3561 (ad-hoc on-demand distance vector routing) was ratified
and the ports assigned by IANA.

PR: conf/55125
Submitted by: Bruce M Simpson <bms@spc.org>
MFC after: 2 days

* Add the nut port from the IANA list (for the nut port)
* Add the rndc port, by common usage (TCP only since rndc doesn't
use UDP, and the port is not officially assigned)

Add entries for Multicast DNS.

Comment out imap3@220 and imap4-ssl@585 which are not used.

PR: conf/46294
Submitted by: Larry Rosenman <ler@lerctr.org>
MFC after: 2 weeks

Add 1701/l2tp, layer 2 tunnelling protocol, as per IANA services.

PR: conf/35240
Submitted by: Annihilator <annihilator.c@usa.net>
MFC after: 2 weeks

Add Web Objects.

Obtained from: IANA
Sponsored by: Apple

Add IPP (Internet Printing Protocol) and remove blank lines.

Obtained from: IANA
Sponsored by: Apple

Add Remote AppleEvents/PPC Toolbox.

Approved by: rwatson
Obtained from: IANA
Sponsored by: Apple

After getting IANA to fix a typo in their port assignments, add
some new IANA-blessed services and close some PRs. Ports for
Jabber and PostgreSQL.

PR: conf/35219, conf/35220
Submitted by: Sean Chittenden <sean@chittenden.org>
MFC after: 1 day

Long overdue whitespace cleanup. To give yourself an idea of how
ugly it was,

$ awk '/[[:space:]]$/ { sub(/$/,"\$"); print; }' /etc/services

On the previous revision. And that's only the trailing whitespace.

Forced commit. Please ignore the pppd-related log entry for revision
1.81. It was the product of a botched cvs(1) command line (and was also
a forced, null-delta commit).

(null delta)

The previous delta uncommented kerberos-adm, not kserver-adm.

Uncomment kserver-adm, which is IANA-sanctioned and has no apparent
conflicts.

PR: conf/34316
Submitted by: Sean Chittenden <sean@chittenden.org>
MFC after: 2 weeks

Put a complete set of pppd(8) sample configuration files in
/usr/share/examples/pppd.

Update pppd(8) documentation to reflect this, usr.sbin/pppd/pppd.8.

Remove the out-of-place pppd(8) configuration files in etc/ppp,
ppp.shells.sample and ppp.deny.

Make the appropriate changes to the build process, etc/Makefile and
etc/mtree/BSD.usr.mtree, so it all works.

The files from etc/ppp, ppp.shells.sample and ppp.deny, were moved
with a repo copy. Note it in the logs with a forced commit to these
two.

Submitted by: Maxim Konovalov <maxim@macomnet.ru> provided the new samples.

'ircd' is a better service name. Also note '6667' is unoffical

Submitted by: knu (name change)

RE: rev 1.78, s/1667/6667/g

There is already an 'irc' service at port 194. However my experience is that
1667 is what is really used. So name port 1667 'irc-client'.

Add IRC

Add commented-out/prototype entries for samba's swat configuration tool.

Requested by: "William Wong" <willwong@samurai.com>
MFC after: 1 week

Add `dict' per http://www.iana.org/assignments/port-numbers and RFC 2229.

Scratch an itch of long standing by adding entries for the most
commonly used x11 ports

I could have sworn I did this already, but obviously I didn't. So,
take another stab at updating the IANA web page.

Add an entry for the commonly used (although unofficial) kpop port.

PR: conf/21551
Submitted by: Luis Casillas <casillas@stanford.edu>
Reviewed by: rwatson

Add a note about port 98 commonly being used for RH linuxconf,
(unofficially of course).

PR: misc/21775
Submitted by: Dann Lunsford <dann@greycat.com>

Add ports for sshell, ldaps, rsync, ftps-{data|control}, ircs, and
correct some ommissions of udp ports.

Update IANA web page.

Clean up/correct some comments. I went a little further than the PR.

PR: conf/23416
Submitted by: Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>

add MR-AFS port numbers

add ircs, per IANA

MFC after: 3 days

Add missing entry for ospf6d.

Submitted by: Akihiro Kosakada <pdp@cyber-fleet.com>

fix typo; loppgin -> login

PR: 22823
Submitted by: Jimmy Olgeni <olgeni@uli.it>

Add James Housley's official IANA assigned numbers for healthd.

Requested by: jeh

Add acap, as per IANA.

PR: 20990
Submitted by: Lyndon Nerenberg <lyndon@orthanc.ab.ca>

Fix typo: "managment" -> "management".

PR: 19689
Submitted by: SUGIMURA Takashi <sugimura@jp.FreeBSD.org>

$Id$ -> $FreeBSD$

Add ``cvsup''.

Add SSL versions of imap, pop3 and telnet (imaps, pop3s and telnets)

Sigh. It's always the smallest changes that generate the largest public
commentary. :) 3rd and final frob of this. Leave enough comments
behind that anyone running into trouble at least has some cited clues
on dealing with it and jump into the brave new world with uncommented
IANA port assignments.

Compromise proposal: Comment out both old and new radius ports, explain
the differences in the comments, let the USER select which assignment to
use now.

Suggested by: rgrimes

Put radius on its proper ports.

Spelling correction.

PR: 10824

Add entries to make CodaFS run out of the box.

PR: misc/5855
Submitted by: Robert Watson <robert@cyrus.watson.org>

Port #s 1-599 checked agaist Robert Watson <robert@cyrus.watson.org>'s
formated IANA Port assignment list.

Prodded from: freebsd-current list

NFS can use TCP now days

Remove ppp 3000/tcp. Ppp has nothing in common with port 3000.

Fix spelling error.

6668/divert -> 8668/divert. IRC uses 6668.

port numbers for zebra,
a free multithreaded rip/ospf/bgp4 route server/reflector
needed for zebra port

RADIUS was originally coded to use ports 1645 (radius) and
1646 (radacct), but RFC's 2138 and 2139 define new ports
for RADIUS and RADIUS accounting, namely 1812 and 1813
respectively. FreeBSD 2.2.6 uses the old radacct port, but
the new radius port, which is a bit silly.

PR: 6712
Reviewed by: phk
Submitted by: Nick Hilliard <nick@foobar.org>

Add jetdirect 9100/tcp

PR: 5195
Reviewed by: phk
Submitted by: Cy Schubert <cschuber@uumail.gov.bc.ca>

Add natd support.
PR: 6339
Submitted by: cdillon@wolves.k12.mo.us

Add cfengine entries.
OK'ed by: jkh

Remove duplicate entries by changing tcp -> udp.

PR: 2882

Nuke ircd entries - nobody can agree on what constitutes a reasonable
range for them and I'm %&#$%@! sorry I ever added them in the first place.

Add a few useful entries (e.g. radius)

MF22: sanify ircd entries.

Add entries for ircd.
PR: 5809
Submitted by: Brian Feldman <green@feldman.dyn.ml.org>

Comment out services that conflict with known (kerberos) services.
Add KTH names for Kerberos services. (K5-ready).

Add Wnn6 reverse lookup server port.

Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>

Add canna and Wnn ports numbers.

Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>

Fix typo (Eudroa -> Eudora)

PR: 4214

add cvspserver (officially registered at 2401)

Fix krb5_prop entry.

Pointed-by: Bill Fenner

Add krb5_prop service (kerberos v5 prop).
It's on the same port as for v4 but requires different name.

Added pop3pw amandaidx amidxtape

Revert $FreeBSD$ to $Id$

Since we have netatalk in the kernel, make life a little easier for
people and add the four needed entries in /etc/services.

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.

Clean up imap

Add hylafax

Add zephyr

Add skkserv (1178/tcp) and sj3 (3086/tcp). They are both Japanese
kanji input servers.

Add amanda default port

Add phone (1167/udp).

Add rplay.

Submitted by: Andreas Klemm <andreas@knobel.gun.de>

Add "ppp 3000/tcp" for Use-level PPP in daemon mode (-auto)

Add gnatsd/prmsd.

Add `cfinger'. This ain't an official service, but is in use by the
finger data collection service of GNU finger.

Add dhcp aliases for bootp services

Add:
radius 1645/udp radiusd
radacct 1646/udp
Submitted by: Jaye Mathisen <mrcpu@cdsnet.net>

port 22 is the officially assigned "ssh" port...

inetd.conf:
Add rkinit at 2108/tcp.

services:
Add rkinitd.

Add official protocol and port numbers for RSVP.

Since krb_prob conflicts with registered tell protocol,
mark tell section with #PROBLEMS comment

Add krb_prop entry.

Upgrade to RFC1700 (IANA)

Fix official name of 113/tcp service
Obtained from: SunOS /etc/services

Get the right name for the v4 kadmin service.

Added kadmin protocol port

Fixed comments.

Since we now support Kerberos v4, make those ports the default
rather than the official ones for v5.

Remove more references to the U word.

Added entries for sup into services.
Added an example entry for the pop3 popper into inetd.conf as a comment.

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

Added ntp 123/udp # Network Time Protocol for xntp usage since this is a
well known service.

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