From owner-svn-src-stable@FreeBSD.ORG  Fri Jan 29 11:30:40 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE5491065670;
	Fri, 29 Jan 2010 11:30:40 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DCF568FC13;
	Fri, 29 Jan 2010 11:30:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TBUed3047761;
	Fri, 29 Jan 2010 11:30:40 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0TBUepx047759;
	Fri, 29 Jan 2010 11:30:40 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201001291130.o0TBUepx047759@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Fri, 29 Jan 2010 11:30:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203163 - stable/8/etc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2010 11:30:41 -0000

Author: edwin
Date: Fri Jan 29 11:30:40 2010
New Revision: 203163
URL: http://svn.freebsd.org/changeset/base/203163

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@cnmc32.hs.ntnu.edu.tw> Jimmy Olgeni <olgeni@freebsd.org>

Modified:
  stable/8/etc/services   (contents, props changed)

Modified: stable/8/etc/services
==============================================================================
--- stable/8/etc/services	Fri Jan 29 10:38:54 2010	(r203162)
+++ stable/8/etc/services	Fri Jan 29 11:30:40 2010	(r203163)
@@ -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