svn commit: r203260 - stable/7/etc

[Edwin Groothuis]

Author: edwin
Date: Sat Jan 30 21:55:43 2010
New Revision: 203260
URL: http://svn.freebsd.org/changeset/base/203260

Log:
  MFC of 203066, 203067
  
  Git has been added as port 9418:
  http://www.iana.org/assignments/port-numbers
  
  The Erlang Port Mapper Daemon (from ports/lang/erlang) has been
  assigned official port number 4369 by IANA.
  
  PR:           conf/143259 conf/113265
  Submitted by: Denny Lin <dennylin93 at cnmc32.hs.ntnu.edu.tw>, Jimmy Olgeni <olgeni at freebsd.org>
  Approved by:	re (kib)

Modified:
  stable/7/etc/services
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/services
==============================================================================
--- stable/7/etc/services	Sat Jan 30 21:44:19 2010	(r203259)
+++ stable/7/etc/services	Sat Jan 30 21:55:43 2010	(r203260)
@@ -2227,6 +2227,8 @@ rwhois		4321/tcp   #Remote Who Is
 rwhois		4321/udp   #Remote Who Is
 unicall		4343/tcp
 unicall		4343/udp
+epmd		4369/tcp   #Erlang Port Mapper Daemon
+epmd		4369/udp   #Erlang Port Mapper Daemon
 krb524		4444/tcp
 krb524		4444/udp
 # PROBLEM krb524 assigned the port,
@@ -2372,6 +2374,8 @@ dlip		7201/udp
 ftp-proxy	8021/tcp   # FTP proxy
 natd		8668/divert # Network Address Translation
 jetdirect	9100/tcp   #HP JetDirect card
+git		9418/tcp   #git pack transfer service
+git		9418/udp   #git pack transfer service
 man		9535/tcp
 man		9535/udp
 sd		9876/tcp   #Session Director