rpms/setup/F-9 setup-2.6.18-inputrcexport.patch, NONE, 1.1 setup-2.6.18-protocolservices.patch, NONE, 1.1 setup-2.6.18-rxvt.patch, NONE, 1.1 setup-2.6.18-uidgid.patch, NONE, 1.1 setup.spec, 1.57, 1.58

Ondrej Vasik ovasik at fedoraproject.org
Tue Feb 3 13:14:46 UTC 2009


Author: ovasik

Update of /cvs/extras/rpms/setup/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16100

Modified Files:
	setup.spec 
Added Files:
	setup-2.6.18-inputrcexport.patch 
	setup-2.6.18-protocolservices.patch setup-2.6.18-rxvt.patch 
	setup-2.6.18-uidgid.patch 
Log Message:
 add gid 87 reservation for polkituser, add gid reservation for group cdrom(:11), dialout(:18) tape (:33), kvm (:36), uidgid pair for pkiuser(17:17), uid for vdsm user (36:), make uidgid file better parseable,  do not export INPUTRC(to respect just created ~/.inputrc),  update procols to later IANA list(2008-04-18),  update services to later IANA list(2008-11-17), add URL, few spec files fixes, mark /etc/protocols and /etc/inputrc %%config(noreplace), add support for ctrl+arrow keys in rxvt(#474110)

setup-2.6.18-inputrcexport.patch:

--- NEW FILE setup-2.6.18-inputrcexport.patch ---
diff -urNp setup-2.6.18-orig/bashrc setup-2.6.18/bashrc
--- setup-2.6.18-orig/bashrc	2008-11-18 15:45:51.000000000 +0100
+++ setup-2.6.18/bashrc	2009-02-03 14:06:41.000000000 +0100
@@ -18,14 +18,14 @@ if [ "$PS1" ]; then
 		if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
 			PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
 		else
-	    	PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\007"'
+			PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\007"'
 		fi
 		;;
 	screen)
 		if [ -e /etc/sysconfig/bash-prompt-screen ]; then
 			PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen
 		else
-		PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\033\\"'
+			PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\033\\"'
 		fi
 		;;
 	*)
diff -urNp setup-2.6.18-orig/csh.login setup-2.6.18/csh.login
--- setup-2.6.18-orig/csh.login	2008-11-18 15:45:51.000000000 +0100
+++ setup-2.6.18/csh.login	2009-02-03 14:08:35.000000000 +0100
@@ -17,10 +17,6 @@ endif
 setenv HOSTNAME `/bin/hostname`
 set history=1000
 
-if ( ! -f $HOME/.inputrc ) then
-	setenv INPUTRC /etc/inputrc
-endif
-
 if ( -d /etc/profile.d ) then
         set nonomatch
         foreach i ( /etc/profile.d/*.csh )
diff -urNp setup-2.6.18-orig/profile setup-2.6.18/profile
--- setup-2.6.18-orig/profile	2008-11-18 15:45:51.000000000 +0100
+++ setup-2.6.18/profile	2009-02-03 14:08:04.000000000 +0100
@@ -38,11 +38,7 @@ fi
 HOSTNAME=`/bin/hostname 2>/dev/null`
 HISTSIZE=1000
 
-if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then
-    INPUTRC=/etc/inputrc
-fi
-
-export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE INPUTRC
+export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE
 
 for i in /etc/profile.d/*.sh ; do
     if [ -r "$i" ]; then
@@ -54,7 +50,5 @@ for i in /etc/profile.d/*.sh ; do
     fi
 done
 
-export PATH
-
 unset i
 unset pathmunge

setup-2.6.18-protocolservices.patch:

--- NEW FILE setup-2.6.18-protocolservices.patch ---
diff -urNp setup-2.6.18-orig/protocols setup-2.6.18/protocols
--- setup-2.6.18-orig/protocols	2007-05-23 17:55:03.000000000 +0200
+++ setup-2.6.18/protocols	2009-01-30 15:38:18.000000000 +0100
@@ -1,11 +1,12 @@
 # /etc/protocols:
-# $Id: protocols,v 1.6 2007/05/23 15:55:03 pknirsch Exp $
+# $Id: protocols,v 1.7 2008/11/19 12:27:31 ovasik Exp $
 #
 # Internet (IP) protocols
 #
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
+# Last IANA update included dated 2008-04-18
 #
 # See also http://www.iana.org/assignments/protocol-numbers
 
@@ -43,7 +44,7 @@ iso-tp4	29	ISO-TP4		# ISO Transport Prot
 netblt	30	NETBLT		# Bulk Data Transfer Protocol
 mfe-nsp	31	MFE-NSP		# MFE Network Services Protocol
 merit-inp	32	MERIT-INP	# MERIT Internodal Protocol
-dccp	33	DCCP		# Datagram Congestion Control Protocol  
+dccp	33	DCCP		# Datagram Congestion Control Protocol
 3pc	34	3PC		# Third Party Connect Protocol
 idpr	35	IDPR		# Inter-Domain Policy Routing Protocol
 xtp	36	XTP		# Xpress Tranfer Protocol
@@ -53,7 +54,7 @@ tp++	39	TP++		# TP++ Transport Protocol
 il	40	IL		# IL Transport Protocol
 ipv6	41	IPv6		# IPv6
 sdrp	42	SDRP		# Source Demand Routing Protocol
-ipv6-route	43	IPv6-Route 	# Routing Header for IPv6
+ipv6-route	43	IPv6-Route	# Routing Header for IPv6
 ipv6-frag	44	IPv6-Frag	# Fragment Header for IPv6
 idrp	45	IDRP		# Inter-Domain Routing Protocol
 rsvp	46	RSVP		# Resource ReSerVation Protocol
@@ -61,9 +62,9 @@ gre	47	GRE		# Generic Routing Encapsulat
 dsr	48	DSR		# Dynamic Source Routing Protocol
 bna	49	BNA		# BNA
 esp	50	ESP		# Encap Security Payload
-ipv6-crypt	50	IPv6-Crypt	# Encryption Header for IPv6
+ipv6-crypt	50	IPv6-Crypt	# Encryption Header for IPv6 (not in official list)
 ah	51	AH		# Authentication Header
-ipv6-auth	51	IPv6-Auth	# Authentication Header for IPv6
+ipv6-auth	51	IPv6-Auth	# Authentication Header for IPv6 (not in official list)
 i-nlsp	52	I-NLSP		# Integrated Net Layer Security TUBA
 swipe	53	SWIPE		# IP with Encryption
 narp	54	NARP		# NBMA Address Resolution Protocol
@@ -150,7 +151,9 @@ rsvp-e2e-ignore	134	RSVP-E2E-IGNORE
 #	135			# Mobility Header
 udplite	136	UDPLite
 mpls-in-ip	137	MPLS-in-IP
-#   138-252 Unassigned                                       [IANA]
+manet	138	manet		# MANET Protocols
+hip	139	HIP		# Host Identity Protocol
+#   140-252 Unassigned                                       [IANA]
 #   253     Use for experimentation and testing           [RFC3692]
 #   254     Use for experimentation and testing           [RFC3692]
 #   255                 Reserved                             [IANA]
diff -urNp setup-2.6.18-orig/services setup-2.6.18/services
--- setup-2.6.18-orig/services	2008-11-18 12:48:44.000000000 +0100
+++ setup-2.6.18/services	2009-01-30 15:38:18.000000000 +0100
@@ -1,5 +1,5 @@
 # /etc/services:
-# $Id: services,v 1.44 2008/04/07 21:30:33 pknirsch Exp $
+# $Id: services,v 1.45 2008/11/19 14:56:28 ovasik Exp $
 #
 # Network services, Internet style
 #
@@ -87,6 +87,7 @@ finger		79/tcp
 finger		79/udp
 http		80/tcp		www www-http	# WorldWideWeb HTTP
 http		80/udp		www www-http	# HyperText Transfer Protocol
+http		80/sctp				# HyperText Transfer Protocol
 kerberos	88/tcp		kerberos5 krb5	# Kerberos v5
 kerberos	88/udp		kerberos5 krb5	# Kerberos v5
 supdup		95/tcp
@@ -144,6 +145,7 @@ nextstep	178/tcp		NeXTStep NextStep	# Ne
 nextstep	178/udp		NeXTStep NextStep	# server
 bgp		179/tcp				# Border Gateway Proto.
 bgp		179/udp
+bgp		179/sctp
 prospero	191/tcp				# Cliff Neuman's Prospero
 prospero	191/udp
 irc		194/tcp				# Internet Relay Chat
@@ -182,14 +184,17 @@ ulistproc	372/tcp		ulistserv	# UNIX List
 ulistproc	372/udp		ulistserv
 ldap		389/tcp
 ldap		389/udp
+osb-sd		400/tcp		# Oracle Secure Backup
+osb-sd		400/udp		# Oracle Secure Backup
 svrloc          427/tcp				# Server Location Protocl
 svrloc          427/udp				# Server Location Protocl
 mobileip-agent	434/tcp
 mobileip-agent	434/udp
 mobilip-mn	435/tcp
 mobilip-mn	435/udp
-https		443/tcp				# MCom
-https		443/udp				# MCom
+https		443/tcp				# http protocol over TLS/SSL
+https		443/udp				# http protocol over TLS/SSL
+https		443/sctp			# http protocol over TLS/SSL
 snpp		444/tcp				# Simple Network Paging Protocol
 snpp		444/udp				# Simple Network Paging Protocol
 microsoft-ds	445/tcp
@@ -769,7 +774,6 @@ vmnet		175/tcp			# VMNET
 vmnet		175/udp			# VMNET
 genrad-mux	176/tcp			# GENRAD-MUX
 genrad-mux	176/udp			# GENRAD-MUX
-bgp		179/sctp		# BGP
 ris		180/tcp			# Intergraph
 ris		180/udp			# Intergraph
 unify		181/tcp			# Unify
@@ -1018,8 +1022,6 @@ kryptolan	398/tcp			# Kryptolan
 kryptolan	398/udp			# Kryptolan
 iso-tsap-c2	399/tcp			# ISO Transport Class 2 Non-Control over TCP
 iso-tsap-c2	399/udp			# ISO Transport Class 2 Non-Control over UDP
-work-sol	400/tcp			# Workstation Solutions
-work-sol	400/udp			# Workstation Solutions
 ups		401/tcp			# Uninterruptible Power Supply
 ups		401/udp			# Uninterruptible Power Supply
 genie		402/tcp			# Genie Protocol
@@ -1098,7 +1100,6 @@ decvms-sysmgt	441/tcp			# decvms-sysmgt
 decvms-sysmgt	441/udp			# decvms-sysmgt
 cvc_hostd	442/tcp			# cvc_hostd
 cvc_hostd	442/udp			# cvc_hostd
-https		443/sctp		# HTTPS
 ddm-rdb		446/tcp			# DDM-Remote Relational Database Access
 ddm-rdb		446/udp			# DDM-Remote Relational Database Access
 ddm-dfm		447/tcp			# DDM-Distributed File Management
@@ -1638,6 +1639,8 @@ iscsi		860/tcp			# iSCSI
 iscsi		860/udp			# iSCSI
 owamp-control	861/tcp			# OWAMP-Control
 owamp-control	861/udp			# OWAMP-Control
+twamp-control	862/tcp			# Two-way Active Measurement Protocol (TWAMP) Control
+twamp-control	862/udp			# Two-way Active Measurement Protocol (TWAMP) Control
 iclcnet-locate	886/tcp			# ICL coNETion locate server
 iclcnet-locate	886/udp			# ICL coNETion locate server
 iclcnet_svinfo	887/tcp			# ICL coNETion server info
@@ -1710,8 +1713,8 @@ mtqp		1038/tcp		# Message Tracking Query
 mtqp		1038/udp		# Message Tracking Query Protocol
 sbl		1039/tcp		# Streamlined Blackhole
 sbl		1039/udp		# Streamlined Blackhole
-netarx		1040/tcp		# Netarx
-netarx		1040/udp		# Netarx
+netarx		1040/tcp		# Netarx Netcare
+netarx		1040/udp		# Netarx Netcare
 danf-ak2	1041/tcp		# AK2 Product
 danf-ak2	1041/udp		# AK2 Product
 afrog		1042/tcp		# Subnet Roaming
@@ -1852,8 +1855,8 @@ lmsocialserver	1111/tcp		# LM Social Ser
 lmsocialserver	1111/udp		# LM Social Server
 icp		1112/tcp		# Intelligent Communication Protocol
 icp		1112/udp		# Intelligent Communication Protocol
-ltp-deepspace	1113/tcp		# Licklider Transmission Pr
-ltp-deepspace	1113/udp		# Licklider Transmission Pr
+ltp-deepspace	1113/tcp		# Licklider Transmission Protocol
+ltp-deepspace	1113/udp		# Licklider Transmission Protocol
 mini-sql	1114/tcp		# Mini SQL
 mini-sql	1114/udp		# Mini SQL
 ardus-trns	1115/tcp		# ARDUS Transfer
@@ -2071,8 +2074,8 @@ sweetware-apps	1221/tcp		# SweetWARE App
 sweetware-apps	1221/udp		# SweetWARE Apps
 nerv		1222/tcp		# SNI R&D network
 nerv		1222/udp		# SNI R&D network
-tgp		1223/tcp		# TGP
-tgp		1223/udp		# TGP
+tgp		1223/tcp		# TrulyGlobal Protocol
+tgp		1223/udp		# TrulyGlobal Protocol
 vpnz		1224/tcp		# VPNz
 vpnz		1224/udp		# VPNz
 slinkysearch	1225/tcp		# SLINKYSEARCH
@@ -3627,8 +3630,8 @@ imsldoc		2035/tcp		#
 imsldoc		2035/udp		#
 e-dpnet		2036/tcp		# Ethernet WS DP network
 e-dpnet		2036/udp		# Ethernet WS DP network
-p2plus		2037/tcp		# P2plus Application Server
-p2plus		2037/udp		# P2plus Application Server
+applus		2037/tcp		# APplus Application Server
+applus		2037/udp		# APplus Application Server
 objectmanager	2038/tcp		#
 objectmanager	2038/udp		#
 prizma		2039/tcp		# Prizma Monitoring Service
@@ -4177,8 +4180,8 @@ ofsd		2322/udp		# ofsd
 3d-nfsd		2323/udp		# 3d-nfsd
 cosmocall	2324/tcp		# Cosmocall
 cosmocall	2324/udp		# Cosmocall
-designspace-lm	2325/tcp		# Design Space License Management
-designspace-lm	2325/udp		# Design Space License Management
+ansysli	2325/tcp		# ANSYS Licensing Interconnect
+ansysli	2325/udp		# ANSYS Licensing Interconnect
 idcp		2326/tcp		# IDCP
 idcp		2326/udp		# IDCP
 xingcsm		2327/tcp		# xingcsm
@@ -5640,8 +5643,6 @@ stss		3090/tcp		# Senforce Session Servi
 stss		3090/udp		# Senforce Session Services
 1ci-smcs	3091/tcp		# 1Ci Server Management
 1ci-smcs	3091/udp		# 1Ci Server Management
-njfss		3092/tcp		# Netware sync services
-njfss		3092/udp		# Netware sync services
 rapidmq-center	3093/tcp		# Jiiva RapidMQ Center
 rapidmq-center	3093/udp		# Jiiva RapidMQ Center
 rapidmq-reg	3094/tcp		# Jiiva RapidMQ Registry
@@ -5780,8 +5781,8 @@ imprs		3164/tcp		# IMPRS
 imprs		3164/udp		# IMPRS
 newgenpay	3165/tcp		# Newgenpay Engine Service
 newgenpay	3165/udp		# Newgenpay Engine Service
-qrepos		3166/tcp		# Quest Repository
-qrepos		3166/udp		# Quest Repository
+sossecollector		3166/tcp		# Quest Spotlight Out-Of-Process Collector
+sossecollector		3166/udp		# Quest Spotlight Out-Of-Process Collector
 nowcontact	3167/tcp		# Now Contact Public Server
 nowcontact	3167/udp		# Now Contact Public Server
 poweronnud	3168/tcp		# Now Up-to-Date Public Server
@@ -6365,8 +6366,8 @@ nppmp		3476/tcp		# NVIDIA Mgmt Protocol
 nppmp		3476/udp		# NVIDIA Mgmt Protocol
 ecomm		3477/tcp		# eComm link port
 ecomm		3477/udp		# eComm link port
-nat-stun-port	3478/tcp		# Simple Traversal of UDP Through NAT (STUN) port
-nat-stun-port	3478/udp		# Simple Traversal of UDP Through NAT (STUN) port
+stun	3478/tcp		# Session Traversal Utilities for NAT (STUN) port
+stun	3478/udp		# Session Traversal Utilities for NAT (STUN) port
 twrpc		3479/tcp		# 2Wire RPC
 twrpc		3479/udp		# 2Wire RPC
 plethora	3480/tcp		# Secure Virtual Workspace
@@ -7271,8 +7272,8 @@ sdp-portmapper	3935/tcp		# SDP Port Mapp
 sdp-portmapper	3935/udp		# SDP Port Mapper Protocol
 mailprox	3936/tcp		# Mailprox
 mailprox	3936/udp		# Mailprox
-dvbservdscport	3937/tcp		# DVB Service Disc Port
-dvbservdscport	3937/udp		# DVB Service Disc Port
+dvbservdsc	3937/tcp		# DVB Service Discovery
+dvbservdsc	3937/udp		# DVB Service Discovery
 dbcontrol_agent 3938/tcp		# Oracle dbControl Agent po
 dbcontrol_agent 3938/udp		# Oracel dbControl Agent po
 aamp		3939/tcp		# Anti-virus Application Management Port
@@ -7385,12 +7386,10 @@ bv-ds		3992/tcp		# BindView-DirectorySer
 bv-ds		3992/udp		# BindView-DirectoryServer
 bv-agent	3993/tcp		# BindView-Agent
 bv-agent	3993/udp		# BindView-Agent
-objserver	3994/tcp		# Objectika Administrator Server
-objserver	3994/udp		# Objectika Administrator Server
 iss-mgmt-ssl	3995/tcp		# ISS Management Svcs SSL
 iss-mgmt-ssl	3995/udp		# ISS Management Svcs SSL
 abcsoftware	3996/tcp		# abcsoftware-01
-abscoftware	3996/udp		# abcsoftware-01
+abcsoftware	3996/udp		# abcsoftware-01
 agentsease-db	3997/tcp		# aes_db
 agentsease-db	3997/udp		# aes_db
 dnx		3998/tcp		# Distributed Nagios Executor Service
@@ -7490,8 +7489,6 @@ acp-proto	4046/tcp		# Accounting Protoco
 acp-proto	4046/udp		# Accounting Protocol
 ctp-state	4047/tcp		# Context Transfer Protocol
 ctp-state	4047/udp		# Context Transfer Protocol
-objadmin	4048/tcp		# Objectika Administrator Agent
-objadmin	4048/udp		# Objectika Administrator Agent
 wafs		4049/tcp		# Wide Area File Services
 wafs		4049/udp		# Wide Area File Services
 cisco-wafs	4050/tcp		# Wide Area File Services
@@ -7548,6 +7545,8 @@ perimlan	4075/tcp		# ISC Alarm Message S
 perimlan	4075/udp		# ISC Alarm Message Service
 seraph		4076/tcp		# Seraph DCS
 seraph		4076/udp		# Seraph DCS
+ascomalarm	4077/udp		# Ascom IP Alarming
+cssp			4078/tcp		# Coordinated Security Service Protocol
 lorica-in	4080/tcp		# Lorica inside facing
 lorica-in	4080/udp		# Lorica inside facing
 lorica-in-sec	4081/tcp		# Lorica inside facing (SSL)
@@ -7556,6 +7555,11 @@ lorica-out	4082/tcp		# Lorica outside fa
 lorica-out	4082/udp		# Lorica outside facing
 lorica-out-sec	4083/tcp		# Lorica outside facing (SSL)
 lorica-out-sec	4083/udp		# Lorica outside facing (SSL)
+fortisphere-vm	4084/udp		# Fortisphere VM Service
+ezmessagesrv	4085/tcp		# EZNews Newsroom Message Service
+ftsync			4086/udp		# Firewall/NAT state table synchronization
+applusservice	4087/tcp		# APplus Service
+npsp			4088/tcp		# Noah Printing Service Protocol
 opencore	4089/tcp		# OpenCORE Remote Control Service
 opencore	4089/udp		# OpenCORE Remote Control Service
 omasgport	4090/tcp		# OMA BCAST Service Guide
@@ -7612,8 +7616,8 @@ cds		4115/tcp		# CDS Transfer Agent
 cds		4115/udp		# CDS Transfer Agent
 smartcard-tls	4116/tcp		# smartcard-TLS
 smartcard-tls	4116/udp		# smartcard-TLS
-xmlivestream	4117/tcp		# xmLive Streaming Service
-xmlivestream	4117/udp		# xmLive Streaming Service
+hillrserv	4117/tcp		# Hillr Connection Manager
+hillrserv	4117/udp		# Hillr Connection Manager
 netscript	4118/tcp		# Netadmin Systems NETscript service
 netscript	4118/udp		# Netadmin Systems NETscript service
 assuria-slm	4119/tcp		# Assuria Log Manager
@@ -7714,6 +7718,7 @@ pslicser	4168/tcp		# PrintSoft License S
 pslicser	4168/udp		# PrintSoft License Server
 iadt		4169/tcp		# Automation Drive Interface Transport
 iadt		4169/udp		# Automation Drive Interface Transport
+d-cinema-csp	4170/tcp		# SMPTE Content Synchonization Protocol
 wello		4177/tcp		# Wello P2P pubsub service
 wello		4177/udp		# Wello P2P pubsub service
 storman		4178/tcp		# StorMan
@@ -7730,6 +7735,12 @@ gmmp		4183/tcp		# General Metaverse Mess
 gmmp		4183/udp		# General Metaverse Messaging Protocol
 universe_suite	4184/tcp		# UNIVERSE SUITE MESSAGE SERVICE
 universe_suite	4184/udp		# UNIVERSE SUITE MESSAGE SERVICE
+wcpp			4185/tcp		# Woven Control Plane Protocol
+wcpp			4185/udp		# Woven Control Plane Protocol
+boxbackupstore	4186/tcp		# Box Backup Store Service
+csc_proxy		4187/tcp		# Cascade Proxy
+vatata			4188/tcp		# Vatata Peer to Peer Protocol
+vatata			4188/udp		# Vatata Peer to Peer Protocol
 eims-admin	4199/tcp		# EIMS ADMIN
 eims-admin	4199/udp		# EIMS ADMIN
 corelccam	4300/tcp		# Corel CCam
@@ -7814,8 +7825,15 @@ wxbrief		4368/tcp		# WeatherBrief Direct
 wxbrief		4368/udp		# WeatherBrief Direct
 epmd		4369/tcp		# Erlang Port Mapper Daemon
 epmd		4369/udp		# Erlang Port Mapper Daemon
+elpro_tunnel	4370/tcp		# ELPRO V2 Protocol Tunnel
+elpro_tunnel	4370/udp		# ELPRO V2 Protocol Tunnel
+l2c-connect		4371/tcp		# LAN 2 CAN connection service
+l2c-info			4372/tcp		# LAN 2 CAN information service
 remctl		4373/tcp		# Remote Authenticated Command Service
 remctl		4373/udp		# Remote Authenticated Command Service
+psi-ptt			4374/tcp		# PSI Push-to-Talk Protocol
+tolteces		4375/tcp		# Toltec EasyShare
+tolteces		4375/udp		# Toltec EasyShare
 bip		4376/tcp		# BioAPI Interworking
 bip		4376/udp		# BioAPI Interworking
 cp-spxsvr	4377/tcp		# Cambridge Pixel SPx Server
@@ -7826,6 +7844,8 @@ ctdb		4379/tcp		# CTDB
 ctdb		4379/udp		# CTDB
 xandros-cms	4389/tcp		# Xandros Community Management Service
 xandros-cms	4389/udp		# Xandros Community Management Service
+wiegand		4390/tcp		# Physical Access Control
+wiegand		4390/udp		# Physical Access Control
 ds-srv		4400/tcp		# ASIGRA Services
 ds-srv		4400/udp		# ASIGRA Services
 ds-srvr		4401/tcp		# ASIGRA Televaulting DS-System Service
@@ -7840,8 +7860,13 @@ ds-mail		4405/tcp		# ASIGRA Televaulting
 ds-mail		4405/udp		# ASIGRA Televaulting Message Level Restore service
 ds-slp		4406/tcp		# ASIGRA Televaulting DS-Sleeper Service
 ds-slp		4406/udp		# ASIGRA Televaulting DS-Sleeper Service
+nacagent	4407/tcp		# Network Access Control Agent
 beacon-port-2	4426/tcp		# SMARTS Beacon Port
 beacon-port-2	4426/udp		# SMARTS Beacon Port
+drizzle			4427/tcp		# Drizzle database server
+sqlserver		4430/tcp		# REAL SQL Server
+rsqlserver	4430/udp		# REAL SQL Server
+netblox			4441/udp		# Netblox Protocol
 saris		4442/tcp		# Saris
 saris		4442/udp		# Saris
 pharos		4443/tcp		# Pharos
@@ -7876,6 +7901,7 @@ mcp		4458/tcp		# Matrix Configuration Pr
 mcp		4458/udp		# Matrix Configuration Protocol
 hpssmgmt	4484/tcp		# hpssmgmt service
 hpssmgmt	4484/udp		# hpssmgmt service
+assyst-dr		4485/tcp		# Assyst Data Repository Service
 ipsec-nat-t	4500/tcp		# IPsec NAT-Traversal
 ipsec-nat-t	4500/udp		# IPsec NAT-Traversal
 ehs		4535/tcp		# Event Heap Server
@@ -7913,6 +7939,7 @@ bmc-reporting	4568/tcp		# BMC Reporting
 bmc-reporting	4568/udp		# BMC Reporting
 iax		4569/tcp		# Inter-Asterisk eXchange
 iax		4569/udp		# Inter-Asterisk eXchange
+hrpd-ith-at-an	4592/udp		# HRPD-ITH (AT-AN)
 ipt-anri-anri	4593/tcp		# IPT (ANRI-ANRI)
 ipt-anri-anri	4593/udp		# IPT (ANRI-ANRI)
 ias-session	4594/tcp		# IAS-Session (ANRI-ANRI)
@@ -7931,6 +7958,7 @@ piranha1	4600/tcp		# Piranha1
 piranha1	4600/udp		# Piranha1
 piranha2	4601/tcp		# Piranha2
 piranha2	4601/udp		# Piranha2
+mtsserver	4602/tcp		# EAX MTS Server
 playsta2-app	4658/tcp		# PlayStation2 App Port
 playsta2-app	4658/udp		# PlayStation2 App Port
 playsta2-lob	4659/tcp		# PlayStation2 Lobby Port
@@ -8087,6 +8115,8 @@ cc-tracking	4870/tcp		# Citcom Tracking 
 cc-tracking	4870/udp		# Citcom Tracking Service
 wired		4871/tcp		# Wired
 wired		4871/udp		# Wired
+hivestor	4884/tcp		# HiveStor Distributed File System
+hivestor	4884/udp		# HiveStor Distributed File System
 abbs		4885/tcp		# ABBS
 abbs		4885/udp		# ABBS
 lyskom		4894/tcp		# LysKOM Protocol A
@@ -8096,6 +8126,9 @@ radmin-port	4899/udp		# RAdmin Port
 hfcs		4900/tcp		# Hyper File Client/Server Database Engine
 hfcs		4900/udp		# Hyper File Client/Server Database Engine
 lutcp		4913/tcp		# LUTher Control Protocol
+bones		4914/tcp		# Bones Remote Control
+bones		4914/udp		# Bones Remote Control
+atsc-mh-ssc			4937/udp		# ATSC-M/H Service Signaling Channel
 eq-office-4940	4940/tcp		# Equitrac Office
 eq-office-4940	4940/udp		# Equitrac Office
 eq-office-4941	4941/tcp		# Equitrac Office
@@ -8186,6 +8219,8 @@ ita-agent	5051/tcp		# ITA Agent
 ita-agent	5051/udp		# ITA Agent
 ita-manager	5052/tcp		# ITA Manager
 ita-manager	5052/udp		# ITA Manager
+rlm			5053/tcp		# RLM License Server
+rlm-admin	5054/tcp		# RLM administrative interface
 unot		5055/tcp		# UNOT
 unot		5055/udp		# UNOT
 intecom-ps1	5056/tcp		# Intecom Pointspan 1
@@ -8206,6 +8241,7 @@ stanag-5066	5066/tcp		# STANAG-5066-SUBN
 stanag-5066	5066/udp		# STANAG-5066-SUBNET-INTF
 authentx	5067/tcp		# Authentx Service
 authentx	5067/udp		# Authentx Service
+bitforestsrv		5068/tcp		# Bitforest Data Service
 i-net-2000-npr	5069/tcp		# I/Net 2000-NPR
 i-net-2000-npr	5069/udp		# I/Net 2000-NPR
 vtsas		5070/tcp		# VersaTrans Server Agent Service
@@ -8218,6 +8254,7 @@ tag-pm		5073/tcp		# Advantage Group Port
 tag-pm		5073/udp		# Advantage Group Port Mgr
 alesquery	5074/tcp		# ALES Query
 alesquery	5074/udp		# ALES Query
+cp-spxrpts	5079/udp		# Cambridge Pixel SPx Reports
 onscreen	5080/tcp		# OnScreen Data Collection Service
 onscreen	5080/udp		# OnScreen Data Collection Service
 sdl-ets		5081/tcp		# SDL - Ent Trans Server
@@ -8232,6 +8269,7 @@ encrypted-llrp	5085/tcp		# EPCglobal Enc
 encrypted-llrp	5085/udp		# EPCglobal Encrypted LLRP
 car		5090/sctp		# Candidate AR
 cxtp		5091/sctp		# Context Transfer Protocol
+magpie	5092/udp		# Magpie Binary
 sentinel-lm	5093/tcp		# Sentinel LM
 sentinel-lm	5093/udp		# Sentinel LM
 sentlm-srv2srv	5099/tcp		# SentLM Srv2Srv
@@ -8242,8 +8280,12 @@ talarian-tcp	5101/tcp		# Talarian_TCP
 talarian-udp	5101/udp		# Talarian_UDP
 oms-nonsecure	5102/tcp		# Oracle OMS non-secure
 oms-nonsecure	5102/udp		# Oracle OMS non-secure
+taep-as-svc		5111/tcp		# TAEP AS service
+taep-as-svc		5111/udp		# TAEP AS service
 pm-cmdsvr	5112/tcp		# PeerMe Msg Cmd Service
 pm-cmdsvr	5112/udp		# PeerMe Msg Cmd Service
+autobuild			5115/tcp		# Symantec Autobuild Service
+emb-proj-cmd	5116/udp		# EPSON Projecter Image Transfer
 nbt-pc		5133/tcp		# Policy Commander
 nbt-pc		5133/udp		# Policy Commander
 ctsd		5137/tcp		# MyCTS server port
@@ -8304,6 +8346,8 @@ padl2sim	5236/tcp		#
 padl2sim	5236/udp		#
 mnet-discovery	5237/tcp		# m-net discovery
 mnet-discovery	5237/udp		# m-net discovery
+capwap-control	5246/udp		# CAPWAP Control Protocol
+capwap-data			5247/udp		# CAPWAP Data Protocol
 caacws		5248/tcp		# CA Access Control Web Service
 caacws		5248/udp		# CA Access Control Web Service
 caaclang2	5249/tcp		# CA AC Lang Service
@@ -8320,6 +8364,8 @@ movaz-ssc	5252/udp		# Movaz SSC
 3com-njack-2	5265/udp		# 3Com Network Jack Port 2
 xmpp-server	5269/tcp		# XMPP Server Connection
 xmpp-server	5269/udp		# XMPP Server Connection
+xmp		5270/tcp		# Cartographer XMP
+xmp		5270/udp		# Cartographer XMP
 pk		5272/tcp		# PK
 pk		5272/udp		# PK
 transmit-port	5282/tcp		# Marimba Transmitter Port
@@ -8358,10 +8404,14 @@ hacl-poll	5315/tcp		# HA Cluster UDP Pol
 hacl-poll	5315/udp		# HA Cluster UDP Polling
 hpdevms		5316/tcp		# HP Device Monitor Service
 hpdevms		5316/udp		# HP Device Monitor Service
+bsfserver-zn	5320/tcp		# Webservices-based Zn interface of BSF
+bsfsvr-zn-ssl	5321/tcp		# Webservices-based Zn interface of BSF over SSL
 kfserver	5343/tcp		# Sculptor Database Server
 kfserver	5343/udp		# Sculptor Database Server
 xkotodrcp	5344/tcp		# xkoto DRCP
 xkotodrcp	5344/udp		# xkoto DRCP
+stuns			5349/tcp		# STUN over TLS
+stuns			5349/udp		# Reserved for a future enhancement of STUN
 nat-pmp-status	5350/tcp		# NAT-PMP Status Announcements
 nat-pmp-status	5350/udp		# NAT-PMP Status Announcements
 nat-pmp		5351/tcp		# NAT Port Mapping Protocol
@@ -8500,14 +8550,13 @@ personal-agent	5555/tcp		# Personal Agen
 personal-agent	5555/udp		# Personal Agent
 freeciv		5556/tcp		# Freeciv gameplay
 freeciv		5556/udp		# Freeciv gameplay
-udpplus		5566/tcp		# UDPPlus
-udpplus		5566/udp		# UDPPlus
 m-oap		5567/tcp		# Multicast Object Access Protocol
 m-oap		5567/udp		# Multicast Object Access Protocol
 sdt		5568/tcp		# Session Data Transport Multicast
 sdt		5568/udp		# Session Data Transport Multicast
 sdmmp		5573/tcp		# SAS Domain Management Messaging Protocol
 sdmmp		5573/udp		# SAS Domain Management Messaging Protocol
+fdtracks	5579/tcp		# FleetDisplay Tracking Service
 tmosms0		5580/tcp		# T-Mobile SMS Protocol Message 0
 tmosms0		5580/udp		# T-Mobile SMS Protocol Message 0
 tmosms1		5581/tcp		# T-Mobile SMS Protocol Message 1
@@ -8540,6 +8589,8 @@ a4-sdunode	5605/tcp		# A4-SDUNode
 a4-sdunode	5605/udp		# A4-SDUNode
 ninaf		5627/tcp		# Node Initiated Network Association Forma
 ninaf		5627/udp		# Node Initiated Network Association Forma
+htrust	5628/tcp		# HTrust API
+htrust	5628/udp		# HTrust API
 symantec-sfdb	5629/tcp		# Symantec Storage Foundation for Database
 symantec-sfdb	5629/udp		# Symantec Storage Foundation for Database
 precise-comm	5630/tcp		# PreciseCommunication
@@ -8552,6 +8603,8 @@ beorl		5633/tcp		# BE Operations Request
 beorl		5633/udp		# BE Operations Request Listener
 xprtld		5634/tcp		# SF Message Service
 xprtld		5634/udp		# SF Message Service
+sfmsso		5635/tcp		# SFM Authentication Subsystem
+sfm-db-server	5636/tcp		# SFMdb - SFM DB server
 amqps		5671/tcp		# amqp protocol over TLS/SSL
 amqps		5671/udp		# amqp protocol over TLS/SSL
 amqp		5672/tcp		# AMQP
@@ -8603,6 +8656,8 @@ omhs		5723/tcp		# Operations Manager - H
 omhs		5723/udp		# Operations Manager - Health Service
 omsdk		5724/tcp		# Operations Manager - SDK Service
 omsdk		5724/udp		# Operations Manager - SDK Service
+ms-ilm		5725/tcp		# Microsoft Identity Lifecycle Manager
+ms-ilm-sts	5726/tcp		# Microsoft Lifecycle Manager Secure Token Service
 openmail	5729/tcp		# Openmail User Agent Layer
 openmail	5729/udp		# Openmail User Agent Layer
 unieng		5730/tcp		# Steltor's calendar access
@@ -8649,6 +8704,8 @@ dali-port	5777/udp		# DALI Port
 3par-mgmt	5782/udp		# 3PAR Management Service
 3par-mgmt-ssl	5783/tcp		# 3PAR Management Service with SSL
 3par-mgmt-ssl	5783/udp		# 3PAR Management Service with SSL
+3par-rcopy		5785/tcp		# 3PAR Inform Remote Copy
+3par-rcopy		5785/udp		# 3PAR Inform Remote Copy
 xtreamx		5793/tcp		# XtreamX Supervised Peer message
 xtreamx		5793/udp		# XtreamX Supervised Peer message
 icmpd		5813/tcp		# ICMPD
@@ -8661,6 +8718,14 @@ ppsuitemsg	5863/tcp		# PlanetPress Suite
 ppsuitemsg	5863/udp		# PlanetPress Suite Messeng
 vnc-server	5900/tcp		# VNC Server
 vnc-server	5900/udp		# VNC Server
+cm			5910/tcp		# Context Management
+cm			5910/udp		# Context Management
+cpdlc		5911/tcp		# Controller Pilot Data Link Communication
+cpdlc		5911/udp		# Controller Pilot Data Link Communication
+fis			5912/tcp		# Flight Information Services
+fis			5912/udp		# Flight Information Services
+ads-c		5913/tcp		# Automatic Dependent Surveillance
+ads-c		5913/udp		# Automatic Dependent Surveillance
 indy		5963/tcp		# Indy Application Server
 indy		5963/udp		# Indy Application Server
 mppolicy-v5	5968/tcp		# mppolicy-v5
@@ -8741,6 +8806,8 @@ bex-webadmin	6122/tcp		# Backup Express 
 bex-webadmin	6122/udp		# Backup Express Web Server
 backup-express	6123/tcp		# Backup Express
 backup-express	6123/udp		# Backup Express
+pnbs			6124/tcp		# Phlexible Network Backup Service
+pnbs			6124/udp		# Phlexible Network Backup Service
 nbt-wol		6133/tcp		# New Boundary Tech WOL
 nbt-wol		6133/udp		# New Boundary Tech WOL
 pulsonixnls	6140/tcp		# Pulsonix Network License Service
@@ -8771,6 +8838,14 @@ lm-x		6200/tcp		# LM-X License Manager b
 lm-x		6200/udp		# LM-X License Manager by X-Formation
 radmind		6222/tcp		# Radmind Access Protocol
 radmind		6222/udp		# Radmind Access Protocol
+jeol-nsdtp-1	6241/tcp		# JEOL Network Services Data Transport Protocol 1
+jeol-nsddp-1	6241/udp		# JEOL Network Services Dynamic Discovery Protocol 1
+jeol-nsdtp-2	6242/tcp		# JEOL Network Services Data Transport Protocol 2
+jeol-nsddp-2	6242/udp		# JEOL Network Services Dynamic Discovery Protocol 2
+jeol-nsdtp-3	6243/tcp		# JEOL Network Services Data Transport Protocol 3
+jeol-nsddp-3	6243/udp		# JEOL Network Services Dynamic Discovery Protocol 3
+jeol-nsdtp-4	6244/tcp		# JEOL Network Services Data Transport Protocol 4
+jeol-nsddp-4	6244/udp		# JEOL Network Services Dynamic Discovery Protocol 4
 tl1-raw-ssl	6251/tcp		# TL1 Raw Over SSL/TLS
 tl1-raw-ssl	6251/udp		# TL1 Raw Over SSL/TLS
 tl1-ssh		6252/tcp		# TL1 over SSH
@@ -8785,6 +8860,8 @@ bmc-grx		6300/tcp		# BMC GRX
 bmc-grx		6300/udp		# BMC GRX
 bmc_ctd_ldap	6301/tcp		# BMC CONTROL-D LDAP SERVER
 bmc_ctd_ldap	6301/udp		# BMC CONTROL-D LDAP SERVER
+abb-escp			6316/tcp		# Ethernet Sensor Communications Protocol
+abb-escp			6316/udp		# Ethernet Sensor Communications Protocol
 repsvc		6320/tcp		# Double-Take Replication Service
 repsvc		6320/udp		# Double-Take Replication Service
 emp-server1	6321/tcp		# Empress Software Connectivity Server 1
@@ -8809,6 +8886,28 @@ clariion-evr01	6389/tcp		# clariion-evr0
 clariion-evr01	6389/udp		# clariion-evr01
 metaedit-ws	6390/tcp		# MetaEdit+ WebService API
 metaedit-ws	6390/udp		# MetaEdit+ WebService API
+boe-cms         6400/tcp		# Business Objects CMS contact port
+boe-cms         6400/udp		# Business Objects CMS contact port
+boe-was         6401/tcp		# boe-was
+boe-was         6401/udp		# boe-was
+boe-eventsrv    6402/tcp		# boe-eventsrv
+boe-eventsrv    6402/udp		# boe-eventsrv
+boe-cachesvr    6403/tcp		# boe-cachesvr
+boe-cachesvr    6403/udp		# boe-cachesvr
+boe-filesvr     6404/tcp		# Business Objects Enterprise internal server
+boe-filesvr     6404/udp		# Business Objects Enterprise internal server
+boe-pagesvr     6405/tcp		# Business Objects Enterprise internal server
+boe-pagesvr     6405/udp		# Business Objects Enterprise internal server
+boe-processsvr  6406/tcp		# Business Objects Enterprise internal server
+boe-processsvr  6406/udp		# Business Objects Enterprise internal server
+boe-resssvr1    6407/tcp		# Business Objects Enterprise internal server
+boe-resssvr1    6407/udp		# Business Objects Enterprise internal server
+boe-resssvr2    6408/tcp		# Business Objects Enterprise internal server
+boe-resssvr2    6408/udp		# Business Objects Enterprise internal server
+boe-resssvr3    6409/tcp		# Business Objects Enterprise internal server
+boe-resssvr3    6409/udp		# Business Objects Enterprise internal server
+boe-resssvr4    6410/tcp		# Business Objects Enterprise internal server
+boe-resssvr4    6410/udp		# Business Objects Enterprise internal server
 faxcomservice	6417/tcp		# Faxcom Message Service
 faxcomservice	6417/udp		# Faxcom Message Service
 nim-vdrshell	6420/tcp		# NIM_VDRShell
@@ -8865,6 +8964,7 @@ mgcs-mfp-port	6509/tcp		# MGCS-MFP Port
 mgcs-mfp-port	6509/udp		# MGCS-MFP Port
 mcer-port	6510/tcp		# MCER Port
 mcer-port	6510/udp		# MCER Port
+syslog-tls	6514/tcp  # Syslog over TLS
 elipse-rec	6515/tcp		# Elipse RPC Protocol
 elipse-rec	6515/udp		# Elipse RPC Protocol
 lds-distrib	6543/tcp		# lds_distrib
@@ -8915,6 +9015,8 @@ afesc-mc	6628/tcp		# AFE Stock Channel M
 afesc-mc	6628/udp		# AFE Stock Channel M/C
 vocaltec-gold	6670/tcp		# Vocaltec Global Online Directory
 vocaltec-gold	6670/udp		# Vocaltec Global Online Directory
+p4p-portal		6671/tcp		# P4P Portal Service
+p4p-portal		6671/udp		# P4P Portal Service
 vision_server	6672/tcp		# vision_server
 vision_server	6672/udp		# vision_server
 vision_elmd	6673/tcp		# vision_elmd
@@ -9176,6 +9278,7 @@ collaber	7689/tcp		# Collaber Network Se
 collaber	7689/udp		# Collaber Network Service
 klio		7697/tcp		# KLIO communications
 klio		7697/udp		# KLIO communications
+em7-secom	7700/tcp		# EM7 Secure Communications
 sync-em7	7707/tcp		# EM7 Dynamic Updates
 sync-em7	7707/udp		# EM7 Dynamic Updates
 scinet		7708/tcp		# scientia.net
@@ -9194,6 +9297,7 @@ smip		7734/tcp		# Smith Protocol over IP
 smip		7734/udp		# Smith Protocol over IP
 aiagent		7738/tcp		# HP Enterprise Discovery Agent
 aiagent		7738/udp		# HP Enterprise Discovery Agent
+msss			7742/tcp		# Mugginsoft Script Server Service
 sstp-1		7743/tcp		# Sakura Script Transfer Protocol
 sstp-1		7743/udp		# Sakura Script Transfer Protocol
 raqmon-pdu	7744/tcp		# RAQMON PDU
@@ -9232,6 +9336,7 @@ apc-7845	7845/tcp		# APC 7845
 apc-7845	7845/udp		# APC 7845
 apc-7846	7846/tcp		# APC 7846
 apc-7846	7846/udp		# APC 7846
+rbt-smc		7870/tcp		# Riverbed Steelhead Mobile Service
 pss		7880/tcp		# Pearson
 pss		7880/udp		# Pearson
 ubroker		7887/tcp		# Universal Broker
@@ -9286,6 +9391,9 @@ mindprint	8033/tcp		# MindPrint
 mindprint	8033/udp		# MindPrint
 vantronix-mgmt	8034/tcp		# .vantronix Management
 vantronix-mgmt	8034/udp		# .vantronix Management
+fs-agent	8042/tcp		# FireScope Agent
+fs-server	8043/tcp		# FireScope Server
+fs-mgmt		8044/tcp		# FireScope Management Interface
 senomix01	8052/tcp		# Senomix Timesheets Server
 senomix01	8052/udp		# Senomix Timesheets Server
 senomix02	8053/tcp		# Senomix Timesheets Client [1 year assignment]
@@ -9310,6 +9418,8 @@ us-srv		8083/tcp		# Utilistor (Server)
 us-srv		8083/udp		# Utilistor (Server)
 d-s-n		8086/tcp		# Distributed SCADA Networking Rendezvous Port
 d-s-n		8086/udp		# Distributed SCADA Networking Rendezvous Port
+simplifymedia	8087/tcp		# Simplify Media SPP Protocol
+simplifymedia	8087/udp		# Simplify Media SPP Protocol
 radan-http	8088/tcp		# Radan HTTP
 radan-http	8088/udp		# Radan HTTP
 sac		8097/tcp		# SAC Port Id
@@ -9366,8 +9476,12 @@ lm-webwatcher	8208/tcp		# LM Webwatcher
 lm-webwatcher	8208/udp		# LM Webwatcher
 rexecj		8230/tcp		# RexecJ Server
 rexecj		8230/udp		# RexecJ Server
+synapse-nhttps	8243/tcp		# Synapse Non Blocking HTTPS
+synapse-nhttps	8243/udp		# Synapse Non Blocking HTTPS
 pando-sec	8276/tcp		# Pando Media Controlled Distribution
 pando-sec	8276/udp		# Pando Media Controlled Distribution
+synapse-nhttp		8280/tcp		# Synapse Non Blocking HTTP
+synapse-nhttp		8280/udp		# Synapse Non Blocking HTTP
 blp3		8292/tcp		# Bloomberg professional
 blp3		8292/udp		# Bloomberg professional
 blp4		8294/tcp		# Bloomberg intelligent client
@@ -9412,6 +9526,8 @@ pcsync-http	8444/tcp		# PCsync HTTP
 pcsync-http	8444/udp		# PCsync HTTP
 npmp		8450/tcp		# npmp
 npmp		8450/udp		# npmp
+pim-port		8471/tcp		# PIM over Reliable Transport
+pim-port		8471/sctp		# PIM over Reliable Transport
 otv		8472/tcp		# Overlay Transport Virtualization (OTV)
 otv		8472/udp		# Overlay Transport Virtualization (OTV)
 vp2p		8473/tcp		# Virtual Point to Point
@@ -9508,8 +9624,11 @@ etlservicemgr	9001/tcp		# ETL Service Ma
 etlservicemgr	9001/udp		# ETL Service Manager
 dynamid		9002/tcp		# DynamID authentication
 dynamid		9002/udp		# DynamID authentication
+ogs-client	9007/udp		# Open Grid Services Client
+ogs-server	9008/tcp		# Open Grid Services Server
 pichat		9009/tcp		# Pichat Server
 pichat		9009/udp		# Pichat Server
+sdr			9010/tcp		# Secure Data Replicator Protocol
 tambora		9020/tcp		# TAMBORA
 tambora		9020/udp		# TAMBORA
 panagolin-ident 9021/tcp		# Pangolin Identification
@@ -9526,6 +9645,11 @@ swa-4		9026/tcp		# Secure Web Access - 4
 swa-4		9026/udp		# Secure Web Access - 4
 glrpc		9080/tcp		# Groove GLRPC
 glrpc		9080/udp		# Groove GLRPC
+aurora			9084/tcp		# IBM AURORA Performance Visualizer
+aurora			9084/udp		# IBM AURORA Performance Visualizer
+aurora			9084/sctp		# IBM AURORA Performance Visualizer
+ibm-rsyscon	9085/tcp		# IBM Remote System Console
+ibm-rsyscon	9085/udp		# IBM Remote System Console
 net2display	9086/tcp		# Vesa Net2Display
 net2display	9086/udp		# Vesa Net2Display
 classic		9087/tcp		# Classic Data Server
@@ -9603,6 +9727,8 @@ fsc-port	9217/tcp		# FSC Communication P
 fsc-port	9217/udp		# FSC Communication Port
 teamcoherence	9222/tcp		# QSC Team Coherence
 teamcoherence	9222/udp		# QSC Team Coherence
+Mon			9255/tcp		# Manager On Network
+Mon			9255/udp		# Manager On Network
 pgps		9280/tcp		# Predicted GPS
 pgps		9280/udp		# Predicted GPS
 swtp-port1	9281/tcp		# SofaWare transport port 1
@@ -9649,10 +9775,16 @@ sec-t4net-srv	9400/tcp		# Samsung Twain 
 sec-t4net-srv	9400/udp		# Samsung Twain for Network Server
 sec-t4net-clt	9401/tcp		# Samsung Twain for Network Client
 sec-t4net-clt	9401/udp		# Samsung Twain for Network Client
+sec-pc2fax-srv	9402/tcp		# Samsung PC2FAX for Network Server
+sec-pc2fax-srv	9402/udp		# Samsung PC2FAX for Network Server
 git		9418/tcp		# git pack transfer service
 git		9418/udp		# git pack transfer service
 tungsten-https	9443/tcp		# WSO2 Tungsten HTTPS
 tungsten-https	9443/udp		# WSO2 Tungsten HTTPS
+wso2esb-console	9444/tcp		# WSO2 ESB Administration Console HTTPS
+wso2esb-console	9444/udp		# WSO2 ESB Administration Console HTTPS
+sntlkeyssrvr		9450/tcp		# Sentinel Keys Server
+sntlkeyssrvr		9450/udp		# Sentinel Keys Server
 ismserver	9500/tcp		# ismserver
 ismserver	9500/udp		# ismserver
 mngsuite	9535/tcp		# Management Suite Remote Control
@@ -9681,6 +9813,8 @@ micromuse-ncpw	9600/tcp		# MICROMUSE-NCP
 micromuse-ncpw	9600/udp		# MICROMUSE-NCPW
 streamcomm-ds	9612/tcp		# StreamComm User Directory
 streamcomm-ds	9612/udp		# StreamComm User Directory
+condor			9618/tcp		# Condor Collector Service
+condor			9618/udp		# Condor Collector Service
 odbcpathway	9628/tcp		# ODBC Pathway Service
 odbcpathway	9628/udp		# ODBC Pathway Service
 uniport		9629/tcp		# UniPort SSO Controller
@@ -9759,6 +9893,8 @@ documentum	10002/tcp		# EMC-Documentum C
 documentum	10002/udp		# EMC-Documentum Content Server Product
 documentum_s	10003/tcp		# EMC-Documentum Content Server Product
 documentum_s	10003/udp		# EMC-Documentum Content Server Product
+emcrmirccd		10004/tcp		# EMC Replication Manager Client
+emcrmird			10005/tcp		# EMC Replication Manager Server
 mvs-capacity	10007/tcp		# MVS Capacity
 mvs-capacity	10007/udp		# MVS Capacity
 octopus		10008/tcp		# Octopus Multiplexer
@@ -9916,6 +10052,7 @@ dsmcc-download	13821/tcp		# DSMCC Downlo
 dsmcc-download	13821/udp		# DSMCC Download Protocol
 dsmcc-ccp	13822/tcp		# DSMCC Channel Change Protocol
 dsmcc-ccp	13822/udp		# DSMCC Channel Change Protocol
+medevolve	13930/tcp		# MedEvolve Port Requester
 scotty-ft	14000/tcp		# SCOTTY High-Speed Filetransfer
 scotty-ft	14000/udp		# SCOTTY High-Speed Filetransfer
 sua		14001/tcp		# SUA
@@ -9933,8 +10070,11 @@ gcm-app		14145/tcp		# GCM Application
 gcm-app		14145/udp		# GCM Application
 vrts-tdd	14149/tcp		# Veritas Traffic Director
 vrts-tdd	14149/udp		# Veritas Traffic Director
+vcscmd		14150/tcp		# Veritas Cluster Server Command Server
 vad		14154/tcp		# Veritas Application Director
 vad		14154/udp		# Veritas Application Director
+cps				14250/tcp		# Fencing Server
+cps				14250/udp		# Fencing Server
 ca-web-update	14414/tcp		# CA eTrust Web Update Service
 ca-web-update	14414/udp		# CA eTrust Web Update Service
 hde-lcesrvr-1	14936/tcp		# hde-lcesrvr-1
@@ -9971,6 +10111,7 @@ netserialext4	16368/tcp		# Network Seria
 netserialext4	16368/udp		# Network Serial Extension Ports Four
 connected	16384/tcp		# Connected Corp
 connected	16384/udp		# Connected Corp
+xoms			16619/tcp		# X509 Objects Management Service
 sgcip		16950/tcp		# Simple Generic Client Interface Protocol
 sgcip		16950/udp		# Simple Generic Client Interface Protocol
 intel-rci-mp	16991/tcp		# INTEL-RCI-MP
@@ -9999,6 +10140,7 @@ zigbee-ip	17755/tcp		# ZigBee IP Transpo
 zigbee-ip	17755/udp		# ZigBee IP Transport Service
 zigbee-ips	17756/tcp		# ZigBee IP Transport Secure Service
 zigbee-ips	17756/udp		# ZigBee IP Transport Secure Service
+sw-orion	17777/tcp		# SolarWinds Orion
 biimenu		18000/tcp		# Beckman Instruments, Inc.
 biimenu		18000/udp		# Beckman Instruments, Inc.
 opsec-cvp	18181/tcp		# OPSEC CVP
@@ -10051,6 +10193,8 @@ sxuptp		19540/tcp		# SXUPTP
 sxuptp		19540/udp		# SXUPTP
 jcp		19541/tcp		# JCP Client
 jcp		19541/udp		# JCP Client
+dnp-sec		19999/tcp		# Distributed Network Protocol - Secure
+dnp-sec		19999/udp		# Distributed Network Protocol - Secure
 dnp		20000/tcp		# DNP
 dnp		20000/udp		# DNP
 microsan	20001/tcp		# MicroSAN
@@ -10059,10 +10203,15 @@ commtact-http	20002/tcp		# Commtact HTTP
 commtact-http	20002/udp		# Commtact HTTP
 commtact-https	20003/tcp		# Commtact HTTPS
 commtact-https	20003/udp		# Commtact HTTPS
+openwebnet			20005/tcp		# OpenWebNet protocol for electric network
+openwebnet			20005/udp		# OpenWebNet protocol for electric network
 opendeploy	20014/tcp		# OpenDeploy Listener
 opendeploy	20014/udp		# OpenDeploy Listener
 nburn_id	20034/tcp		# NetBurner ID Port
 nburn_id	20034/udp		# NetBurner ID Port
+nfsrdma		20049/tcp		# Network File System (NFS) over RDMA
+nfsrdma		20049/udp		# Network File System (NFS) over RDMA
+nfsrdma		20049/sctp	# Network File System (NFS) over RDMA
 tolfab		20167/tcp		# TOLfab Data Change
 tolfab		20167/udp		# TOLfab Data Change
 ipdtp-port	20202/tcp		# IPD Tunneling Port
@@ -10162,6 +10311,8 @@ ild		24321/tcp		# Isolv Local Directory
 ild		24321/udp		# Isolv Local Directory
 intel_rci	24386/tcp		# Intel RCI
 intel_rci	24386/udp		# Intel RCI
+tonidods		24465/tcp		# Tonido Domain Server
+tonidods		24465/udp		# Tonido Domain Server
 flashfiler	24677/tcp		# FlashFiler
 flashfiler	24677/udp		# FlashFiler
 proactivate	24678/tcp		# Turbopower Proactivate
@@ -10244,6 +10395,7 @@ tetrinet	31457/tcp		# TetriNET Protocol
 tetrinet	31457/udp		# TetriNET Protocol
 lm-mon		31620/tcp		# lm mon
 lm-mon		31620/udp		# lm mon
+dsx_monitor			31685/tcp		# DS Expert Monitor
 gamesmith-port	31765/tcp		# GameSmith Port
 gamesmith-port	31765/udp		# GameSmith Port
 iceedcp_tx	31948/tcp		# Embedded Device Configuration Protocol TX

setup-2.6.18-rxvt.patch:

--- NEW FILE setup-2.6.18-rxvt.patch ---
diff -urNp setup-2.6.18-orig/inputrc setup-2.6.18/inputrc
--- setup-2.6.18-orig/inputrc	2004-09-23 07:29:00.000000000 +0200
+++ setup-2.6.18/inputrc	2009-02-03 14:01:15.000000000 +0100
@@ -26,6 +26,8 @@ $if mode=emacs
 
 # for rxvt
 "\e[8~": end-of-line
+"\eOc": forward-word
+"\eOd": backward-word
 
 # for non RH/Debian xterm, can't hurt for RH/DEbian xterm
 "\eOH": beginning-of-line

setup-2.6.18-uidgid.patch:

--- NEW FILE setup-2.6.18-uidgid.patch ---
diff -urNp setup-2.6.18-orig/uidgid setup-2.6.18/uidgid
--- setup-2.6.18-orig/uidgid	2008-06-05 15:31:13.000000000 +0200
+++ setup-2.6.18/uidgid	2009-01-29 12:43:55.000000000 +0100
@@ -1,103 +1,114 @@
-NAME		UID	GID	HOME			SHELL		PACKAGES
-root		0	0	/root			/bin/bash	setup
-bin		1	1	/bin			/sbin/nologin	setup
-daemon		2	2	/sbin			/sbin/nologin	setup
-sys		-	3	-			-		setup
-adm		3	4	/var/adm		/bin/bash	setup
-tty		-	5	-			-		setup
-disk		-	6	-			-		setup
-lp		4	7	/var/spool/lpd		/sbin/nologin	setup
-mem		-	8	-			-		setup
-kmem		-	9	-			-		setup
-wheel		-	10	-			-		setup
-sync		5	(0)	/sbin			/bin/sync	setup
-shutdown	6	(0)	/sbin			/sbin/shutdown	setup
-halt		7	(0)	/sbin			/sbin/halt	setup
-mail		8	12	/var/spool/mail		/sbin/nologin	setup
-news		9	13	/var/spool/news		/sbin/nologin	setup
-uucp		10	14	/var/spool/uucp		/sbin/nologin	setup
-operator	11	(0)	/root			/sbin/nologin	setup
-games		12	(100)	/usr/games		/sbin/nologin	setup
-gopher		13	30	/usr/lib/gopher-data	/sbin/nologin	setup
-ftp		14	50	/var/ftp		/sbin/nologin	setup
-man		-	15	-			-		setup
-floppy		-	19	-			-		dev,MAKEDEV
-games		-	20	-			-		setup
-slocate		-	21	-			-		slocate
-utmp		-	22	-			-		initscripts,libutempter
-squid		23	23	/var/spool/squid	/dev/null	squid
-pvm		24	24	/usr/share/pvm3		/bin/bash	pvm
-named		25	25	/var/named		/bin/false	bind
+NAME	UID	GID	HOME		SHELL	PACKAGES
+root	0	0	/root		/bin/bash	setup
+bin	1	1	/bin		/sbin/nologin	setup
+daemon	2	2	/sbin		/sbin/nologin	setup
+sys	-	3	-		-	setup
+adm	3	4	/var/adm		/bin/bash	setup
+tty	-	5	-		-	setup
+disk	-	6	-		-	setup
+lp	4	7	/var/spool/lpd		/sbin/nologin	setup
+mem	-	8	-		-	setup
+kmem	-	9	-		-	setup
+wheel	-	10	-		-	setup
+cdrom	-	11	-		-	udev,MAKEDEV
+sync	5	(0)	/sbin		/bin/sync	setup
+shutdown	6	(0)	/sbin		/sbin/shutdown	setup
+halt	7	(0)	/sbin		/sbin/halt	setup
+mail	8	12	/var/spool/mail		/sbin/nologin	setup
+news	9	13	/var/spool/news		/sbin/nologin	setup
+uucp	10	14	/var/spool/uucp		/sbin/nologin	setup
+operator	11	(0)	/root		/sbin/nologin	setup
+games	12	(100)	/usr/games		/sbin/nologin	setup
+gopher	13	30	/usr/lib/gopher-data		/sbin/nologin	setup
+ftp	14	50	/var/ftp		/sbin/nologin	setup
+man	-	15	-		-	setup
+pkiuser	17	17	/usr/share/pki		/sbin/nologin	pki-ca,rhpki-ca
+dialout	-	18	-		-	udev,MAKEDEV
+floppy	-	19	-		-	dev,MAKEDEV
+games	-	20	-		-	setup
+slocate	-	21	-		-	slocate
+utmp	-	22	-		-	initscripts,libutempter
+squid	23	23	/var/spool/squid		/dev/null	squid
+pvm	24	24	/usr/share/pvm3		/bin/bash	pvm
+named	25	25	/var/named		/bin/false	bind
 postgres	26	26	/var/lib/pgsql		/bin/bash	postgresql-server
-mysql		27	27	/var/lib/mysql		/bin/bash	mysql
-nscd		28	28	/			/bin/false	nscd
-rpcuser		29	29	/var/lib/nfs		/bin/false	nfs-utils
-console		-	31	-			-		dev
-rpc		32	32	/			/bin/false	portmap
-amanda		33	(6)	/var/lib/amanda		/bin/false	amanda
-netdump		34	34	/var/crash		/bin/bash	netdump-client, netdump-server
-utempter	-	35	-			-		libutempter
-rpm		37	37	/var/lib/rpm		/bin/bash	rpm
-ntp		38	38	/etc/ntp		/sbin/nologin	ntp
-dip		-	40      -			-		setup
-mailman		41	41	/var/mailman		/bin/false	mailman
-gdm		42	42	/var/gdm		/bin/bash	gdm
-xfs		43	43	/etc/X11/fs		/bin/false	XFree86-xfs
-pppusers	-	44	-			-		linuxconf
-popusers	-	45	-			-		linuxconf
-slipusers	-	46	-			-		linuxconf
-mailnull	47	47	/var/spool/mqueue	/dev/null	sendmail
-apache		48	48	/var/www		/bin/false	apache
-wnn		49	49	/home/wnn		/bin/bash	FreeWnn
-smmsp		51	51	/var/spool/mqueue	/dev/null	sendmail
-tomcat	        53	53	/var/lib/tomcat		/sbin/nologin	tomcat
-lock		-	54	-			-		lockdev
-ldap		55	55	/var/lib/ldap		/bin/false	openldap-servers
+mysql	27	27	/var/lib/mysql		/bin/bash	mysql
+nscd	28	28	/		/bin/false	nscd
+rpcuser	29	29	/var/lib/nfs		/bin/false	nfs-utils
+console	-	31	-		-	dev
+rpc	32	32	/		/bin/false	portmap
+amanda	33	(6)	/var/lib/amanda		/bin/false	amanda
+tape	-	33	-		-	udev,MAKEDEV
+netdump	34	34	/var/crash		/bin/bash	netdump-client, netdump-server
+utempter	-	35	-		-	libutempter
+vdsm	36	-	/		/bin/bash	kvm, vdsm
+kvm	-	36	-		-	kvm, vdsm
+rpm	37	37	/var/lib/rpm		/bin/bash	rpm
+ntp	38	38	/etc/ntp		/sbin/nologin	ntp
+video	-	39	-		-	setup
+dip	-	40	-		-	setup
+mailman	41	41	/var/mailman		/bin/false	mailman
+gdm	42	42	/var/gdm		/bin/bash	gdm
+xfs	43	43	/etc/X11/fs		/bin/false	XFree86-xfs
+pppusers	-	44	-		-	linuxconf
+popusers	-	45	-		-	linuxconf
+slipusers	-	46	-		-	linuxconf
+mailnull	47	47	/var/spool/mqueue		/dev/null	sendmail
+apache	48	48	/var/www		/bin/false	apache
+wnn	49	49	/home/wnn		/bin/bash	FreeWnn
+smmsp	51	51	/var/spool/mqueue		/dev/null	sendmail
+puppet	52	52	/var/lib/puppet		/sbin/nologin	puppet
+tomcat	53	53	/var/lib/tomcat		/sbin/nologin	tomcat
+lock	-	54	-		-	lockdev
+ldap	55	55	/var/lib/ldap		/bin/false	openldap-servers
 frontpage	56	56	/var/www		/bin/false	mod_frontpage
-nut		57	57	/var/lib/ups		/bin/false	nut
-beagleindex	58	58	/var/cache/beagle	/bin/false	beagle
-piranha		60	60	/etc/sysconfig/ha	/dev/null	piranha
-prelude-manager	61	61	-			/sbin/nologin	prelude-manager
-snortd		62	62	-			/sbin/nologin	snortd
-wine		-	66	-			-		wine
-pegasus		66	65	/var/lib/Pegasus	/sbin/nologin	tog-pegasus
-webalizer	67	67	/var/www/html/usage	/sbin/nologin	webalizer
-haldaemon	68	68	/			/sbin/nologin	hal
-vcsa		69	69	-			/sbin/nologin	dev,MAKEDEV
-avahi		70	70	/			/sbin/nologin	avahi
-realtime	-	71	-			-
-tcpdump		72	72	/			/sbin/nologin	tcpdump
-privoxy		73	73	/etc/privoxy		/bin/bash	privoxy
-sshd		74	74	/var/empty/sshd		/sbin/nologin	openssh-server
-radvd		75	75	/			/bin/false	radvd
-cyrus		76	(12)	/var/imap		/bin/bash	cyrus-imapd
-shadow		-	76	-			-		cyrus-imapd
-arpwatch	77	77	/var/lib/arpwatch	/sbin/nologin	arpwatch
-fax		78	78	/var/spool/fax		/sbin/nologin	mgetty
-nocpulse	79	79	/etc/sysconfig/nocpulse	/bin/bash	nocpulse
-desktop		80	80	-			/sbin/nologin	desktop-file-utils
-dbus		81	81	/			/sbin/nologin	dbus
-jonas		82	82	/var/lib/jonas		/sbin/nologin	jonas
-clamav		83	83	/tmp			/sbin/nologin	clamav
-screen		-	84	-			-		screen
-quaggavt	-	85	-			-		quagga
-sabayon 	86	86	-			/sbin/nologin	sabayon
-polkituser	87	-	/			/sbin/nologin	PolicyKit
-wbpriv		-	88	-			-		samba-common
-postfix		89	89	/var/spool/postfix	/bin/true	postfix
-postdrop	-	90	-			-		postfix
-majordomo	91	91	/usr/lib/majordomo	/bin/bash	majordomo
-quagga		92	92	/			/sbin/nologin	quagga
-exim		93	93	/var/spool/exim		/sbin/nologin	exim
-distcache	94	94	/			/sbin/nologin	distcache
-radiusd		95	95	/			/bin/false	freeradius
-hsqldb		96	96	/var/lib/hsqldb		/sbin/nologin   hsqldb
-dovecot		97	97	/usr/libexec/dovecot	/sbin/nologin	dovecot
-ident		98	98	/			/sbin/nologin	ident
-nobody		99	99	/			/sbin/nologin	setup
-users		-	100	-			-		setup
-gnats		?	?	?			?		gnats, gnats-db
-listar		?	?	?			?		listar
+nut	57	57	/var/lib/ups		/bin/false	nut
+beagleindex	58	58	/var/cache/beagle		/bin/false	beagle
+tss	59	59	-		/sbin/nologin	trousers
+piranha	60	60	/etc/sysconfig/ha		/dev/null	piranha
+prelude-manager	61	61	-		/sbin/nologin	prelude-manager
+snortd	62	62	-		/sbin/nologin	snortd
+audio	-	63	-		-	setup
+condor	64	64	/var/lib/condor		/sbin/nologin	condord
+wine	-	66	-		-	wine
+pegasus	66	65	/var/lib/Pegasus		/sbin/nologin	tog-pegasus
+webalizer	67	67	/var/www/html/usage		/sbin/nologin	webalizer
+haldaemon	68	68	/		/sbin/nologin	hal
+vcsa	69	69	-		/sbin/nologin	dev,MAKEDEV
+avahi	70	70	/		/sbin/nologin	avahi
+realtime	-	71	-		-	-
+tcpdump	72	72	/		/sbin/nologin	tcpdump
+privoxy	73	73	/etc/privoxy		/bin/bash	privoxy
+sshd	74	74	/var/empty/sshd		/sbin/nologin	openssh-server
+radvd	75	75	/		/bin/false	radvd
+cyrus	76	(12)	/var/imap		/bin/bash	cyrus-imapd
+shadow	-	76	-		-	cyrus-imapd
+arpwatch	77	77	/var/lib/arpwatch		/sbin/nologin	arpwatch
+fax	78	78	/var/spool/fax		/sbin/nologin	mgetty
+nocpulse	79	79	/etc/sysconfig/nocpulse		/bin/bash	nocpulse
+desktop	80	80	-		/sbin/nologin	desktop-file-utils
+dbus	81	81	/		/sbin/nologin	dbus
+jonas	82	82	/var/lib/jonas		/sbin/nologin	jonas
+clamav	83	83	/tmp		/sbin/nologin	clamav
+screen	-	84	-		-	screen
+quaggavt	-	85	-		-	quagga
+sabayon	86	86	-		/sbin/nologin	sabayon
+polkituser	87	87	/		/sbin/nologin	PolicyKit
+wbpriv	-	88	-		-	samba-common
+postfix	89	89	/var/spool/postfix		/bin/true	postfix
+postdrop	-	90	-		-	postfix
+majordomo	91	91	/usr/lib/majordomo		/bin/bash	majordomo
+quagga	92	92	/		/sbin/nologin	quagga
+exim	93	93	/var/spool/exim		/sbin/nologin	exim
+distcache	94	94	/		/sbin/nologin	distcache
+radiusd	95	95	/		/bin/false	freeradius
+hsqldb	96	96	/var/lib/hsqldb		/sbin/nologin	hsqldb
+dovecot	97	97	/usr/libexec/dovecot		/sbin/nologin	dovecot
+ident	98	98	/		/sbin/nologin	ident
+nobody	99	99	/		/sbin/nologin	setup
+users	-	100	-		-	setup
+gnats	?	?	?		?	gnats, gnats-db
+listar	?	?	?		?	listar
 nfsnobody	65534	65534	/var/lib/nfs		/sbin/nologin	nfs-utils
 
 # Note: nfsnobdy is 4294967294 on 64-bit platforms (-2)


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/F-9/setup.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- setup.spec	18 Nov 2008 15:21:14 -0000	1.57
+++ setup.spec	3 Feb 2009 13:14:16 -0000	1.58
@@ -1,14 +1,20 @@
 Summary: A set of system configuration and setup files.
 Name: setup
 Version: 2.6.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 Source: setup-%{version}.tar.bz2
+URL: https://fedorahosted.org/setup/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
+Patch1: setup-2.6.18-inputrcexport.patch
+Patch2: setup-2.6.18-uidgid.patch
+Patch3: setup-2.6.18-protocolservices.patch
+Patch4: setup-2.6.18-rxvt.patch
+
 
 %description
 The setup package contains a set of important system configuration and
@@ -16,6 +22,10 @@
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 # Run any sanity checks.
@@ -46,7 +56,7 @@
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc uidgid
 %verify(not md5 size mtime) %config(noreplace) /etc/passwd
 %verify(not md5 size mtime) %config(noreplace) /etc/group
@@ -62,10 +72,10 @@
 %verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny
 %verify(not md5 size mtime) %config(noreplace) /etc/motd
 %config(noreplace) /etc/printcap
-%config /etc/inputrc
+%config(noreplace) /etc/inputrc
 %config(noreplace) /etc/bashrc
 %config(noreplace) /etc/profile
-%config /etc/protocols
+%config(noreplace) /etc/protocols
 %attr(0600,root,root) %config(noreplace,missingok) /etc/securetty
 %config(noreplace) /etc/csh.login
 %config(noreplace) /etc/csh.cshrc
@@ -76,6 +86,18 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Fri Jan 30 2009 Ondrej Vasik <ovasik at redhat.com> 2.6.18-2
+- add gid 87 reservation for polkituser, add gid reservation
+  for group cdrom(:11), dialout(:18) tape (:33), kvm (:36),
+  uidgid pair for pkiuser(17:17), uid for vdsm user (36:),
+  make uidgid file better parseable
+- do not export INPUTRC(to respect just created ~/.inputrc)
+- update procols to later IANA list(2008-04-18)
+- update services to later IANA list(2008-11-17)
+- add URL, few spec files fixes, mark /etc/protocols and
+  /etc/inputrc %%config(noreplace)
+- add support for ctrl+arrow keys in rxvt(#474110)
+
 * Tue Nov 18 2008 Ondrej Vasik <ovasik at redhat.com> 2.6.18-1
 - again process profile.d scripts in noninteractive shells,
   but do not display stderr/stdout messages(#457243)




More information about the scm-commits mailing list